@parall/daemon 1.29.3 → 1.31.0

package/bundle/parall-codex-agent.js

@@ -3,6 +3,34 @@
 // ts/codex-agent/dist/index.js
 import * as os3 from "node:os";
 
+// ts/agent-core/dist/provider-config.js
+function llmSource(pc) {
+  if (pc?.llm_source)
+    return pc.llm_source;
+  if (pc?.openai_api_key || pc?.openai_base_url || pc?.anthropic_auth_token || pc?.anthropic_base_url) {
+    return "custom";
+  }
+  return "parall";
+}
+function clearAllProviderCreds(env) {
+  delete env.ANTHROPIC_AUTH_TOKEN;
+  delete env.ANTHROPIC_BASE_URL;
+  delete env.ANTHROPIC_API_KEY;
+  delete env.OPENAI_API_KEY;
+  delete env.OPENAI_BASE_URL;
+  delete env.PRLL_CLAUDE_ALLOW_API_KEY;
+}
+function parseProviderConfig(env) {
+  const raw = env.PRLL_PROVIDER_CONFIG?.trim();
+  if (!raw)
+    return void 0;
+  try {
+    return JSON.parse(raw);
+  } catch (err) {
+    throw new Error(`Invalid PRLL_PROVIDER_CONFIG JSON: ${String(err)}`);
+  }
+}
+
 // ts/agent-core/dist/session-state.js
 function normalizeSessionKey(sessionKey) {
   return sessionKey.toLowerCase();
@@ -428,9 +456,13 @@ function createLogger(prefix) {
   return {
     info: (msg) => console.log(`${(/* @__PURE__ */ new Date()).toISOString()} [${prefix}] ${msg}`),
     warn: (msg) => console.warn(`${(/* @__PURE__ */ new Date()).toISOString()} [${prefix}] ${msg}`),
-    error: (msg) => console.error(`${(/* @__PURE__ */ new Date()).toISOString()} [${prefix}] ${msg}`)
+    error: (msg) => console.error(`${(/* @__PURE__ */ new Date()).toISOString()} [${prefix}] ${msg}`),
+    child: (sub) => createLogger(`${prefix}:${sub}`)
   };
 }
+function childLogger(logger, sub) {
+  return logger.child ? logger.child(sub) : logger;
+}
 
 // ts/agent-core/dist/gateway-base.js
 import * as os from "node:os";
@@ -470,6 +502,7 @@ var ENDPOINTS = {
   ORG_MEMBER: (orgId, userId) => `${API_BASE}/orgs/${orgId}/members/${userId}`,
   ORG_MEMBER_CHATS: (orgId, memberId) => `${API_BASE}/orgs/${orgId}/members/${memberId}/chats`,
   ORG_MEMBER_TASKS: (orgId, memberId) => `${API_BASE}/orgs/${orgId}/members/${memberId}/tasks`,
+  REF_SEARCH: (orgId) => `${API_BASE}/orgs/${orgId}/refs/search`,
   // Direct messages (org-scoped, atomic find-or-create + send)
   DM: (orgId) => `${API_BASE}/orgs/${orgId}/dm`,
   // Onboarding
@@ -513,6 +546,7 @@ var ENDPOINTS = {
   AGENT_ACTIVITY: (orgId, agentId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/activity`,
   AGENT_MONITOR: (orgId, agentId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/monitor`,
   AGENT_ME: (orgId) => `${API_BASE}/orgs/${orgId}/agents/me`,
+  AGENT_NEW_SESSION: (orgId, agentId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/new-session`,
   AGENT_SESSIONS: (orgId, agentId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/sessions`,
   AGENT_SESSION: (orgId, agentId, sessionId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/sessions/${sessionId}`,
   AGENT_SESSION_STEPS: (orgId, agentId, sessionId) => `${API_BASE}/orgs/${orgId}/agents/${agentId}/sessions/${sessionId}/steps`,
@@ -551,6 +585,8 @@ var ENDPOINTS = {
   MACHINE_KEY: (orgId, machineId, keyId) => `${API_BASE}/orgs/${orgId}/machines/${machineId}/keys/${keyId}`,
   MACHINE_RUNTIME_AUTH_SESSIONS: (orgId, machineId) => `${API_BASE}/orgs/${orgId}/machines/${machineId}/runtime-auth-sessions`,
   MACHINE_RUNTIME_AUTH_SESSION_COMPLETE: (orgId, machineId, sessionId) => `${API_BASE}/orgs/${orgId}/machines/${machineId}/runtime-auth-sessions/${sessionId}/complete`,
+  MACHINE_REQUEST_UPDATE: (orgId, machineId) => `${API_BASE}/orgs/${orgId}/machines/${machineId}/request-update`,
+  MACHINE_BROWSE: (orgId, machineId) => `${API_BASE}/orgs/${orgId}/machines/${machineId}/browse`,
   // Machine self-control-plane (mck_-scoped). The bearer token implicitly
   // identifies the Machine, so there is no `:mid` URL parameter — these are
   // "self" routes called by the daemon for its own host.
@@ -560,6 +596,7 @@ var ENDPOINTS = {
   MACHINES_ME_AGENT_LAUNCH_CREDENTIAL: (agentId) => `${API_BASE}/machines/me/agents/${agentId}/launch-credential`,
   MACHINES_ME_AGENT_WORKSPACE_STATE: (agentId) => `${API_BASE}/machines/me/agents/${agentId}/workspace-state`,
   MACHINES_ME_WS_TICKET: `${API_BASE}/machines/me/ws/ticket`,
+  MACHINES_ME_BROWSE_RESPONSE: (requestId) => `${API_BASE}/machines/me/browse-response/${requestId}`,
   // Tasks (org-scoped)
   TASKS: (orgId) => `${API_BASE}/orgs/${orgId}/tasks`,
   TASK: (orgId, taskId) => `${API_BASE}/orgs/${orgId}/tasks/${taskId}`,
@@ -594,6 +631,12 @@ var ENDPOINTS = {
   INVITATION_ACCEPT: (id) => `${API_BASE}/invitations/${id}/accept`,
   INVITATION_DECLINE: (id) => `${API_BASE}/invitations/${id}/decline`,
   INVITATION_BY_TOKEN: (token) => `${API_BASE}/invitations/by-token/${token}`,
+  // Org-level shareable invite link
+  ORG_INVITE_LINK: (orgId) => `${API_BASE}/orgs/${orgId}/invite-link`,
+  ORG_INVITE_LINK_REGENERATE: (orgId) => `${API_BASE}/orgs/${orgId}/invite-link/regenerate`,
+  ORG_INVITE_LINK_JOIN_REQUESTS: (orgId) => `${API_BASE}/orgs/${orgId}/invite-link/join-requests`,
+  ORG_INVITE_LINK_JOIN_REQUEST_DECIDE: (orgId, jrId) => `${API_BASE}/orgs/${orgId}/invite-link/join-requests/${jrId}/decide`,
+  INVITE_LINK_JOIN: `${API_BASE}/invite-link/join`,
   // Wikis (org-scoped, served by wiki-service)
   WIKIS: (orgId) => `${WIKI_BASE}/orgs/${orgId}/wikis`,
   WIKI: (orgId, wikiId) => `${WIKI_BASE}/orgs/${orgId}/wikis/${wikiId}`,
@@ -713,6 +756,8 @@ var WS_EVENTS = {
   INVITATION_ACCEPTED: "invitation.accepted",
   INVITATION_DECLINED: "invitation.declined",
   INVITATION_REVOKED: "invitation.revoked",
+  ORG_JOIN_REQUEST_NEW: "org.join_request.new",
+  ORG_INVITE_LINK_JOINED: "org.invite_link.joined",
   AGENT_CONFIG_UPDATE: "agent_config.update",
   PRESENCE_UPDATE: "presence.update",
   WIKI_CHANGESET_CREATED: "wiki.changeset.created",
@@ -739,7 +784,11 @@ var WS_EVENTS = {
   MACHINE_AGENT_ATTACHED: "machine.agent.attached",
   MACHINE_AGENT_DETACHED: "machine.agent.detached",
   MACHINE_STOP: "machine.stop",
-  MACHINE_WORKSPACE_SETUP_REQUESTED: "machine.workspace.setup.requested"
+  MACHINE_WORKSPACE_SETUP_REQUESTED: "machine.workspace.setup.requested",
+  MACHINE_FILESYSTEM_BROWSE: "machine.filesystem.browse",
+  MACHINE_UPDATE: "machine.update",
+  MACHINE_CONFIG_UPDATED: "machine.config.updated",
+  AGENT_NEW_SESSION: "agent.new_session"
 };
 
 // ts/sdk/dist/client.js
@@ -1068,6 +1117,9 @@ var ParallClient = class _ParallClient {
     const res = await this.request("GET", ENDPOINTS.ORG_MEMBERS_ONLINE(orgId));
     return res.user_ids ?? [];
   }
+  async searchRefs(orgId, params) {
+    return this.request("GET", ENDPOINTS.REF_SEARCH(orgId), void 0, params);
+  }
   async removeOrgMember(orgId, userId) {
     return this.request("DELETE", ENDPOINTS.ORG_MEMBER(orgId, userId));
   }
@@ -1121,6 +1173,34 @@ var ParallClient = class _ParallClient {
   async getInvitationByToken(token) {
     return this.request("GET", ENDPOINTS.INVITATION_BY_TOKEN(token));
   }
+  // ---- Org-level shareable invite link ----
+  /** Fetch the org's current invite link. Auto-creates on first call
+   *  so the settings UI never sees an empty state. */
+  async getOrgInviteLink(orgId) {
+    return this.request("GET", ENDPOINTS.ORG_INVITE_LINK(orgId));
+  }
+  /** Rotate the token in place. The old token stops resolving immediately. */
+  async regenerateOrgInviteLink(orgId) {
+    return this.request("POST", ENDPOINTS.ORG_INVITE_LINK_REGENERATE(orgId));
+  }
+  /** Toggle the require-approval flag on the org's invite link. */
+  async updateOrgInviteLink(orgId, data) {
+    return this.request("PATCH", ENDPOINTS.ORG_INVITE_LINK(orgId), data);
+  }
+  /** Redeem an invite-link token. Caller must be authenticated; the
+   *  token is the lookup key so this endpoint is NOT org-scoped. */
+  async joinByInviteLink(token) {
+    return this.request("POST", ENDPOINTS.INVITE_LINK_JOIN, { token });
+  }
+  /** Admin: list pending invite-link join requests for an org. */
+  async listOrgJoinRequests(orgId) {
+    const res = await this.request("GET", ENDPOINTS.ORG_INVITE_LINK_JOIN_REQUESTS(orgId));
+    return res.data;
+  }
+  /** Admin: approve or reject a pending invite-link join request. */
+  async decideOrgJoinRequest(orgId, jrId, decision) {
+    return this.request("POST", ENDPOINTS.ORG_INVITE_LINK_JOIN_REQUEST_DECIDE(orgId, jrId), { decision });
+  }
   // ---- Direct Messages (org-scoped) ----
   async sendDirectMessage(orgId, req) {
     return this.request("POST", ENDPOINTS.DM(orgId), req);
@@ -1285,6 +1365,9 @@ var ParallClient = class _ParallClient {
     return this.request("GET", ENDPOINTS.AGENT_ME(orgId));
   }
   // ---- Agent Sessions (org-scoped) ----
+  async requestNewAgentSession(orgId, agentId) {
+    return this.request("POST", ENDPOINTS.AGENT_NEW_SESSION(orgId, agentId));
+  }
   async createAgentSession(orgId, agentId, req) {
     return this.request("POST", ENDPOINTS.AGENT_SESSIONS(orgId, agentId), req);
   }
@@ -1387,19 +1470,20 @@ var ParallClient = class _ParallClient {
   }
   // ---- Daemon-mode Machine management (org-scoped, user auth) ----
   /**
-   * Create a new daemon-mode Machine. Returns the Machine row + one-shot
-   * mck_ token. The UI uses this when the user clicks "Create Workspace".
+   * Create a new self-hosted daemon-mode Machine. Returns the Machine row +
+   * one-shot mck_ token.
    */
   async createMachine(orgId, opts) {
     return this.request("POST", ENDPOINTS.MACHINES(orgId), opts);
   }
   /**
-   * Returns only daemon_mode=true machines (non-terminated). Backs the
-   * "Workspaces" UI list. Legacy 1:1 machines are excluded.
+   * Returns local daemon_mode=true machines (non-terminated). Backs the
+   * "Workspaces" UI list. Legacy 1:1 and retired hosted daemon machines are
+   * excluded.
    */
   async getDaemonMachines(orgId) {
     const all = await this.getMachines(orgId);
-    return all.filter((m) => m.daemon_mode && m.status !== "terminated");
+    return all.filter((m) => m.daemon_mode && m.compute_mode === "local" && m.status !== "terminated");
   }
   /** Attach an agent to a daemon-mode Machine. */
   async attachAgent(orgId, machineId, agentId, opts) {
@@ -1419,8 +1503,8 @@ var ParallClient = class _ParallClient {
   async retryAgentWorkspaceSetup(orgId, machineId, agentId) {
     return this.request("POST", ENDPOINTS.MACHINE_AGENT_WORKSPACE_SETUP(orgId, machineId, agentId));
   }
-  async patchMachineLLMSource(orgId, machineId, llmSource) {
-    return this.request("PATCH", ENDPOINTS.MACHINE_LLM_SOURCE(orgId, machineId), { llm_source: llmSource });
+  async patchMachineLLMSource(orgId, machineId, llmSource2) {
+    return this.request("PATCH", ENDPOINTS.MACHINE_LLM_SOURCE(orgId, machineId), { llm_source: llmSource2 });
   }
   /** Get machine-level runtime auth state. */
   async getMachineRuntimeAuth(orgId, machineId) {
@@ -1461,8 +1545,9 @@ var ParallClient = class _ParallClient {
    * daemon should call this on a fixed cadence (e.g. every 30s) so an
    * external observer can detect a wedged supervisor.
    */
-  async postMachineHeartbeat() {
-    return this.request("POST", ENDPOINTS.MACHINES_ME_HEALTH);
+  async postMachineHeartbeat(daemonVersion) {
+    const body = daemonVersion ? { daemon_version: daemonVersion } : void 0;
+    return this.request("POST", ENDPOINTS.MACHINES_ME_HEALTH, body);
   }
   async reportAgentWorkspaceState(agentId, state) {
     const res = await this.request("PUT", ENDPOINTS.MACHINES_ME_AGENT_WORKSPACE_STATE(agentId), state);
@@ -1484,9 +1569,19 @@ var ParallClient = class _ParallClient {
   async getMachineWsTicket() {
     return this.request("POST", ENDPOINTS.MACHINES_ME_WS_TICKET);
   }
+  async postBrowseResponse(requestId, response) {
+    return this.request("POST", ENDPOINTS.MACHINES_ME_BROWSE_RESPONSE(requestId), response);
+  }
   async resizeMachine(orgId, machineId, spec) {
     return this.request("PATCH", ENDPOINTS.MACHINE_SPEC(orgId, machineId), spec);
   }
+  /** Signal a local daemon-mode Machine to check for and apply an update. */
+  async requestMachineUpdate(orgId, machineId, mandatory = false) {
+    await this.request("POST", ENDPOINTS.MACHINE_REQUEST_UPDATE(orgId, machineId), { mandatory });
+  }
+  async browseMachineFilesystem(orgId, machineId, path8) {
+    return this.request("POST", ENDPOINTS.MACHINE_BROWSE(orgId, machineId), { path: path8 }, void 0, false, { timeoutMs: 15e3 });
+  }
   /** Create a new machine key. Returns the raw key string (shown once) + metadata. */
   async createMachineKey(orgId, machineId, name) {
     return this.request("POST", ENDPOINTS.MACHINE_KEYS(orgId, machineId), name ? { name } : void 0);
@@ -2334,6 +2429,7 @@ var ParallWs = class {
 };
 
 // ts/agent-core/dist/gateway-base.js
+var LIVE_SESSION_STATUSES = /* @__PURE__ */ new Set(["open", "active", "idle"]);
 function parseShutdownDeadlineMs(raw) {
   if (!raw)
     return void 0;
@@ -2399,6 +2495,7 @@ var ParallAgentGateway = class {
   shuttingDown = false;
   inFlightDispatches = 0;
   drainResolvers = [];
+  pendingRestartNotification = null;
   DISPATCHED_MESSAGES_CAP = 5e3;
   COLD_START_WINDOW_MS;
   // SHUTDOWN_DEADLINE_MS is read by waitForDrain via the configured value
@@ -2413,7 +2510,7 @@ var ParallAgentGateway = class {
   async run(abortSignal) {
     const { ws, log: log2 } = this.opts;
     ws.onStateChange((state) => {
-      log2?.info(`parall[${this.opts.accountId}]: connection state \u2192 ${state}`);
+      log2?.info(`connection state \u2192 ${state}`);
     });
     ws.on("hello", async (data) => {
       await this.handleHello(data);
@@ -2442,16 +2539,29 @@ var ParallAgentGateway = class {
       await this.handleMessage(data);
     });
     ws.on("agent_config.update", async (data) => {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: config update notification (version=${data.version})`);
+      this.opts.log?.info(`config update notification (version=${data.version})`);
       try {
         await this.opts.onConfigUpdate?.(data);
       } catch (err) {
-        this.opts.log?.warn(`parall[${this.opts.accountId}]: config update failed: ${String(err)}`);
+        this.opts.log?.warn(`config update failed: ${String(err)}`);
+      }
+    });
+    ws.on("agent.new_session", async (data) => {
+      const prevId = data.previous_session_id ?? "";
+      this.opts.log?.info(`new session signal received (previous=${prevId})`);
+      this.sessionBindings.clear();
+      if (prevId) {
+        this.pendingRestartNotification = `[Harness Notification] This is a fresh session. Your previous session (${prevId}) was ended by the user and you have been restarted.`;
+      }
+      try {
+        await this.opts.onNewSession?.(prevId);
+      } catch (err) {
+        this.opts.log?.warn(`onNewSession callback failed: ${String(err)}`);
       }
     });
     ws.on("recovery.overflow", () => {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: recovery.overflow \u2014 triggering full catch-up`);
-      this.catchUpFromDispatch().catch((err) => this.opts.log?.warn(`parall[${this.opts.accountId}]: overflow catch-up failed: ${String(err)}`));
+      this.opts.log?.warn(`recovery.overflow \u2014 triggering full catch-up`);
+      this.catchUpFromDispatch().catch((err) => this.opts.log?.warn(`overflow catch-up failed: ${String(err)}`));
     });
     ws.on("task.assigned", async (data) => {
       if (data.assignee_id !== this.opts.agentUserId)
@@ -2465,7 +2575,7 @@ var ParallAgentGateway = class {
           });
         }
       } catch (err) {
-        this.opts.log?.error(`parall[${this.opts.accountId}]: task dispatch failed for ${data.id}: ${String(err)}`);
+        this.opts.log?.error(`task dispatch failed for ${data.id}: ${String(err)}`);
       }
     });
     ws.on("dispatch.new", async (data) => {
@@ -2479,7 +2589,7 @@ var ParallAgentGateway = class {
             });
           }
         } catch (err) {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: task comment dispatch failed for ${data.source_id}: ${String(err)}`);
+          this.opts.log?.error(`task comment dispatch failed for ${data.source_id}: ${String(err)}`);
         }
       } else if (data.event_type === "task_update") {
         if (!data.task_id)
@@ -2491,7 +2601,7 @@ var ParallAgentGateway = class {
             });
           }
         } catch (err) {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: task update dispatch failed for ${data.task_id}: ${String(err)}`);
+          this.opts.log?.error(`task update dispatch failed for ${data.task_id}: ${String(err)}`);
         }
       } else if (data.event_type === "schedule.fire") {
         if (!data.source_id)
@@ -2503,7 +2613,7 @@ var ParallAgentGateway = class {
             });
           }
         } catch (err) {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: schedule fire dispatch failed for ${data.source_id}: ${String(err)}`);
+          this.opts.log?.error(`schedule fire dispatch failed for ${data.source_id}: ${String(err)}`);
         }
       } else if (data.event_type === "approval_decided") {
         if (!data.source_id)
@@ -2515,13 +2625,13 @@ var ParallAgentGateway = class {
             });
           }
         } catch (err) {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: approval decided dispatch failed for ${data.source_id}: ${String(err)}`);
+          this.opts.log?.error(`approval decided dispatch failed for ${data.source_id}: ${String(err)}`);
         }
       } else if (data.event_type !== "message" && data.event_type !== "task_assign") {
-        this.opts.log?.info(`parall[${this.opts.accountId}]: dispatch.new with unhandled event_type=${String(data.event_type)} (id=${data.id}) \u2014 no-op`);
+        this.opts.log?.info(`dispatch.new with unhandled event_type=${String(data.event_type)} (id=${data.id}) \u2014 no-op`);
       }
     });
-    this.opts.log?.info(`parall[${this.opts.accountId}]: connecting to ${this.opts.connectionLabel ?? "Parall WS"}...`);
+    this.opts.log?.info(`connecting to ${this.opts.connectionLabel ?? "Parall WS"}...`);
     await ws.connect();
     return new Promise((resolve4) => {
       abortSignal.addEventListener("abort", async () => {
@@ -2635,7 +2745,7 @@ var ParallAgentGateway = class {
         }
       });
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to create input step: ${String(err)}`);
+      this.opts.log?.warn(`failed to create input step: ${String(err)}`);
     }
   }
   async createRuntimeStep(sessionId, event, runtimeEvent, stepIdFilePath, contextFilePath) {
@@ -2713,12 +2823,12 @@ var ParallAgentGateway = class {
             target_type: target.target_type,
             target_id: target.target_id,
             content: { text: runtimeEvent.message, suppressed: false },
-            projection: true
+            projection: false
           });
           break;
       }
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to create ${runtimeEvent.type} step: ${String(err)}`);
+      this.opts.log?.warn(`failed to create ${runtimeEvent.type} step: ${String(err)}`);
     }
   }
   writeContextFile(filePath, ctx) {
@@ -2726,7 +2836,7 @@ var ParallAgentGateway = class {
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
       fs.writeFileSync(filePath, JSON.stringify(ctx), "utf8");
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to write context file ${filePath}: ${String(err)}`);
+      this.opts.log?.warn(`failed to write context file ${filePath}: ${String(err)}`);
     }
   }
   updateContextFileStepId(filePath, stepId) {
@@ -2736,7 +2846,7 @@ var ParallAgentGateway = class {
       ctx.step_id = stepId;
       fs.writeFileSync(filePath, JSON.stringify(ctx), "utf8");
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to update context file step_id ${filePath}: ${String(err)}`);
+      this.opts.log?.warn(`failed to update context file step_id ${filePath}: ${String(err)}`);
     }
   }
   updateContextFileSessionId(filePath, sessionId) {
@@ -2746,7 +2856,7 @@ var ParallAgentGateway = class {
       ctx.session_id = sessionId;
       fs.writeFileSync(filePath, JSON.stringify(ctx), "utf8");
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to update context file session_id ${filePath}: ${String(err)}`);
+      this.opts.log?.warn(`failed to update context file session_id ${filePath}: ${String(err)}`);
     }
   }
   /** @deprecated Use writeContextFile / updateContextFileStepId. */
@@ -2755,7 +2865,7 @@ var ParallAgentGateway = class {
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
       fs.writeFileSync(filePath, stepId, "utf8");
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to write step id file ${filePath}: ${String(err)}`);
+      this.opts.log?.warn(`failed to write step id file ${filePath}: ${String(err)}`);
     }
   }
   /** @deprecated Use writeContextFile / updateContextFileStepId. */
@@ -2789,6 +2899,17 @@ var ParallAgentGateway = class {
       parent_session_id: parentSessionId,
       runtime_ref: Object.keys(runtimeRef).length > 0 ? runtimeRef : void 0
     });
+    if (!LIVE_SESSION_STATUSES.has(session.status)) {
+      this.opts.log?.warn?.(`createAgentSession returned terminal session ${session.id} (${session.status}), resetting runtime for ${sessionKey}`);
+      this.sessionBindings.delete(sessionKey);
+      try {
+        await this.opts.onSessionStale?.(sessionKey);
+      } catch (e) {
+        this.opts.log?.warn?.(`onSessionStale failed: ${e}`);
+      }
+      this.opts.log?.info?.(`stale session self-heal complete for ${sessionKey} \u2014 next dispatch will create a fresh session`);
+      throw new Error(`Agent session ${session.id} is terminal (${session.status})`);
+    }
     const binding = {
       sessionKey,
       agentSessionId: session.id,
@@ -2812,9 +2933,13 @@ var ParallAgentGateway = class {
   // catch-up on the replacement pod — otherwise we silently drop work.
   async runDispatch(event, sessionKey, bodyForAgent, earlierEvents = [], captureText) {
     if (this.shuttingDown) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: skipping dispatch for ${event.messageId} (shutting down) \u2014 leaving unacked for catch-up on replacement pod`);
+      this.opts.log?.info(`skipping dispatch for ${event.messageId} (shutting down) \u2014 leaving unacked for catch-up on replacement pod`);
       return false;
     }
+    if (this.pendingRestartNotification) {
+      bodyForAgent = this.pendingRestartNotification + "\n\n---\n\n" + bodyForAgent;
+      this.pendingRestartNotification = null;
+    }
     setSessionChatId(sessionKey, event.targetId);
     setSessionMessageId(sessionKey, event.messageId);
     setDispatchMessageId(sessionKey, event.messageId);
@@ -2944,7 +3069,7 @@ var ParallAgentGateway = class {
             item.resolve(true);
           }
         } catch (err) {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: fork dispatch failed for ${last.messageId}: ${String(err)}`);
+          this.opts.log?.error(`fork dispatch failed for ${last.messageId}: ${String(err)}`);
           for (const item of items) {
             item.resolve(false);
           }
@@ -2962,7 +3087,7 @@ var ParallAgentGateway = class {
         try {
           historyPath = this.opts.dispatchAdapter.getSessionHistoryPath?.(fork.fork.sessionKey);
         } catch (err) {
-          this.opts.log?.warn?.(`parall[${this.opts.accountId}]: failed to resolve fork history path: ${String(err)}`);
+          this.opts.log?.warn?.(`failed to resolve fork history path: ${String(err)}`);
         }
         this.dispatchState.pendingForkResults.push({
           forkSessionKey: fork.fork.sessionKey,
@@ -3013,7 +3138,7 @@ var ParallAgentGateway = class {
     try {
       while (this.dispatchState.mainBuffer.length > 0) {
         if (this.shuttingDown) {
-          this.opts.log?.info(`parall[${this.opts.accountId}]: drainMainBuffer halted (shutting down) \u2014 ${this.dispatchState.mainBuffer.length} buffered, ${this.dispatchState.pendingForkResults.length} pending fork results left for catch-up`);
+          this.opts.log?.info(`drainMainBuffer halted (shutting down) \u2014 ${this.dispatchState.mainBuffer.length} buffered, ${this.dispatchState.pendingForkResults.length} pending fork results left for catch-up`);
           break;
         }
         const targetId = this.dispatchState.mainBuffer[0].targetId;
@@ -3079,7 +3204,7 @@ var ParallAgentGateway = class {
         this.dispatchState.mainBuffer.push(event);
         if (this.dispatchState.mainCurrentTargetId === event.targetId && await this.opts.dispatchAdapter.enqueueDuringDispatch?.(this.opts.runtimeKey, buildEventBody(event))) {
           this.startInjectedTyping(event);
-          this.opts.log?.info(`parall[${this.opts.accountId}]: steer injected for ${event.messageId} (will drain for bookkeeping)`);
+          this.opts.log?.info(`steer injected for ${event.messageId} (will drain for bookkeeping)`);
         }
         if (!this.dispatchState.mainDispatching && !this.draining && this.dispatchState.mainBuffer.length > 0) {
           this.dispatchState.mainDispatching = true;
@@ -3108,7 +3233,7 @@ var ParallAgentGateway = class {
           preDispatchBranchPoint: this.dispatchState.mainPreDispatchBranchPoint
         });
         if (!fork) {
-          this.opts.log?.warn(`parall[${this.opts.accountId}]: fork failed, buffering event for main session`);
+          this.opts.log?.warn(`fork failed, buffering event for main session`);
           this.dispatchState.mainBuffer.push(event);
           return false;
         }
@@ -3124,7 +3249,7 @@ var ParallAgentGateway = class {
           activeFork.queue.push({ event, resolve: resolve4 });
         });
         this.runForkDrainLoop(activeFork).catch((err) => {
-          this.opts.log?.error(`parall[${this.opts.accountId}]: fork drain loop error: ${String(err)}`);
+          this.opts.log?.error(`fork drain loop error: ${String(err)}`);
         });
         return firstEventPromise;
       }
@@ -3144,7 +3269,7 @@ var ParallAgentGateway = class {
       this.chatInfoMap.set(chatId, chatInfo);
       return chatInfo;
     } catch (err) {
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: failed to resolve chat ${chatId}: ${String(err)}`);
+      this.opts.log?.warn(`failed to resolve chat ${chatId}: ${String(err)}`);
       return null;
     }
   }
@@ -3217,7 +3342,7 @@ var ParallAgentGateway = class {
         this.dispatchedMessages.delete(data.id);
       }
     } catch (err) {
-      this.opts.log?.error(`parall[${this.opts.accountId}]: event dispatch failed for ${data.id}: ${String(err)}`);
+      this.opts.log?.error(`event dispatch failed for ${data.id}: ${String(err)}`);
       this.dispatchedMessages.delete(data.id);
     }
   }
@@ -3226,11 +3351,11 @@ var ParallAgentGateway = class {
       return false;
     const dedupeKey = `${task.id}:${task.updated_at}`;
     if (this.dispatchedTasks.has(dedupeKey)) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: skipping already-dispatched task ${task.identifier ?? task.id}`);
+      this.opts.log?.info(`skipping already-dispatched task ${task.identifier ?? task.id}`);
       return false;
     }
     this.dispatchedTasks.add(dedupeKey);
-    this.opts.log?.info(`parall[${this.opts.accountId}]: task assigned: ${task.identifier ?? task.id} "${task.title}"`);
+    this.opts.log?.info(`task assigned: ${task.identifier ?? task.id} "${task.title}"`);
     const parts = [`Title: ${task.title}`];
     parts.push(`Status: ${task.status}`, `Priority: ${task.priority}`);
     if (task.project_id)
@@ -3271,7 +3396,7 @@ var ParallAgentGateway = class {
     const isAssignee = task.assignee_id === this.opts.agentUserId;
     const isCreatorUpdate = opts.allowCreator === true && task.creator_id === this.opts.agentUserId;
     if (!isAssignee && !isCreatorUpdate) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: skipping stale task dispatch ${ackSourceId ?? taskId} \u2014 assigned to ${task.assignee_id}, creator ${task.creator_id}`);
+      this.opts.log?.info(`skipping stale task dispatch ${ackSourceId ?? taskId} \u2014 assigned to ${task.assignee_id}, creator ${task.creator_id}`);
       return true;
     }
     return this.handleTaskAssignment(task, ackSourceId);
@@ -3289,7 +3414,7 @@ var ParallAgentGateway = class {
     } catch (err) {
       const status = err?.status;
       if (status === 404) {
-        this.opts.log?.info(`parall[${this.opts.accountId}]: skipping deleted comment ${commentId}, acking stale dispatch`);
+        this.opts.log?.info(`skipping deleted comment ${commentId}, acking stale dispatch`);
         this.dispatchedTasks.delete(dedupeKey);
         return true;
       }
@@ -3301,7 +3426,7 @@ var ParallAgentGateway = class {
       return true;
     }
     if (comment.hints?.no_reply) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: skipping no_reply task comment ${commentId}, acking stale dispatch`);
+      this.opts.log?.info(`skipping no_reply task comment ${commentId}, acking stale dispatch`);
       this.dispatchedTasks.delete(dedupeKey);
       return true;
     }
@@ -3311,7 +3436,7 @@ var ParallAgentGateway = class {
     } catch {
     }
     const taskLabel = task ? `${task.identifier ?? task.id} "${task.title}"` : taskId;
-    this.opts.log?.info(`parall[${this.opts.accountId}]: task comment on ${taskLabel} by ${actorId ?? "unknown"}`);
+    this.opts.log?.info(`task comment on ${taskLabel} by ${actorId ?? "unknown"}`);
     const parts = [];
     if (task) {
       parts.push(`Task: ${task.title} (prll://${task.id})`);
@@ -3361,10 +3486,10 @@ var ParallAgentGateway = class {
     } catch (err) {
       const status = err?.status;
       if (status === 404) {
-        this.opts.log?.warn(`parall[${this.opts.accountId}]: schedule run ${runId} not accessible (404), acking stale dispatch`);
+        this.opts.log?.warn(`schedule run ${runId} not accessible (404), acking stale dispatch`);
         return true;
       }
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: schedule run fetch failed for ${runId}, leaving pending: ${String(err)}`);
+      this.opts.log?.warn(`schedule run fetch failed for ${runId}, leaving pending: ${String(err)}`);
       return false;
     }
     if (!run)
@@ -3378,7 +3503,7 @@ var ParallAgentGateway = class {
     if (this.dispatchedTasks.has(dedupeKey))
       return false;
     this.dispatchedTasks.add(dedupeKey);
-    this.opts.log?.info(`parall[${this.opts.accountId}]: schedule fired: ${run.id} (schedule ${run.schedule_id})`);
+    this.opts.log?.info(`schedule fired: ${run.id} (schedule ${run.schedule_id})`);
     const event = {
       type: "schedule",
       // Route by schedule_id (not attached chat_id) so concurrent fires of
@@ -3415,10 +3540,10 @@ var ParallAgentGateway = class {
     } catch (err) {
       const status = err?.status;
       if (status === 404 || status === 403) {
-        this.opts.log?.warn(`parall[${this.opts.accountId}]: approval ${approvalId} not accessible (${status}), acking stale dispatch`);
+        this.opts.log?.warn(`approval ${approvalId} not accessible (${status}), acking stale dispatch`);
         return true;
       }
-      this.opts.log?.warn(`parall[${this.opts.accountId}]: approval fetch failed for ${approvalId}, leaving pending: ${String(err)}`);
+      this.opts.log?.warn(`approval fetch failed for ${approvalId}, leaving pending: ${String(err)}`);
       return false;
     }
     if (!approval)
@@ -3429,7 +3554,7 @@ var ParallAgentGateway = class {
     if (this.dispatchedTasks.has(dedupeKey))
       return false;
     this.dispatchedTasks.add(dedupeKey);
-    this.opts.log?.info(`parall[${this.opts.accountId}]: approval decided: ${approval.id} (${approval.status})`);
+    this.opts.log?.info(`approval decided: ${approval.id} (${approval.status})`);
     const statusLabel = approval.status === "approved" ? "Approved" : "Rejected";
     const execInfo = approval.execution_status ? ` | execution: ${approval.execution_status}` : "";
     const body = `${statusLabel}: ${approval.title}${execInfo}`;
@@ -3479,14 +3604,14 @@ var ParallAgentGateway = class {
             try {
               dispatched = await this.handleTaskDispatch(item.task_id, item.source_id ?? item.task_id);
             } catch (err) {
-              this.opts.log?.warn(`parall[${this.opts.accountId}]: catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
+              this.opts.log?.warn(`catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
               continue;
             }
           } else if (item.event_type === "task_update" && item.task_id) {
             try {
               dispatched = await this.handleTaskDispatch(item.task_id, item.source_id ?? item.task_id, { allowCreator: true });
             } catch (err) {
-              this.opts.log?.warn(`parall[${this.opts.accountId}]: catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
+              this.opts.log?.warn(`catch-up task fetch failed for ${item.task_id}, leaving pending: ${String(err)}`);
               continue;
             }
           } else if (item.event_type === "task_comment" && item.source_id && item.task_id) {
@@ -3508,7 +3633,7 @@ var ParallAgentGateway = class {
                 msg = null;
               } else {
                 msgFetchFailed = true;
-                this.opts.log?.warn(`parall[${this.opts.accountId}]: catch-up message fetch failed for ${item.source_id}, leaving pending: ${String(err)}`);
+                this.opts.log?.warn(`catch-up message fetch failed for ${item.source_id}, leaving pending: ${String(err)}`);
               }
             }
             if (msgFetchFailed) {
@@ -3539,13 +3664,13 @@ var ParallAgentGateway = class {
             });
           }
         } catch (err) {
-          this.opts.log?.warn(`parall[${this.opts.accountId}]: catch-up dispatch ${item.id} (${item.event_type}) failed: ${String(err)}`);
+          this.opts.log?.warn(`catch-up dispatch ${item.id} (${item.event_type}) failed: ${String(err)}`);
         }
       }
       cursor = !this.shuttingDown && page.has_more ? page.next_cursor : void 0;
     } while (cursor);
     if (processed > 0 || skippedOld > 0) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: dispatch catch-up: processed ${processed}, skipped ${skippedOld} old item(s)`);
+      this.opts.log?.info(`dispatch catch-up: processed ${processed}, skipped ${skippedOld} old item(s)`);
     }
   }
   async handleHello(data) {
@@ -3554,7 +3679,7 @@ var ParallAgentGateway = class {
     const intervalSec = data.heartbeat_interval > 0 ? data.heartbeat_interval : 30;
     try {
       const count = await fetchAllChats(client, config.org_id, this.chatInfoMap);
-      log2?.info(`parall[${this.opts.accountId}]: WebSocket connected, ${count} chats cached`);
+      log2?.info(`WebSocket connected, ${count} chats cached`);
       await this.opts.onSessionReady?.({
         activeSessionId: this.activeSessionId,
         ws: this.opts.ws,
@@ -3568,7 +3693,7 @@ var ParallAgentGateway = class {
         const expectedMs = intervalSec * 1e3;
         const drift = now - this.lastHeartbeatAt - expectedMs;
         if (drift > 15e3) {
-          log2?.warn(`parall[${this.opts.accountId}]: heartbeat drift ${drift}ms \u2014 event loop may be blocked`);
+          log2?.warn(`heartbeat drift ${drift}ms \u2014 event loop may be blocked`);
         }
         this.lastHeartbeatAt = now;
         if (this.opts.ws.state !== "connected")
@@ -3584,10 +3709,10 @@ var ParallAgentGateway = class {
       const isFirstHello = !this.hadSuccessfulHello;
       this.hadSuccessfulHello = true;
       this.catchUpFromDispatch(isFirstHello).catch((err) => {
-        log2?.warn(`parall[${this.opts.accountId}]: dispatch catch-up failed: ${String(err)}`);
+        log2?.warn(`dispatch catch-up failed: ${String(err)}`);
       });
     } catch (err) {
-      log2?.error(`parall[${this.opts.accountId}]: failed to fetch chats: ${String(err)}`);
+      log2?.error(`failed to fetch chats: ${String(err)}`);
     }
   }
   // Resolves when in-flight dispatches hit 0 or the deadline elapses.
@@ -3613,12 +3738,12 @@ var ParallAgentGateway = class {
   async shutdown() {
     this.shuttingDown = true;
     if (this.inFlightDispatches > 0) {
-      this.opts.log?.info(`parall[${this.opts.accountId}]: draining ${this.inFlightDispatches} in-flight dispatch(es), deadline ${this.SHUTDOWN_DEADLINE_MS}ms`);
+      this.opts.log?.info(`draining ${this.inFlightDispatches} in-flight dispatch(es), deadline ${this.SHUTDOWN_DEADLINE_MS}ms`);
       await this.waitForDrain(this.SHUTDOWN_DEADLINE_MS);
       if (this.inFlightDispatches > 0) {
-        this.opts.log?.warn(`parall[${this.opts.accountId}]: drain deadline hit; ${this.inFlightDispatches} dispatch(es) still running \u2014 they will be killed by process exit`);
+        this.opts.log?.warn(`drain deadline hit; ${this.inFlightDispatches} dispatch(es) still running \u2014 they will be killed by process exit`);
       } else {
-        this.opts.log?.info(`parall[${this.opts.accountId}]: drain complete`);
+        this.opts.log?.info(`drain complete`);
       }
     }
     if (this.heartbeatTimer)
@@ -3629,7 +3754,7 @@ var ParallAgentGateway = class {
     this.activeDispatches.clear();
     await this.opts.onBeforeDisconnect?.();
     this.opts.ws.disconnect();
-    this.opts.log?.info(`parall[${this.opts.accountId}]: disconnected`);
+    this.opts.log?.info(`disconnected`);
   }
 };
 
@@ -4243,8 +4368,8 @@ function resolveCodexAgentConfig(env = process.env) {
   const apiKey = requireEnv(env, "PRLL_API_KEY");
   const orgId = requireEnv(env, "PRLL_ORG_ID");
   const codexHome = resolvePath(env.PRLL_CODEX_HOME?.trim() || env.CODEX_HOME?.trim() || path4.join(env.HOME || os2.homedir(), ".codex"));
-  const stateDir = resolvePath(env.PRLL_CODEX_STATE_DIR?.trim() || path4.join(env.HOME || os2.homedir(), ".parall-agent"));
-  const workspaceDir = resolvePath(env.PRLL_CODEX_WORKSPACE_DIR?.trim() || path4.join(stateDir, "workspace"));
+  const stateDir = resolvePath(env.PRLL_STATE_DIR?.trim() || path4.join(env.HOME || os2.homedir(), ".parall-agent"));
+  const workspaceDir = resolvePath(env.PRLL_WORKSPACE_DIR?.trim() || path4.join(stateDir, "workspace"));
   return {
     apiUrl,
     apiKey,
@@ -5262,7 +5387,7 @@ var CodexAppServerAdapter = class {
   setActiveTurn(threadId, sink, log2) {
     const existing = this.activeTurns.get(threadId);
     if (existing) {
-      (log2 ?? this.opts.log)?.warn?.(`codex-agent: thread ${threadId} already had an active turn; failing the previous dispatch`);
+      (log2 ?? this.opts.log)?.warn?.(`thread ${threadId} already had an active turn; failing the previous dispatch`);
       existing.push({ kind: "error", message: `thread ${threadId} replaced by concurrent turn` });
       existing.close();
     }
@@ -5296,7 +5421,7 @@ var CodexAppServerAdapter = class {
       this.pendingInjections.set(sessionKey, (this.pendingInjections.get(sessionKey) ?? 0) + 1);
       return true;
     } catch (err) {
-      this.opts.log?.warn?.(`codex-agent: turn/steer failed: ${errToString(err)}`);
+      this.opts.log?.warn?.(`turn/steer failed: ${errToString(err)}`);
       return false;
     }
   }
@@ -5309,7 +5434,7 @@ var CodexAppServerAdapter = class {
       this.pendingInjections.delete(sessionKey);
       const threadId2 = this.opts.sessionManager.getThreadId(sessionKey);
       if (threadId2 && this.client && !this.client.isDisposed()) {
-        (this.opts.log ?? context.log)?.info?.(`codex-agent[${context.accountId}]: ${pending} steer injection(s) already sent; skipping turn/start`);
+        (this.opts.log ?? context.log)?.info?.(`${pending} steer injection(s) already sent; skipping turn/start`);
         yield {
           type: "runtime_session",
           runtimeSessionId: threadId2,
@@ -5317,7 +5442,7 @@ var CodexAppServerAdapter = class {
         };
         return;
       }
-      (this.opts.log ?? context.log)?.warn?.(`codex-agent[${context.accountId}]: pending steer invalidated (subprocess died); falling through to normal dispatch`);
+      (this.opts.log ?? context.log)?.warn?.(`pending steer invalidated (subprocess died); falling through to normal dispatch`);
     }
     await this.ensureStarted(context.log);
     const client = this.client;
@@ -5343,7 +5468,7 @@ var CodexAppServerAdapter = class {
         this.opts.sessionManager.recordThreadId(sessionKey, threadId);
         this.resumedThreadIds.add(threadId);
       } catch (err) {
-        log2?.warn?.(`codex-agent: thread/resume failed (${errToString(err)}); attempting one-shot fresh-thread start`);
+        log2?.warn?.(`thread/resume failed (${errToString(err)}); attempting one-shot fresh-thread start`);
         let freshThreadId;
         try {
           freshThreadId = await this.openThread(client, { resumeId: void 0 });
@@ -5378,7 +5503,7 @@ var CodexAppServerAdapter = class {
         preparedImages = prepared.attachments.images;
         releasePreparedAttachments = pinLocalAttachmentPaths(preparedImages);
       } catch (err) {
-        log2?.warn?.(`codex-agent[${context.accountId}]: failed to prepare local attachments: ${errToString(err)}`);
+        log2?.warn?.(`failed to prepare local attachments: ${errToString(err)}`);
       }
       const turnInput = buildTurnInput(preparedBody, preparedImages);
       const startTurn = (targetThreadId) => client.sendRequest("turn/start", {
@@ -5399,7 +5524,7 @@ var CodexAppServerAdapter = class {
           yield { type: "error", message: `Codex turn/start failed: ${message}` };
           return;
         }
-        log2?.warn?.(`codex-agent: turn/start on thread ${threadId} failed (${message}); attempting one-shot fresh-thread retry`);
+        log2?.warn?.(`turn/start on thread ${threadId} failed (${message}); attempting one-shot fresh-thread retry`);
         this.activeTurns.delete(threadId);
         let freshThreadId;
         try {
@@ -5500,7 +5625,7 @@ var CodexAppServerAdapter = class {
       const result = await client.sendRequest("thread/fork", forkParams);
       const forkedThreadId = extractThreadId(result);
       if (!forkedThreadId) {
-        this.opts.log?.warn?.("codex-agent: thread/fork returned no thread id");
+        this.opts.log?.warn?.("thread/fork returned no thread id");
         return null;
       }
       this.opts.sessionManager.recordThreadId(handle.sessionKey, forkedThreadId);
@@ -5513,7 +5638,7 @@ var CodexAppServerAdapter = class {
     this.opts.sessionManager.cleanupFork(fork.sessionKey);
   }
   logForkFailure(err) {
-    this.opts.log?.warn?.(`codex-agent: thread/fork failed: ${errToString(err)}`);
+    this.opts.log?.warn?.(`thread/fork failed: ${errToString(err)}`);
     return null;
   }
   async stop() {
@@ -5571,7 +5696,7 @@ var CodexAppServerAdapter = class {
       env.PRLL_CONTEXT_FILE = this.opts.contextFilePath;
     }
     const args = ["app-server", "--listen", "stdio://"];
-    (log2 ?? this.opts.log)?.info?.(`codex-agent: spawning ${this.opts.codexBin} ${args.join(" ")}`);
+    (log2 ?? this.opts.log)?.info?.(`spawning ${this.opts.codexBin} ${args.join(" ")}`);
     const proc = spawn(IS_WIN32 ? quoteWin32Arg(this.opts.codexBin) : this.opts.codexBin, IS_WIN32 ? args.map(quoteWin32Arg) : args, {
       cwd: this.opts.workspaceDir,
       env,
@@ -5580,7 +5705,7 @@ var CodexAppServerAdapter = class {
     });
     proc.stderr.setEncoding("utf8");
     proc.stderr.on("data", (chunk) => {
-      (log2 ?? this.opts.log)?.warn?.(`codex-agent[stderr]: ${chunk.trim()}`);
+      (log2 ?? this.opts.log)?.warn?.(`[stderr] ${chunk.trim()}`);
     });
     const client = new JsonRpcStdioClient(proc, void 0, (p) => {
       if (!IS_WIN32 || !p.pid || !killWin32Tree(p.pid)) {
@@ -5615,9 +5740,9 @@ var CodexAppServerAdapter = class {
     const reason = err ? `spawn error: ${err.message}` : `exited (code=${code ?? "null"}${signal ? `, signal=${signal}` : ""})`;
     const logger = log2 ?? this.opts.log;
     if (this.stopping) {
-      logger?.info?.(`codex-agent: app-server subprocess ${reason} during graceful stop`);
+      logger?.info?.(`app-server subprocess ${reason} during graceful stop`);
     } else {
-      logger?.warn?.(`codex-agent: app-server subprocess ${reason}; resetting adapter`);
+      logger?.warn?.(`app-server subprocess ${reason}; resetting adapter`);
     }
     this.client?.dispose(err ?? new Error(`app-server ${reason}`));
     for (const activeSink of this.activeTurns.values()) {
@@ -6641,9 +6766,12 @@ function ensureParallProvider(codexHome, apiUrl, log2) {
     ].join("\n");
     const headerIdx = content.indexOf(sectionHeader);
     if (headerIdx !== -1) {
-      const sectionEnd = findSectionEnd(content, headerIdx + sectionHeader.length + 1);
-      const authIdx = content.indexOf(authHeader, headerIdx);
-      const blockEnd = authIdx !== -1 && authIdx < sectionEnd ? findSectionEnd(content, authIdx + authHeader.length + 1) : sectionEnd;
+      let blockEnd = findSectionEnd(content, headerIdx + sectionHeader.length + 1);
+      let authIdx = content.indexOf(authHeader, blockEnd);
+      while (authIdx !== -1 && content.substring(blockEnd, authIdx).trim() === "") {
+        blockEnd = findSectionEnd(content, authIdx + authHeader.length + 1);
+        authIdx = content.indexOf(authHeader, blockEnd);
+      }
       content = content.substring(0, headerIdx) + providerBlock + content.substring(blockEnd);
     } else {
       content = content.trimEnd() + "\n\n" + providerBlock + "\n";
@@ -6682,6 +6810,7 @@ ${systemPrompt.replace(/\\/g, "\\\\").replace(/"""/g, '\\"""')}
 
 // ts/codex-agent/dist/index.js
 var log = createLogger("codex-agent");
+var activeLog = log;
 async function getAgentMeWithLegacyFallback(client, orgId) {
   try {
     return await client.getAgentMe(orgId);
@@ -6693,7 +6822,24 @@ async function getAgentMeWithLegacyFallback(client, orgId) {
     return { ...user, agent_profile: null };
   }
 }
+function resolveProviderEnv() {
+  const pc = parseProviderConfig(process.env);
+  if (!pc)
+    return;
+  clearAllProviderCreds(process.env);
+  const source = llmSource(pc);
+  if (source === "parall") {
+    process.env.OPENAI_API_KEY = process.env.PRLL_API_KEY;
+    process.env.OPENAI_BASE_URL = `${process.env.PRLL_API_URL}/api/llm/v1`;
+  } else if (source === "custom") {
+    if (pc.openai_api_key)
+      process.env.OPENAI_API_KEY = pc.openai_api_key;
+    if (pc.openai_base_url)
+      process.env.OPENAI_BASE_URL = pc.openai_base_url;
+  }
+}
 async function main() {
+  resolveProviderEnv();
   const config = resolveCodexAgentConfig(process.env);
   const client = new ParallClient({
     baseUrl: config.apiUrl,
@@ -6702,13 +6848,15 @@ async function main() {
   });
   const me = await getAgentMeWithLegacyFallback(client, config.orgId);
   const agentUserId = me.id;
-  ensureWorkspaceTrusted(config.codexHome, config.workspaceDir, log);
+  const agentLog = childLogger(log, agentUserId);
+  activeLog = agentLog;
+  ensureWorkspaceTrusted(config.codexHome, config.workspaceDir, agentLog);
   const useParallProvider = isParallProxyMode();
   if (useParallProvider) {
-    ensureParallProvider(config.codexHome, config.apiUrl, log);
-    log.info("parall custom provider configured (Responses API HTTP/SSE mode)");
+    ensureParallProvider(config.codexHome, config.apiUrl, agentLog);
+    agentLog.info("parall custom provider configured (Responses API HTTP/SSE mode)");
   }
-  ensureCodexWorkspace(config.workspaceDir, log, {
+  ensureCodexWorkspace(config.workspaceDir, agentLog, {
     userId: agentUserId,
     displayName: me.display_name,
     description: me.agent_profile?.description ?? void 0
@@ -6716,21 +6864,21 @@ async function main() {
   const runtimeKey = config.runtimeKey || buildCodexRuntimeKey(agentUserId);
   const mainContextFilePath = contextFilePathForSession(config.stateDir, runtimeKey);
   const sessionStateFilePath = sessionStateFilePathForRuntime(config.stateDir, runtimeKey);
-  const sessionManager = new CodexSessionManager(runtimeKey, sessionStateFilePath, log);
+  const sessionManager = new CodexSessionManager(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: "codex", log });
+  const configMgr = createPlatformConfigManager({ client, stateDir: config.stateDir, runtimeType: "codex", 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 ?? config.reasoningEffort : config.reasoningEffort;
   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: reasoning_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
+    agentLog.info(`platform config: reasoning_effort=${platformDefaults.thinkingEffort} (${platformManaged ? "applied" : "ignored, model_management=self"})`);
   const adapter = new CodexAppServerAdapter({
     codexBin: config.codexBin,
     codexHome: config.codexHome,
@@ -6740,7 +6888,7 @@ async function main() {
     sandbox: config.sandbox,
     approvalPolicy: config.approvalPolicy,
     sessionManager,
-    log,
+    log: agentLog,
     contextFilePath: mainContextFilePath,
     useParallProvider
   });
@@ -6765,7 +6913,7 @@ async function main() {
       driver: "app-server"
     },
     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),
@@ -6786,6 +6934,12 @@ async function main() {
         model: platformManaged ? updated.model ?? config.model : config.model ?? null,
         reasoningEffort: platformManaged ? updated.thinkingEffort ?? config.reasoningEffort : config.reasoningEffort ?? null
       });
+    },
+    onNewSession: () => {
+      sessionManager.clearMainThread();
+    },
+    onSessionStale: () => {
+      sessionManager.clearMainThread();
     }
   });
   const abortController = new AbortController();
@@ -6793,7 +6947,7 @@ async function main() {
   process.on("SIGINT", abort);
   process.on("SIGTERM", abort);
   try {
-    log.info(`starting self-hosted Codex runtime (app-server driver) for ${me.display_name} (${agentUserId})`);
+    agentLog.info(`starting self-hosted Codex runtime (app-server driver) for ${me.display_name} (${agentUserId})`);
     await gateway.run(abortController.signal);
   } finally {
     await adapter.stop();
@@ -6802,7 +6956,7 @@ async function main() {
   }
 }
 main().catch((err) => {
-  log.error(`fatal: ${String(err)}`);
+  activeLog.error(`fatal: ${String(err)}`);
   process.exitCode = 1;
 });
 /*! Bundled license information: