feat(wasteland): Phase 1 — Wasteland Infrastructure (Issue #1810)#1974
Open
jrf0110 wants to merge 15 commits intowasteland-stagingfrom
Open
feat(wasteland): Phase 1 — Wasteland Infrastructure (Issue #1810)#1974jrf0110 wants to merge 15 commits intowasteland-stagingfrom
jrf0110 wants to merge 15 commits intowasteland-stagingfrom
Conversation
Create the WastelandContainerDO Durable Object modeled after TownContainerDO. Manages container lifecycle for the wl CLI, with WASTELAND_API_URL and KILO_API_URL env vars, plus persistent env var storage for credentials like DOLTHUB_TOKEN. Also scaffolds cloudflare-wasteland package with: - worker-configuration.d.ts (Env type with WASTELAND_CONTAINER binding) - tsconfig.json - package.json - pnpm-workspace.yaml entry
…bles, and alarm skeleton Create the WastelandDO Durable Object at cloudflare-wasteland/src/dos/Wasteland.do.ts with SQLite tables for configuration, encrypted credentials, and member registry. Package structure: - db/tables/ — Zod-backed table definitions (wasteland_config, wasteland_credentials, wasteland_members) using getTableFromZodSchema pattern - dos/wasteland/ — Sub-modules (config.ts, credentials.ts, members.ts) with plain functions accepting SqlStorage, per AGENTS.md conventions - dos/Wasteland.do.ts — DO class with RPC methods, constructor table init via blockConcurrencyWhile, and alarm skeleton for periodic sync - util/ — query.util.ts and table.ts copied from cloudflare-gastown All sub-modules use the type-safe query() helper, table interpolators for column references, and Zod Record schemas for result parsing. TypeScript compiles cleanly.
…c/gt/toast/c1453d94' into convoy/phase-1-wasteland-infrastructure-issue-1/a69010dc/head
Add container infrastructure for WastelandContainerDO: - Dockerfile and Dockerfile.dev based on debian:bookworm-slim with wl CLI and Bun - Control server (Bun HTTP) with endpoints for all wl operations: browse, claim, done, post, sync, join, status, and health - Mutation serialization via mutex to protect local working copy - Post-mutation verification to detect no-op mutations - DOLTHUB_TOKEN header auth on all wl endpoints - 60s CLI timeout, structured JSON logging, periodic heartbeat - Zod schema validation on all request bodies and CLI output
…ation tests Replace WastelandDO stub with full implementation backed by SQLite storage. Add 42 integration tests covering WastelandDO CRUD lifecycle, member management, credential storage, connected towns, wanted board cache, WastelandRegistryDO operations (including countAll with Zod parse), full lifecycle with registry integration, HTTP health endpoints, CORS verification, and tRPC authorization. All code uses Zod for IO boundary validation with no 'as' casts per project coding standards.
…d integration tests # Conflicts: # cloudflare-wasteland/src/dos/WastelandDO.stub.ts # cloudflare-wasteland/src/dos/WastelandRegistry.do.ts
![kilo-code-bot[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
| WastelandRegistryRecord, | ||
| } from '../db/tables/wasteland-registry.table'; | ||
|
|
||
| const CountResult = z.object({ cnt: z.coerce.number() }); |
Contributor
There was a problem hiding this comment.
CRITICAL: Duplicate CountResult declaration blocks compilation
This file already declares CountResult on the next line, so adding a second const here produces a duplicate identifier error and the worker will not build.
| /* sql */ ` | ||
| INSERT OR REPLACE INTO ${wasteland_connected_towns} ( | ||
| ${wasteland_connected_towns.columns.town_id}, | ||
| ${wasteland_connected_towns.columns.town_name}, |
Contributor
There was a problem hiding this comment.
CRITICAL: Connected-town rows no longer match the API contract
connectKiloTown still calls stub.connectTown(input.townId, ctx.userId), and RpcConnectedTownOutput still requires wasteland_id and connected_by. Persisting town_name here means we store the caller's user id in this column and return a row that cannot satisfy the tRPC output schema, so connectKiloTown and listConnectedTowns will fail at runtime.
| export function createTableWastelandMembers(): string { | ||
| return getCreateTableQueryFromTable(wasteland_members, { | ||
| member_id: `text primary key`, | ||
| user_id: `text not null`, |
Contributor
There was a problem hiding this comment.
WARNING: Membership rows can be duplicated for the same user
The router looks members up by user_id (getMember(ctx.userId) and the auto-register path in connectKiloTown), but this schema only keys rows by member_id while addMember() always inserts a new row. The same user can be added multiple times, which makes getMember() ambiguous and exposes duplicate owners/maintainers in listMembers().
Contributor
Code Review SummaryStatus: 2 Issues Found | Recommendation: Address before merge Overview
Fix these issues in Kilo Cloud Issue Details (click to expand)CRITICAL
WARNING
Other Observations (not in diff)Issues found in unchanged code that cannot receive inline comments:
Files Reviewed (10 files)
Reviewed by gpt-5.4-20260305 · 238,576 tokens |
…c/head' of https://github.com/Kilo-Org/cloud into gt/birch/166bca03
…c/gt/maple/56ce508b' into convoy/phase-1-wasteland-infrastructure-issue-1/a69010dc/head # Conflicts: # cloudflare-wasteland/package.json # cloudflare-wasteland/src/db/tables/wasteland-config.table.ts # cloudflare-wasteland/src/db/tables/wasteland-members.table.ts # cloudflare-wasteland/tsconfig.json # cloudflare-wasteland/worker-configuration.d.ts # pnpm-lock.yaml
…c/gt/toast/531855d7' into merge-temp # Conflicts: # cloudflare-wasteland/container/control-server/server.ts
…architecture Replace WastelandDO.stub.ts with proper Wasteland.do.ts that delegates to sub-modules per the AGENTS.md conventions. Add connected-towns sub-module, fix missing getIndexesWastelandMembers export, add trust_level CHECK constraint, make initializeWasteland/updateConfig/storeCredential return records, add getMember/updateMember/connectTown/disconnectTown/listConnectedTowns/getWantedBoard/ refreshWantedBoard methods, and switch all imports from stub to Wasteland.do.
| /* sql */ ` | ||
| INSERT OR REPLACE INTO ${wasteland_connected_towns} ( | ||
| ${wasteland_connected_towns.columns.town_id}, | ||
| ${wasteland_connected_towns.columns.town_name}, |
Contributor
There was a problem hiding this comment.
CRITICAL: Connected-town rows still do not match the tRPC contract
connectKiloTown still calls this RPC with ctx.userId as the second argument, and ConnectedTownOutput still expects wasteland_id and connected_by. Writing that value into town_name means the DO returns rows that cannot satisfy the schema, so both connectKiloTown and listConnectedTowns will still fail at runtime.
…dDO.stub.ts - Remove duplicate const CountResult declaration in WastelandRegistry.do.ts (line 10) that would cause a SyntaxError at compile/runtime - Delete WastelandDO.stub.ts which is unused (replaced by Wasteland.do.ts with sub-module architecture in commit 603a82a)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Phase 1 Wasteland Infrastructure — all 7 convoy beads completed, reviewed, and rework addressed. This PR lands the full
cloudflare-wasteland/package scaffold and core infrastructure:cloudflare-wasteland/package with wrangler.jsonc, package.json, tsconfig, worker skeletonVerification
Visual Changes
N/A
Reviewer Notes
This is a convoy landing PR — no code was modified in this PR itself. The branch contains the accumulated work of 7 independently reviewed and approved beads from the Phase 1 convoy (a69010dc). Phases 2-4 build on top of this foundation.