Skip to content

feat(wasteland): Phase 2 — Core API + Onboarding (Issue #1810)#2003

Merged
jrf0110 merged 2 commits intowasteland-stagingfrom
convoy/phase-2-core-api-onboarding-issue-1810/efb11dc9/head
Apr 4, 2026
Merged

feat(wasteland): Phase 2 — Core API + Onboarding (Issue #1810)#2003
jrf0110 merged 2 commits intowasteland-stagingfrom
convoy/phase-2-core-api-onboarding-issue-1810/efb11dc9/head

Conversation

@jrf0110
Copy link
Copy Markdown
Contributor

@jrf0110 jrf0110 commented Apr 4, 2026

Summary

Merges the Phase 2 convoy branch (efb11dc9) into wasteland-staging to reconcile branch history. The Phase 2 code was previously merged via PR #1849, but a late commit on the convoy head branch (8e0c363e — tRPC init, schemas, and ownership helper) was merged into the head branch after the PR landed. This PR ensures the convoy head branch is a proper ancestor of wasteland-staging.

Phase 2 work delivered (via PR #1849):

  • WastelandDO implementation with SQLite tables: wasteland_config, wasteland_credentials, wasteland_members, wasteland_wanted_cache
  • WastelandDO sub-modules: config.ts, credentials.ts, members.ts, wanted-cache.ts
  • WastelandRegistryDO (singleton for listing wastelands by user/org)
  • tRPC layer: init.ts, schemas.ts, ownership.ts, router.ts
  • tRPC procedures: createWasteland, listWastelands, getWasteland, deleteWasteland, adminListWastelands, updateWastelandConfig, storeCredential, getCredentialStatus, deleteCredential, listMembers, addMember, removeMember, updateMember, browseWantedBoard, getWantedItem, refreshWantedBoard
  • tRPC mounted in wasteland.worker.ts with auth middleware
  • DoltHub REST API utility for wanted board polling
  • WastelandDO alarm loop for periodic wanted board refresh
  • @hono/trpc-server dependency added
  • WASTELAND_REGISTRY binding added to wrangler.jsonc

Closes the Phase 2 convoy landing gap (same bug as Phase 1).

Ref: #1810

jrf0110 added 2 commits April 1, 2026 05:38
…p helper

- Create trpc/init.ts with TRPCContext, analyticsProcedure, procedure,
  and adminProcedure (no gastownAccess gate — wasteland is simpler)
- Create trpc/schemas.ts with WastelandOutput, WastelandMemberOutput,
  WastelandCredentialStatusOutput, WastelandConfigOutput and rpcSafe wrappers
- Create trpc/ownership.ts with resolveWastelandOwnership checking user/org/admin
- Add @hono/trpc-server dependency to package.json
- Add 'trpc' to WastelandDelivery type in analytics.util.ts
- Extend WastelandDO stub with getConfig() signature for type compatibility
…ng-issue-1810/efb11dc9/gt/maple/1c611506' into convoy/phase-2-core-api-onboarding-issue-1810/efb11dc9/head

# Conflicts:
#	cloudflare-wasteland/src/dos/WastelandDO.stub.ts
#	cloudflare-wasteland/src/trpc/init.ts
#	cloudflare-wasteland/src/trpc/schemas.ts
#	cloudflare-wasteland/src/util/analytics.util.ts
@jrf0110 jrf0110 merged commit e68320a into wasteland-staging Apr 4, 2026
2 checks passed
@jrf0110 jrf0110 deleted the convoy/phase-2-core-api-onboarding-issue-1810/efb11dc9/head branch April 4, 2026 19:09
@kilo-code-bot
Copy link
Copy Markdown
Contributor

kilo-code-bot bot commented Apr 4, 2026

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (0 files)
  • None (merge-only PR; gh pr diff 2003 returned no changed files)

Reviewed by gpt-5.4-20260305 · 91,104 tokens

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant