Skip to content

feat(gastown): staging batch — circuit breaker, drain/eviction, token refresh, Cloudflare links, fullscreen#2011

Open
jrf0110 wants to merge 15 commits intomainfrom
gastown-staging
Open

feat(gastown): staging batch — circuit breaker, drain/eviction, token refresh, Cloudflare links, fullscreen#2011
jrf0110 wants to merge 15 commits intomainfrom
gastown-staging

Conversation

@jrf0110
Copy link
Copy Markdown
Contributor

@jrf0110 jrf0110 commented Apr 4, 2026

Summary

This branch accumulates several Gastown improvements that were merged to gastown-staging for batched review before landing to main.

Constituent PRs

jrf0110 and others added 15 commits April 3, 2026 05:16
- docs/local-debug-testing.md: comprehensive guide covering debug
  endpoints, container monitoring, drain testing, wrangler management,
  drain architecture, and common issues
- scripts/test-drain.sh: automated end-to-end drain test that sends
  work, waits for an agent, triggers graceful stop, monitors the drain,
  and prints PASS/FAIL with diagnostics
…#1979)

fix(gastown): also refresh container token when mayor is alive (waiting)

Refine the refreshContainerToken guard to check for an alive mayor
(working/stalled/waiting) in addition to hasActiveWork(). A waiting
mayor is alive in the container but hasActiveWork() returns false —
without this fix the 8h container token can expire, stranding GT tool
calls when the user sends the next message via sendMayorMessage
(which reuses the container without calling ensureContainerToken).

Co-authored-by: John Fawcett <john@kilcoode.ai>
* feat(gastown): skip review queue for gt:pr-fixup beads (#1983)

* feat(gastown): skip review queue for gt:pr-fixup beads in agentDone()

* style: fix formatting in local-debug-testing.md

---------

Co-authored-by: John Fawcett <john@kilcoode.ai>

* feat(gastown): thread labels parameter through gt_sling tool chain

Add optional labels[] parameter to gt_sling so the mayor can tag beads
at creation time. The parameter flows through:
  mayor-tools.ts → client.ts → mayor-tools.handler.ts → Town.do.ts slingBead() → createBead()

createBead() already accepts labels, so no further changes needed.

* feat(gastown): add pr_fixup_context to PrimeContext and buildPrimeContext

Add pr_fixup_context field to PrimeContext type and populate it in
buildPrimeContext when the hooked bead has the gt:pr-fixup label,
mirroring the existing rework_context pattern. Extracts pr_url, branch,
and target_branch from bead metadata.

---------

Co-authored-by: John Fawcett <john@kilcoode.ai>
…dev libraries (#1978)

* feat(container): expand apt-get block with build tools, ripgrep, and dev libraries

Add comprehensive package list to both Dockerfile and Dockerfile.dev:
- Build toolchain: build-essential, autoconf
- Search tools: ripgrep, jq
- Network: wget, gnupg, unzip
- Compression: bzip2, zstd
- SSL/crypto: libssl-dev, libffi-dev
- Database client libs: libdb-dev, libgdbm-dev, libgdbm6
- Python build deps: libbz2-dev, liblzma-dev, libncurses5-dev, libreadline-dev, zlib1g-dev
- Ruby build deps: libyaml-dev
- Image processing: libvips-dev
- Browser/rendering: libgbm1
- Native addon support: libc++1, libgmp-dev
- Timezone data: tzdata

Closes #1976

* fix(container): remove shell comments from inside backslash-continued apt-get install

Shell comments inside backslash-continued lines break the apt-get
install command — the # starts a comment that swallows the rest of
the logical line, dropping all subsequent packages. Move category
info to a block comment above the RUN statement instead.

---------

Co-authored-by: John Fawcett <john@kilcoode.ai>
…_review toggle (#1586)

* feat(gastown): auto-resolve PR feedback and auto-merge with grace period

Implements the core infrastructure for automatically addressing unresolved
review comments and failing CI checks on PRs, plus configurable auto-merge
with a grace period timer.

Closes #1002

* fix(gastown): address PR review feedback — pagination safety, merge failure recovery, repo validation

- GraphQL reviewThreads query now includes pageInfo.hasNextPage; if there
  are more than 100 threads, conservatively treats PR as having unresolved
  comments to prevent auto-merging with unchecked feedback
- merge_pr action clears auto_merge_pending flag on failure (405/409/error)
  and resets the auto_merge_ready_since timer so normal polling resumes
- reconcileReviewQueue now emits poll_pr alongside merge_pr so PR status
  changes (merged/closed by human) are still observed during merge attempts
- merge_pr validates the PR URL's owner/repo against the rig's git_url
  before calling the merge API, preventing merges targeting unrelated repos

* fix(gastown): check-runs pagination and fresh feedback check before merge

- check-runs API now uses per_page=100 and compares total_count to
  detect unpaginated runs; if more runs exist than returned,
  allChecksPass is conservatively set to false
- merge_pr re-checks feedback (comments + CI) immediately before
  calling the merge API; if state regressed since the last poll,
  clears auto_merge_pending and resets the timer

* fix(gastown): conservative hasFailingChecks for unpaginated check-runs, fix CI failures

- hasFailingChecks is now conservatively true when total_count > returned
  runs, so PRs with >100 check-runs correctly trigger feedback handling
- Replace `as` casts with Zod safeParse for GitHub API responses
  (checkPRFeedback) to satisfy oxlint no-unnecessary-type-assertion
- Fix test constant expressions flagged by TS2871 and oxlint
- Run oxfmt on changed files

* fix(gastown): separate hasUncheckedRuns from hasFailingChecks in PR feedback

hasFailingChecks now only reflects actual failures from inspected runs.
A new hasUncheckedRuns field tracks when the check-runs response was
paginated. allChecksPass is still conservatively false when runs are
unchecked (blocking auto-merge), but the feedback bead is no longer
dispatched for phantom CI failures on repos with >100 passing checks.

* style: auto-format local-debug-testing.md

* feat(gastown): polecat creates PRs, refinery reviews via GitHub, code_review toggle

- Polecat creates PRs directly when merge_strategy is 'pr', passing
  pr_url to gt_done. Removes a full agent dispatch cycle from the flow.
- Refinery reviews existing PRs via gh pr review, adding inline comments
  that go through the same auto-resolve feedback loop as human reviews.
- New refinery.code_review toggle (default: true) lets users disable
  refinery code review when they have an external review bot.
- Fix: allChecksPass treats 0 check-runs as passing for repos without CI.
- Fix: reconciler Rule 7 stops refineries hooked to terminal MR beads,
  preventing post-merge review comments.
- Convoy-aware: review-then-land intermediate beads skip PR creation.

* fix(gastown): include hasUncheckedRuns in pr_feedback_detected condition

When check-runs are paginated (>100), the first page may all pass
but later pages may have failures. Previously only hasFailingChecks
was checked, which only reflects the first page. Now hasUncheckedRuns
also triggers feedback detection so the auto-resolve path can fix CI.

* fix(gastown): include auto_merge columns in REVIEW_JOIN query

REVIEW_JOIN was missing auto_merge_ready_since and
last_feedback_check_at from the SELECT, causing MergeRequestBeadRecord
parse failures on pr_status_changed events.

* fix(gastown): refinery uses gh pr comment instead of --approve

The bot account that created the PR cannot approve its own PRs.
The refinery now posts a comment when the review passes instead
of using gh pr review --approve.

* fix(gastown): set parent_bead_id on rework and PR feedback beads

Rework beads (from refinery review) and PR feedback beads (from
poll_pr comment detection) now set parent_bead_id to the MR bead
that triggered them. This links them into the bead chain so the
relationship is visible in the UI and queryable via parent traversal.

* fix(gastown): skip orphaned-review timeout when code_review disabled, fix inline comment syntax

- Rule 4 orphaned-review timeout now skips when refineryCodeReview is
  false — poll_pr keeps MR beads alive, no refinery expected.
- Removed invalid 'gh pr review --comment path:line' syntax from
  refinery prompt; consolidated on the GitHub API example which
  correctly creates inline review threads.
… auto-merge on toggle

- Also check combined commit status API alongside check-runs; repos
  using legacy status checks are no longer missed.
- Propagate hasUncheckedRuns through pr_feedback_detected event so
  the feedback bead title and prompt reflect the actual reason.
- Gate auto-merge timer on refineryConfig.auto_merge in addition to
  auto_merge_delay_minutes to respect the toggle.
…, stuck MR beads (#1632), session leak (#1341)

* fix(gastown): preserve org billing context across model changes (#1756)

Store organizationId as a standalone env var (GASTOWN_ORGANIZATION_ID)
that survives KILO_CONFIG_CONTENT rebuilds. Three defense layers:

1. Set GASTOWN_ORGANIZATION_ID on /agents/start and read it first in
   extractOrganizationId() before falling back to config extraction.
2. Pass organizationId in the PATCH /model request body so the
   container receives it even if X-Town-Config parsing fails.
3. Include organization_id in buildContainerConfig and sync it to
   process.env in the PATCH handler's X-Town-Config processing.

* fix(gastown): stop false-positive invariant violations spamming logs every 5s

Invariant 7: Exclude mayors from the 'working agent must have a hook'
check — mayors are always working and intentionally hookless.

Invariant 5: Widen valid convoy bead states to include in_progress and
in_review, which are legitimate transient states while child beads are
being worked on. Only flag truly unexpected states.

Fixes #1364

* fix(gastown): prevent MR beads stuck in_progress when github_token missing (#1632)

- Fall back to github_cli_pat then platform integration token in checkPRStatus
- Track consecutive null poll results; fail MR bead after 10 nulls
- Rate-limit PR polling to once per minute per MR bead via last_poll_at metadata
- Store failureReason and failureMessage in bead metadata on permanent failure

* fix: format and lint errors in reconciler.ts

- Add explicit 'unknown' type annotation to lastPollAt to fix
  no-unsafe-assignment lint error
- Auto-format ternary expression per oxfmt rules

* fix(gastown): prevent duplicate session leak when restarting a starting agent

Thread an AbortController through the startAgent() startup sequence so
that when a restart is requested for an agent still in 'starting' status,
the in-flight startup is cancelled before session.create() can produce an
orphaned session.

- Add startupAbortController field to ManagedAgent type
- In startAgent: abort existing startup controller when agent is 'starting'
- Check signal.aborted after each async step (ensureSDKServer,
  session.create, before session.prompt)
- On abort: decrement sessionCount, remove agent entry, clean up SDK
  instance if no sessions remain
- In stopAgent: also abort startupAbortController for 'starting' agents
- Introduce StartupAbortedError to distinguish abort from real failures

Fixes #1341

* fix(gastown): address review comments — reset poll_null_count on all non-null polls, abort orphaned session on startup abort, guard agents.delete with identity check

* fix(gastown): store session ID before abort check to prevent orphaned session leak

After session.create() resolves, parse and store the session ID on the
agent object BEFORE checking signal.aborted. This ensures the catch
block has agent.sessionId available to call session.abort(), closing
the race window where an abort during session.create() could leak an
orphaned session.

Also fixes format-check CI by running oxfmt.
…ct in gt_sling/gt_escalate (#1996)

* feat(gastown): add PR-fixup workflow to polecat and mayor system prompts (#1989)

* feat(gastown): add PR-fixup workflow to polecat and mayor system prompts

Add instructions for the gt:pr-fixup workflow:
- Polecat prompt: how to handle PR fixup beads (check out branch,
  address review comments, resolve threads, push to existing branch)
- Mayor prompt: how to dispatch PR fixup beads using gt_sling with
  the gt:pr-fixup label and appropriate metadata

* WIP: container eviction save

* fix: address PR #1989 review comments — metadata type and branch conflict

- Remove JSON.stringify wrapper from metadata example in mayor prompt so it
  passes gt_sling's z.record(z.string(), z.unknown()) validation as a plain object.
- Clarify polecat PR fixup workflow as the explicit exception to the 'do not
  switch branches' rule, and add exception note in Commit & Push Hygiene section.

---------

Co-authored-by: John Fawcett <john@kilcoode.ai>

* fix(gastown): gt_sling and gt_escalate accept metadata as object instead of JSON string

The metadata parameter on gt_sling (mayor) and gt_escalate (polecat)
now uses z.record(z.string(), z.unknown()) so the LLM can pass a
plain object directly. Removes the parseJsonObject indirection and
dead code. Updates tests to match.

---------

Co-authored-by: John Fawcett <john@kilcoode.ai>
New debug endpoint returns the full bead record, review_metadata, and
bead_dependencies for a given bead ID. Useful for verifying parent_bead_id
linkage, pr_url storage, and auto_merge_ready_since timer state during
local testing.
…ainer networking tips

- Document the new debug/beads/:beadId endpoint for bead inspection
- Add Test C: code_review toggle verification procedure
- Add bead chain verification examples
- Document container networking workaround for local dev
…token fallback, guard debug endpoint

- Clear GASTOWN_ORGANIZATION_ID when org_id is absent (prevents stale
  billing context when a town moves from org to personal).
- Change poll failure reason from 'no_github_token' to 'pr_poll_failed'
  with a message that covers all null-poll causes (token, rate limits, 5xx).
- checkPRFeedback and mergePR now use the same token fallback chain as
  checkPRStatus (github_token → github_cli_pat).
- Guard debug/beads/:beadId endpoint with dev-only check.
Swap Switch and label/description div positions in all 5 toggle
cards on the town settings page so toggles are right-aligned.
… across all PR operations

All three GitHub PR operations (checkPRStatus, checkPRFeedback, mergePR)
now use the same resolveGitHubToken helper with the full fallback chain:
github_token → github_cli_pat → platform integration (GitHub App).
Towns relying only on a GitHub App installation token will now have
auto-resolve and auto-merge working correctly.
…re on merge

- Rule 5 now includes MR beads with rig_id IS NULL (uses COALESCE
  sentinel). For NULL-rig beads, any idle refinery is eligible.
  Previously these beads were silently skipped, leaving them stuck
  in 'open' forever.
- completeReviewWithResult only closes the source bead if it's in
  'in_review' state. Prevents stale MR beads (from pre-deploy PRs
  already merged on GitHub) from incorrectly closing source beads
  that are still open/in_progress.
'Content-Type': 'application/json',
'User-Agent': 'Gastown-Refinery/1.0',
},
body: JSON.stringify({ merge_method: 'merge' }),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: Auto-merge hard-codes merge commits

This always sends merge_method: "merge" to GitHub. Repos that only allow squash or rebase merges will reject the request, so the new auto-merge path can never succeed for those towns even when the PR is otherwise ready.

FROM ${agent_metadata}
LEFT JOIN ${beads} b ON b.${beads.columns.bead_id} = ${agent_metadata.bead_id}
WHERE ${agent_metadata.columns.role} = 'refinery'
LIMIT 1
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: NULL-rig MR dispatch can stall behind a busy refinery

The comment says NULL-rig beads should use any idle refinery, but this query grabs an arbitrary refinery with LIMIT 1 and only later checks whether it is idle. If the first row is busy, the loop skips dispatch even when another idle refinery exists, so these MR beads can sit open indefinitely.

type: 'dispatch_agent',
agent_id: '',
bead_id: oldestMr[0].bead_id,
rig_id,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WARNING: Synthetic NULL-rig sentinel leaks into real dispatch state

For NULL-rig MR beads, rig_id can still be the synthetic value "__null_rig__" from the grouping query above. Passing it through here means dispatch_agent will call getOrCreateAgent(..., "__null_rig__", ...) and create a refinery tied to a fake rig instead of preserving the bead's real NULL rig semantics.

@kilo-code-bot
Copy link
Copy Markdown
Contributor

kilo-code-bot bot commented Apr 4, 2026

Code Review Summary

Status: 3 Issues Found | Recommendation: Address before merge

Overview

Severity Count
CRITICAL 0
WARNING 3
SUGGESTION 0
Issue Details (click to expand)

WARNING

File Line Issue
cloudflare-gastown/src/dos/Town.do.ts 4331 Auto-merge always requests merge_method: "merge", so squash-only or rebase-only repos can never auto-merge successfully.
cloudflare-gastown/src/dos/town/reconciler.ts 1284 NULL-rig MR selection uses LIMIT 1 before checking idleness, so a busy refinery can block dispatch even when another idle refinery exists.
cloudflare-gastown/src/dos/town/reconciler.ts 1373 The synthetic __null_rig__ sentinel is passed into dispatch_agent, which can create a refinery attached to a fake rig ID.

Fix these issues in Kilo Cloud

Other Observations (not in diff)

Issues found in unchanged code that cannot receive inline comments:

N/A

Files Reviewed (7 files)
  • cloudflare-gastown/src/dos/town/review-queue.ts - 0 issues
  • cloudflare-gastown/src/dos/town/reconciler.ts - 2 issues
  • cloudflare-gastown/src/dos/town/actions.ts - 0 issues
  • cloudflare-gastown/src/dos/Town.do.ts - 1 issue
  • cloudflare-gastown/src/handlers/mayor-tools.handler.ts - 0 issues
  • cloudflare-gastown/container/src/control-server.ts - 0 issues
  • cloudflare-gastown/container/src/process-manager.ts - 0 issues

Reviewed by gpt-5.4-20260305 · 1,499,143 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