Conversation
…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
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.
…ng 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
…ssing (#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
- Add explicit 'unknown' type annotation to lastPollAt to fix no-unsafe-assignment lint error - Auto-format ternary expression per oxfmt rules
This was referenced Apr 1, 2026
![kilo-code-bot[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (2 files)
Reviewed by gpt-5.4-20260305 · 152,526 tokens |
…non-null polls, abort orphaned session on startup abort, guard agents.delete with identity check
… 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.
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
Consolidates 4 independent bug fixes from the Gastown convoy into a single landing PR:
Org billing context lost on model change (fix(gastown): Mayor loses org billing context after model change — bills to personal account #1756): Store
organizationIdas a standalone env var (GASTOWN_ORGANIZATION_ID) that survivesKILO_CONFIG_CONTENTrebuilds. Three-layer defense: set on/agents/start, pass in PATCH/modelbody, sync fromX-Town-Configheader. Files:control-server.ts,process-manager.ts,types.ts,Town.do.ts,config.ts,container-dispatch.ts.Reconciler invariant false-positive spam (Bug: Reconciler invariant violations spamming logs every 5s across all towns #1364): Fixed Invariant 7 to exclude mayors from the "working agent must have a hook" check (mayors are always working and intentionally hookless). Fixed Invariant 5 to accept
in_progress/in_reviewas valid convoy bead states, only flagging truly unexpected states. Files:reconciler.ts.Stuck MR beads when github_token missing (fix(gastown): PR-strategy MR beads stuck in_progress when github_token is missing — agents re-dispatched for completed work #1632): Add token fallback chain (
github_token → github_cli_pat → platform integration) incheckPRStatus. Track consecutive null poll results viapoll_null_countmetadata and fail the MR bead after 10 nulls with a descriptive error. Rate-limit PR polling to once per minute per MR bead vialast_poll_atmetadata. Files:Town.do.ts,actions.ts,reconciler.ts.Duplicate session leak on restart (fix(gastown): prevent duplicate session leak when restarting a starting agent #1341): Thread an
AbortControllerthrough thestartAgent()startup sequence so that when a restart is requested while the agent is still in 'starting' status, the in-flight startup is cancelled beforesession.create()can produce an orphaned session. Checksignal.abortedafter each async step.StartupAbortedErrorseparates abort cleanup from real failure handling. Files:process-manager.ts,types.ts.Also includes 5 independently-reviewed PRs merged into this integration branch: #1842, #1848, #1851, #1856, #1858.
Verification
git merge --no-ff(no conflicts)Visual Changes
N/A
Reviewer Notes
poll_null_countthreshold of 10 means ~10 minutes of no-token polling before the MR bead is permanently failed — reasonable for detecting misconfiguration.StartupAbortedErrorclass in process-manager.ts cleanly separates abort-related cleanup from real failure handling.Closes #1756, closes #1364, closes #1632, closes #1341.