@parall/claude-agent 1.29.3 → 1.30.0

package/dist/dispatch.js

@@ -92,7 +92,7 @@ export class ClaudeCodeAdapter {
         const pending = this.pendingInjections.get(sessionKey) ?? 0;
         if (pending > 0) {
             this.pendingInjections.delete(sessionKey);
-            context.log?.info?.(`claude-agent[${context.accountId}]: consuming ${pending} steer turn(s)`);
+            context.log?.info?.(`consuming ${pending} steer turn(s)`);
             for (let i = 0; i < pending; i++) {
                 yield* this.consumeSteerTurn(sessionKey, context.log);
             }
@@ -109,7 +109,7 @@ export class ClaudeCodeAdapter {
             releasePreparedAttachments = pinLocalAttachmentPaths(prepared.attachments.images);
         }
         catch (err) {
-            context.log?.warn?.(`claude-agent[${context.accountId}]: failed to prepare local attachments: ${String(err)}`);
+            context.log?.warn?.(`failed to prepare local attachments: ${String(err)}`);
         }
         try {
             yield* this.runTurn(sessionKey, promptBody, context.log);
@@ -161,7 +161,7 @@ export class ClaudeCodeAdapter {
     async *consumeSteerTurn(sessionKey, log) {
         const state = this.processes.get(sessionKey);
         if (!state || state.done) {
-            throw new Error("claude-agent: process dead during steer consumption");
+            throw new Error("process dead during steer consumption");
         }
         const groupKey = randomUUID();
         const parserNext = state.parser.next();
@@ -171,7 +171,7 @@ export class ClaudeCodeAdapter {
         ]);
         if (firstRead.kind === "timeout") {
             state.steerReadPending = parserNext;
-            log?.info?.(`claude-agent: steer turn timeout — steer was incorporated into previous turn`);
+            log?.info?.(`steer turn timeout — steer was incorporated into previous turn`);
             return;
         }
         let next = firstRead.result;
@@ -180,7 +180,7 @@ export class ClaudeCodeAdapter {
             if (next.done) {
                 state.done = true;
                 this.processes.delete(sessionKey);
-                throw new Error("claude-agent: process exited while consuming steer turn");
+                throw new Error("process exited while consuming steer turn");
             }
             const parsed = next.value;
             if (parsed.type === "session_id") {
@@ -263,7 +263,7 @@ export class ClaudeCodeAdapter {
                 const detail = state.handle.stderrChunks.join("").trim();
                 const exit = await state.handle.exitPromise.catch(() => ({ code: null, signal: null }));
                 if (detail) {
-                    log?.warn?.(`claude-agent: subprocess stderr: ${detail}`);
+                    log?.warn?.(`subprocess stderr: ${detail}`);
                 }
                 if (!sawError) {
                     yield {
@@ -308,7 +308,7 @@ export class ClaudeCodeAdapter {
     }
     ensureProcess(sessionKey, log) {
         if (this.shuttingDown) {
-            throw new Error("claude-agent: adapter shutting down, refusing new process");
+            throw new Error("adapter shutting down, refusing new process");
         }
         const existing = this.processes.get(sessionKey);
         if (existing && !existing.done) {
@@ -333,7 +333,7 @@ export class ClaudeCodeAdapter {
     spawnProcess(sessionKey, log) {
         const args = this.buildArgs(sessionKey);
         const env = buildSpawnEnv(process.env, this.opts.claudeHome, this.buildPlaceholderContext(sessionKey), { allowApiKey: this.opts.allowApiKey, effortLevel: this._effortLevel });
-        log?.info(`claude-agent: spawn long-lived ${this.opts.claudeBin} (session ${sessionKey}, model=${this._model || "default"}, effort=${this._effortLevel || "default"}, mode=${this.opts.permissionMode})`);
+        log?.info(`spawn long-lived ${this.opts.claudeBin} (session ${sessionKey}, model=${this._model || "default"}, effort=${this._effortLevel || "default"}, mode=${this.opts.permissionMode})`);
         const proc = spawn(IS_WIN32 ? quoteWin32Arg(this.opts.claudeBin) : this.opts.claudeBin, IS_WIN32 ? args.map(quoteWin32Arg) : args, {
             cwd: this.opts.workspaceDir,
             env,

package/dist/index.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import * as os from "node:os";
-import { ParallAgentGateway, createPlatformConfigManager, createLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
+import { ParallAgentGateway, createPlatformConfigManager, createLogger, childLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
 import { ApiError, ParallClient, ParallWs } from "@parall/sdk";
 import { buildClaudeRuntimeKey, contextFilePathForSession, resolveClaudeAgentConfig, resolveWsUrl, sessionStateFilePathForRuntime, stepIdFilePathForSession, } from "./config.js";
 import { ClaudeCodeAdapter } from "./dispatch.js";
 import { ClaudeSessionManager } from "./session-manager.js";
 import { ensureClaudeWorkspace } from "./workspace.js";
 const log = createLogger("claude-agent");
+let activeLog = log;
 async function getAgentMeWithLegacyFallback(client, orgId) {
     try {
         return await client.getAgentMe(orgId);
@@ -35,20 +36,22 @@ async function main() {
     });
     const me = await getAgentMeWithLegacyFallback(client, config.orgId);
     const agentUserId = me.id;
-    ensureClaudeWorkspace(config.workspaceDir, log, {
+    const agentLog = childLogger(log, agentUserId);
+    activeLog = agentLog;
+    ensureClaudeWorkspace(config.workspaceDir, agentLog, {
         userId: agentUserId,
         displayName: me.display_name,
         description: me.agent_profile?.description ?? undefined,
     });
     const runtimeKey = config.runtimeKey || buildClaudeRuntimeKey(agentUserId);
     const sessionStateFilePath = sessionStateFilePathForRuntime(config.stateDir, runtimeKey);
-    const sessionManager = new ClaudeSessionManager(runtimeKey, sessionStateFilePath, log);
+    const sessionManager = new ClaudeSessionManager(runtimeKey, sessionStateFilePath, agentLog);
     const resolvedWsUrl = resolveWsUrl(config.apiUrl, config.wsUrl, config.swimlaneName);
     const ws = new ParallWs({
         getTicket: () => client.getWsTicket(),
         wsUrl: resolvedWsUrl,
     });
-    const configMgr = createPlatformConfigManager({ client, stateDir: config.stateDir, runtimeType: "claude-code", log });
+    const configMgr = createPlatformConfigManager({ client, stateDir: config.stateDir, runtimeType: "claude-code", log: agentLog });
     const platformDefaults = await configMgr.fetch();
     let platformManaged = isPlatformManagedProfile(me.agent_profile);
     const resolvedModel = platformManaged ? (platformDefaults.model ?? config.model) : config.model;
@@ -56,9 +59,9 @@ async function main() {
         ? (platformDefaults.thinkingEffort ?? (process.env.CLAUDE_CODE_EFFORT_LEVEL?.trim() || undefined))
         : (process.env.CLAUDE_CODE_EFFORT_LEVEL?.trim() || undefined);
     if (platformDefaults.model)
-        log.info(`platform config: model=${platformDefaults.model} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
+        agentLog.info(`platform config: model=${platformDefaults.model} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
     if (platformDefaults.thinkingEffort)
-        log.info(`platform config: thinking_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
+        agentLog.info(`platform config: thinking_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
     const adapter = new ClaudeCodeAdapter({
         claudeBin: config.claudeBin,
         claudeHome: config.claudeHome,
@@ -103,7 +106,7 @@ async function main() {
             claude_home: config.claudeHome,
         },
         dispatchAdapter: adapter,
-        log,
+        log: agentLog,
         shutdownDeadlineMs: parseShutdownDeadlineMs(process.env.PRLL_SHUTDOWN_DEADLINE_MS),
         contextFilePathForSession: (sessionKey) => contextFilePathForSession(config.stateDir, sessionKey),
         stepIdFilePathForSession: (sessionKey) => stepIdFilePathForSession(config.stateDir, sessionKey),
@@ -132,13 +135,17 @@ async function main() {
         // onBeforeDisconnect to close stdin and SIGTERM any survivors after
         // in-flight drains finish.
         onBeforeDisconnect: () => adapter.shutdown(),
+        onNewSession: async () => {
+            sessionManager.clearMainSession();
+            await adapter.shutdown();
+        },
     });
     const abortController = new AbortController();
     const abort = () => abortController.abort();
     process.on("SIGINT", abort);
     process.on("SIGTERM", abort);
     try {
-        log.info(`starting self-hosted Claude runtime for ${me.display_name} (${agentUserId})`);
+        agentLog.info(`starting self-hosted Claude runtime for ${me.display_name} (${agentUserId})`);
         await gateway.run(abortController.signal);
     }
     finally {
@@ -147,6 +154,6 @@ async function main() {
     }
 }
 main().catch((err) => {
-    log.error(`fatal: ${String(err)}`);
+    activeLog.error(`fatal: ${String(err)}`);
     process.exitCode = 1;
 });

package/dist/session-manager.d.ts

@@ -37,6 +37,7 @@ export declare class ClaudeSessionManager {
      */
     private raceWithTimeout;
     private closeHandle;
+    clearMainSession(): void;
     private restore;
     private persist;
 }

package/dist/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAO5D,KAAK,0BAA0B,GAAG;IAChC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,8BAA8B,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC7E,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAP1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAChE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0C;gBAGjD,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,0BAA0B,YAAA;IAKtD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAU3C,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQrD,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAYrE,WAAW,CAAC,UAAU,EAAE,MAAM;IAU9B,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAI/D,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB;IAsB/D,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IAO7D,qEAAqE;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAE5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;YAQpB,WAAW;IAuCzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,OAAO;IAYf,OAAO,CAAC,OAAO;CAahB"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../src/session-manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAO5D,KAAK,0BAA0B,GAAG;IAChC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,8BAA8B,CAAC;IACrC,WAAW,EAAE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC7E,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAP1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAChE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0C;gBAGjD,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,0BAA0B,YAAA;IAKtD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIpD,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAU3C,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQrD,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAYrE,WAAW,CAAC,UAAU,EAAE,MAAM;IAU9B,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAI/D,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB;IAsB/D,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,mBAAmB;IAO7D,qEAAqE;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAE5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;YAQpB,WAAW;IAuCzB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,WAAW;IAqBnB,gBAAgB;IAShB,OAAO,CAAC,OAAO;IAYf,OAAO,CAAC,OAAO;CAahB"}

package/dist/session-manager.js

@@ -164,6 +164,15 @@ export class ClaudeSessionManager {
             }
         }
     }
+    clearMainSession() {
+        this.sessionIds.delete(this.mainSessionKey);
+        try {
+            fs.unlinkSync(this.stateFilePath);
+        }
+        catch {
+            // File may not exist.
+        }
+    }
     restore() {
         try {
             const raw = fs.readFileSync(this.stateFilePath, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parall/claude-agent",
-  "version": "1.29.3",
+  "version": "1.30.0",
   "description": "Claude Code bridge runtime for self-hosted Parall agents",
   "license": "MIT",
   "repository": {
@@ -25,9 +25,9 @@
     "src"
   ],
   "dependencies": {
-    "@parall/agent-core": "1.29.3",
-    "@parall/cli": "1.29.3",
-    "@parall/sdk": "1.29.3"
+    "@parall/agent-core": "1.30.0",
+    "@parall/cli": "1.30.0",
+    "@parall/sdk": "1.30.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/dispatch.ts

@@ -150,7 +150,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
     const pending = this.pendingInjections.get(sessionKey) ?? 0;
     if (pending > 0) {
       this.pendingInjections.delete(sessionKey);
-      context.log?.info?.(`claude-agent[${context.accountId}]: consuming ${pending} steer turn(s)`);
+      context.log?.info?.(`consuming ${pending} steer turn(s)`);
       for (let i = 0; i < pending; i++) {
         yield* this.consumeSteerTurn(sessionKey, context.log);
       }
@@ -168,7 +168,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
       releasePreparedAttachments = pinLocalAttachmentPaths(prepared.attachments.images);
     } catch (err) {
       context.log?.warn?.(
-        `claude-agent[${context.accountId}]: failed to prepare local attachments: ${String(err)}`,
+        `failed to prepare local attachments: ${String(err)}`,
       );
     }
 
@@ -230,7 +230,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
   ): AsyncGenerator<RuntimeEvent> {
     const state = this.processes.get(sessionKey);
     if (!state || state.done) {
-      throw new Error("claude-agent: process dead during steer consumption");
+      throw new Error("process dead during steer consumption");
     }
 
     const groupKey = randomUUID();
@@ -245,7 +245,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
 
     if (firstRead.kind === "timeout") {
       state.steerReadPending = parserNext;
-      log?.info?.(`claude-agent: steer turn timeout — steer was incorporated into previous turn`);
+      log?.info?.(`steer turn timeout — steer was incorporated into previous turn`);
       return;
     }
 
@@ -255,7 +255,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
       if (next.done) {
         state.done = true;
         this.processes.delete(sessionKey);
-        throw new Error("claude-agent: process exited while consuming steer turn");
+        throw new Error("process exited while consuming steer turn");
       }
       const parsed = next.value;
 
@@ -334,7 +334,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
         const detail = state.handle.stderrChunks.join("").trim();
         const exit = await state.handle.exitPromise.catch(() => ({ code: null, signal: null } as const));
         if (detail) {
-          log?.warn?.(`claude-agent: subprocess stderr: ${detail}`);
+          log?.warn?.(`subprocess stderr: ${detail}`);
         }
         if (!sawError) {
           yield {
@@ -387,7 +387,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
 
   private ensureProcess(sessionKey: string, log: GatewayLogger | undefined): ProcessState {
     if (this.shuttingDown) {
-      throw new Error("claude-agent: adapter shutting down, refusing new process");
+      throw new Error("adapter shutting down, refusing new process");
     }
 
     const existing = this.processes.get(sessionKey);
@@ -420,7 +420,7 @@ export class ClaudeCodeAdapter implements DispatchAdapter {
     );
 
     log?.info(
-      `claude-agent: spawn long-lived ${this.opts.claudeBin} (session ${sessionKey}, model=${this._model || "default"}, effort=${this._effortLevel || "default"}, mode=${this.opts.permissionMode})`,
+      `spawn long-lived ${this.opts.claudeBin} (session ${sessionKey}, model=${this._model || "default"}, effort=${this._effortLevel || "default"}, mode=${this.opts.permissionMode})`,
     );
 
     const proc = spawn(

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import * as os from "node:os";
-import { ParallAgentGateway, createPlatformConfigManager, createLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
+import { ParallAgentGateway, createPlatformConfigManager, createLogger, childLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
 import { ApiError, ParallClient, ParallWs } from "@parall/sdk";
 import {
   buildClaudeRuntimeKey,
@@ -16,6 +16,7 @@ import { ClaudeSessionManager } from "./session-manager.js";
 import { ensureClaudeWorkspace } from "./workspace.js";
 
 const log = createLogger("claude-agent");
+let activeLog = log;
 
 async function getAgentMeWithLegacyFallback(client: ParallClient, orgId: string) {
   try {
@@ -52,7 +53,9 @@ async function main() {
 
   const me = await getAgentMeWithLegacyFallback(client, config.orgId);
   const agentUserId = me.id;
-  ensureClaudeWorkspace(config.workspaceDir, log, {
+  const agentLog = childLogger(log, agentUserId);
+  activeLog = agentLog;
+  ensureClaudeWorkspace(config.workspaceDir, agentLog, {
     userId: agentUserId,
     displayName: me.display_name,
     description: me.agent_profile?.description ?? undefined,
@@ -62,7 +65,7 @@ async function main() {
   const sessionManager = new ClaudeSessionManager(
     runtimeKey,
     sessionStateFilePath,
-    log,
+    agentLog,
   );
 
   const resolvedWsUrl = resolveWsUrl(config.apiUrl, config.wsUrl, config.swimlaneName);
@@ -71,15 +74,15 @@ async function main() {
     wsUrl: resolvedWsUrl,
   });
 
-  const configMgr = createPlatformConfigManager({ client, stateDir: config.stateDir, runtimeType: "claude-code", log });
+  const configMgr = createPlatformConfigManager({ client, stateDir: config.stateDir, runtimeType: "claude-code", log: agentLog });
   const platformDefaults = await configMgr.fetch();
   let platformManaged = isPlatformManagedProfile(me.agent_profile);
   const resolvedModel = platformManaged ? (platformDefaults.model ?? config.model) : config.model;
   const resolvedEffort = platformManaged
     ? (platformDefaults.thinkingEffort ?? (process.env.CLAUDE_CODE_EFFORT_LEVEL?.trim() || undefined))
     : (process.env.CLAUDE_CODE_EFFORT_LEVEL?.trim() || undefined);
-  if (platformDefaults.model) log.info(`platform config: model=${platformDefaults.model} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
-  if (platformDefaults.thinkingEffort) log.info(`platform config: thinking_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
+  if (platformDefaults.model) agentLog.info(`platform config: model=${platformDefaults.model} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
+  if (platformDefaults.thinkingEffort) agentLog.info(`platform config: thinking_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
 
   const adapter = new ClaudeCodeAdapter({
     claudeBin: config.claudeBin,
@@ -126,7 +129,7 @@ async function main() {
       claude_home: config.claudeHome,
     },
     dispatchAdapter: adapter,
-    log,
+    log: agentLog,
     shutdownDeadlineMs: parseShutdownDeadlineMs(process.env.PRLL_SHUTDOWN_DEADLINE_MS),
     contextFilePathForSession: (sessionKey) => contextFilePathForSession(config.stateDir, sessionKey),
     stepIdFilePathForSession: (sessionKey) => stepIdFilePathForSession(config.stateDir, sessionKey),
@@ -155,6 +158,10 @@ async function main() {
     // onBeforeDisconnect to close stdin and SIGTERM any survivors after
     // in-flight drains finish.
     onBeforeDisconnect: () => adapter.shutdown(),
+    onNewSession: async () => {
+      sessionManager.clearMainSession();
+      await adapter.shutdown();
+    },
   });
 
   const abortController = new AbortController();
@@ -163,7 +170,7 @@ async function main() {
   process.on("SIGTERM", abort);
 
   try {
-    log.info(`starting self-hosted Claude runtime for ${me.display_name} (${agentUserId})`);
+    agentLog.info(`starting self-hosted Claude runtime for ${me.display_name} (${agentUserId})`);
     await gateway.run(abortController.signal);
   } finally {
     process.off("SIGINT", abort);
@@ -172,6 +179,6 @@ async function main() {
 }
 
 main().catch((err) => {
-  log.error(`fatal: ${String(err)}`);
+  activeLog.error(`fatal: ${String(err)}`);
   process.exitCode = 1;
 });

package/src/session-manager.ts

@@ -207,6 +207,15 @@ export class ClaudeSessionManager {
     }
   }
 
+  clearMainSession() {
+    this.sessionIds.delete(this.mainSessionKey);
+    try {
+      fs.unlinkSync(this.stateFilePath);
+    } catch {
+      // File may not exist.
+    }
+  }
+
   private restore() {
     try {
       const raw = fs.readFileSync(this.stateFilePath, "utf8");