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

cloudflare-gastown/container/src/control-server.ts

@@ -142,6 +142,11 @@ app.post('/agents/start', async c => {
     return c.json({ error: 'Invalid request body', issues: parsed.error.issues }, 400);
   }
 
+  // Persist the organization ID as a standalone env var so it survives
+  // config rebuilds (e.g. model hot-swap). The env var is the primary
+  // source of truth; KILO_CONFIG_CONTENT extraction is the fallback.
+  process.env.GASTOWN_ORGANIZATION_ID = parsed.data.organizationId ?? '';
+
   console.log(
     `[control-server] /agents/start: role=${parsed.data.role} name=${parsed.data.name} rigId=${parsed.data.rigId} agentId=${parsed.data.agentId}`
   );
@@ -211,6 +216,11 @@ app.patch('/agents/:agentId/model', async c => {
     return c.json({ error: 'Invalid request body', issues: parsed.error.issues }, 400);
   }
 
+  // Update org billing context from the request body if provided.
+  if (parsed.data.organizationId) {
+    process.env.GASTOWN_ORGANIZATION_ID = parsed.data.organizationId;
+  }
+
   // Sync config-derived env vars from X-Town-Config into process.env so
   // the SDK server restart picks up fresh tokens and git identity.
   // The middleware already parsed the header into lastKnownTownConfig.
@@ -252,6 +262,12 @@ app.patch('/agents/:agentId/model', async c => {
     } else {
       delete process.env.GASTOWN_DISABLE_AI_COAUTHOR;
     }
+    // organization_id — keep the standalone env var in sync with the
+    // town config so org billing context is never lost.
+    const orgId = cfg.organization_id;
+    if (typeof orgId === 'string' && orgId) {
+      process.env.GASTOWN_ORGANIZATION_ID = orgId;
+    }
   }
 
   await updateAgentModel(

cloudflare-gastown/container/src/process-manager.ts

@@ -750,6 +750,12 @@ export async function sendMessage(agentId: string, prompt: string): Promise<void
  * by `buildKiloConfigContent` at agent startup.
  */
 function extractOrganizationId(): string | undefined {
+  // Primary source: standalone env var set by control-server on /agents/start
+  // and updated on every PATCH /model via X-Town-Config.
+  const envOrgId = process.env.GASTOWN_ORGANIZATION_ID;
+  if (envOrgId) return envOrgId;
+
+  // Fallback: extract from KILO_CONFIG_CONTENT (legacy path)
   const raw = process.env.KILO_CONFIG_CONTENT;
   if (!raw) return undefined;
   try {

cloudflare-gastown/container/src/types.ts

@@ -80,6 +80,8 @@ export const UpdateAgentModelRequest = z.object({
   smallModel: z.string().optional(),
   /** Pre-formatted conversation history to inject into the new session prompt. */
   conversationHistory: z.string().optional(),
+  /** Organization ID — ensures org billing context is preserved across model changes. */
+  organizationId: z.string().optional(),
 });
 export type UpdateAgentModelRequest = z.infer<typeof UpdateAgentModelRequest>;
 

cloudflare-gastown/src/dos/Town.do.ts

@@ -2067,14 +2067,20 @@ export class TownDO extends DurableObject<Env> {
       // before restarting the SDK server (tokens, git identity, etc.).
       const containerConfig = await config.buildContainerConfig(this.ctx.storage, this.env);
 
+      // Resolve townConfig to thread the organization_id into the request body
+      // (belt-and-suspenders: ensures org billing survives even if X-Town-Config
+      // header parsing fails on the container side).
+      const townConfig = await config.getTownConfig(this.ctx.storage);
+
       const updated = await dispatch.updateAgentModelInContainer(
         this.env,
         townId,
         mayor.id,
         model,
         smallModel,
         conversationHistory || undefined,
-        containerConfig
+        containerConfig,
+        townConfig.organization_id
       );
       if (updated) {
         console.log(

cloudflare-gastown/src/dos/town/config.ts

@@ -150,5 +150,6 @@ export async function buildContainerConfig(
     disable_ai_coauthor: config.disable_ai_coauthor,
     kilo_api_url: env.KILO_API_URL ?? '',
     gastown_api_url: env.GASTOWN_API_URL ?? '',
+    organization_id: config.organization_id,
   };
 }

cloudflare-gastown/src/dos/town/container-dispatch.ts

@@ -676,7 +676,8 @@ export async function updateAgentModelInContainer(
   model: string,
   smallModel?: string,
   conversationHistory?: string,
-  containerConfig?: Record<string, unknown>
+  containerConfig?: Record<string, unknown>,
+  organizationId?: string
 ): Promise<boolean> {
   try {
     const container = getTownContainerStub(env, townId);
@@ -691,6 +692,7 @@ export async function updateAgentModelInContainer(
         model,
         ...(smallModel ? { smallModel } : {}),
         ...(conversationHistory ? { conversationHistory } : {}),
+        ...(organizationId ? { organizationId } : {}),
       }),
     });
     return response.ok;