@band-ai/sdk 0.2.0 → 0.3.0

package/dist/adapters.cjs

@@ -30,6 +30,38 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/core/errors.ts
+var BandSdkError, UnsupportedFeatureError, ValidationError, RuntimeStateError;
+var init_errors = __esm({
+  "src/core/errors.ts"() {
+    "use strict";
+    BandSdkError = class extends Error {
+      constructor(message, cause) {
+        super(message, cause !== void 0 ? { cause } : void 0);
+        this.name = "BandSdkError";
+      }
+    };
+    UnsupportedFeatureError = class extends BandSdkError {
+      constructor(message) {
+        super(message);
+        this.name = "UnsupportedFeatureError";
+      }
+    };
+    ValidationError = class extends BandSdkError {
+      constructor(message, cause) {
+        super(message, cause);
+        this.name = "ValidationError";
+      }
+    };
+    RuntimeStateError = class extends BandSdkError {
+      constructor(message) {
+        super(message);
+        this.name = "RuntimeStateError";
+      }
+    };
+  }
+});
+
 // src/contracts/memory.ts
 function namedValues(values) {
   return Object.fromEntries(values.map((value) => [value, value]));
@@ -108,46 +140,18 @@ var init_memory = __esm({
   }
 });
 
-// src/core/errors.ts
-var BandSdkError, UnsupportedFeatureError, ValidationError, RuntimeStateError;
-var init_errors = __esm({
-  "src/core/errors.ts"() {
-    "use strict";
-    BandSdkError = class extends Error {
-      constructor(message, cause) {
-        super(message, cause !== void 0 ? { cause } : void 0);
-        this.name = "BandSdkError";
-      }
-    };
-    UnsupportedFeatureError = class extends BandSdkError {
-      constructor(message) {
-        super(message);
-        this.name = "UnsupportedFeatureError";
-      }
-    };
-    ValidationError = class extends BandSdkError {
-      constructor(message, cause) {
-        super(message, cause);
-        this.name = "ValidationError";
-      }
-    };
-    RuntimeStateError = class extends BandSdkError {
-      constructor(message) {
-        super(message);
-        this.name = "RuntimeStateError";
-      }
-    };
-  }
-});
-
 // src/contracts/chatEvents.ts
-var CHAT_EVENT_TYPES, CHAT_MESSAGE_TYPES;
+function isBlankEventContent(content) {
+  return !VISIBLE_CONTENT_PATTERN.test(content);
+}
+var CHAT_EVENT_TYPES, CHAT_MESSAGE_TYPES, VISIBLE_CONTENT_PATTERN;
 var init_chatEvents = __esm({
   "src/contracts/chatEvents.ts"() {
     "use strict";
     init_errors();
     CHAT_EVENT_TYPES = ["tool_call", "tool_result", "thought", "error", "task"];
     CHAT_MESSAGE_TYPES = ["text", ...CHAT_EVENT_TYPES];
+    VISIBLE_CONTENT_PATTERN = /[\p{L}\p{N}\p{P}\p{S}]/u;
   }
 });
 
@@ -496,6 +500,13 @@ function isToolExecutorError(value) {
   const candidate = value;
   return candidate.ok === false && typeof candidate.errorType === "string" && TOOL_EXECUTOR_ERROR_TYPES.includes(candidate.errorType) && typeof candidate.toolName === "string" && typeof candidate.message === "string" && typeof candidate.legacyMessage === "string";
 }
+function isStructuredToolFailure(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const payload = value;
+  return payload.ok === false && typeof payload.message === "string";
+}
 function toLegacyToolExecutorErrorMessage(value) {
   if (typeof value === "string") {
     return value;
@@ -1066,6 +1077,18 @@ var ACPClientHistoryConverter = class {
   }
 };
 
+// src/core/logger.ts
+var noop = () => void 0;
+var NoopLogger = class {
+  debug = noop;
+  info = noop;
+  warn = noop;
+  error = noop;
+};
+
+// src/adapters/acp/ACPClientAdapter.ts
+init_errors();
+
 // src/runtime/prompts/base.ts
 var ENVIRONMENT_SECTION = `
 ## Environment
@@ -1234,7 +1257,116 @@ ${customSection}`.trim();
   return parts.join("\n\n");
 }
 
+// src/runtime/types.ts
+function ensureHandlePrefix(handle) {
+  if (!handle) {
+    return null;
+  }
+  return handle.startsWith("@") ? handle : `@${handle}`;
+}
+
+// src/runtime/formatters.ts
+function isMetadataMap(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function mentionSubjectsFromMetadata(metadata) {
+  const mentions = metadata?.mentions;
+  if (!Array.isArray(mentions)) {
+    return [];
+  }
+  const subjects = [];
+  for (const mention of mentions) {
+    if (!isMetadataMap(mention) || typeof mention.id !== "string") {
+      continue;
+    }
+    const label = [mention.handle, mention.username, mention.name].find(
+      (value) => typeof value === "string" && value.trim().length > 0
+    );
+    if (label === void 0) {
+      continue;
+    }
+    subjects.push({ id: mention.id, handle: label });
+  }
+  return subjects;
+}
+function replaceUuidMentions(content, participants) {
+  if (!content || participants.length === 0) {
+    return content;
+  }
+  let next = content;
+  for (const participant of participants) {
+    const participantId = participant.id;
+    const handle = participant.handle;
+    if (typeof participantId === "string" && typeof handle === "string") {
+      next = next.replaceAll(`@[[${participantId}]]`, ensureHandlePrefix(handle) ?? "");
+    }
+  }
+  return next;
+}
+function formatMessageForLlm(message, participants) {
+  const senderType = String(message.sender_type ?? "");
+  const senderName = String(message.sender_name ?? message.name ?? senderType);
+  const content = participants ? replaceUuidMentions(String(message.content ?? ""), participants) : String(message.content ?? "");
+  return {
+    role: senderType === "Agent" ? "assistant" : "user",
+    content,
+    sender_name: senderName,
+    sender_type: senderType,
+    message_type: String(message.message_type ?? "text"),
+    metadata: isMetadataMap(message.metadata) ? message.metadata : {}
+  };
+}
+function formatHistoryForLlm(messages, options) {
+  const excludeId = options?.excludeId;
+  const participants = options?.participants;
+  return messages.filter((message) => String(message.id ?? "") !== excludeId).map((message) => formatMessageForLlm(message, participants));
+}
+
+// src/adapters/shared/conversationPrompt.ts
+function systemUpdateParts(participantsMessage, contactsMessage) {
+  const parts = [];
+  if (participantsMessage) {
+    parts.push(`[System]: ${participantsMessage}`);
+  }
+  if (contactsMessage) {
+    parts.push(`[System]: ${contactsMessage}`);
+  }
+  return parts;
+}
+function buildConversationPrompt(options) {
+  const parts = [];
+  if (options.isSessionBootstrap && options.history.length > 0) {
+    const historyText = options.history.raw.slice(-(options.maxHistoryMessages ?? 50)).map(formatHistoryLine).join("\n");
+    parts.push(`${options.historyHeader}
+${historyText}`);
+  }
+  parts.push(...systemUpdateParts(options.participantsMessage, options.contactsMessage));
+  parts.push(options.currentMessage);
+  return parts.join("\n\n");
+}
+function formatHistoryLine(entry) {
+  const sender = String(entry.sender_name ?? entry.sender_type ?? "Unknown");
+  const content = String(entry.content ?? "");
+  return `[${sender}]: ${content}`;
+}
+
+// src/adapters/shared/withTimeout.ts
+async function withTimeout(promise, timeoutMs, message) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((_, reject) => {
+        timer = setTimeout(() => reject(new Error(message)), timeoutMs);
+      })
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 // src/adapters/acp/ACPClientAdapter.ts
+init_chatEvents();
 init_schemas();
 
 // src/mcp/auth.ts
@@ -2016,6 +2148,8 @@ var acpModule = new LazyAsyncValue({
 });
 
 // src/adapters/acp/ACPClientAdapter.ts
+var DEFAULT_PERMISSION_TIMEOUT_MS = 5 * 6e4;
+var SET_SESSION_MODE_TIMEOUT_MS = 1e4;
 var ACPClientAdapter = class extends SimpleAdapter {
   command;
   cwd;
@@ -2031,6 +2165,11 @@ var ACPClientAdapter = class extends SimpleAdapter {
   roomTools = /* @__PURE__ */ new Map();
   activeSessions = /* @__PURE__ */ new Set();
   bootstrappedSessions = /* @__PURE__ */ new Set();
+  pendingPermissions = /* @__PURE__ */ new Map();
+  resolvePermission;
+  permissionTimeoutMs;
+  requestedPermissionMode;
+  logger;
   backend = null;
   backendPromise = null;
   client = null;
@@ -2057,6 +2196,16 @@ var ACPClientAdapter = class extends SimpleAdapter {
     this.additionalMcpTools = [...options.additionalMcpTools ?? []];
     this.clientCapabilities = options.clientCapabilities;
     this.connectionFactory = options.connectionFactory ?? createSubprocessConnection;
+    this.resolvePermission = options.resolvePermission;
+    this.logger = options.logger ?? new NoopLogger();
+    this.permissionTimeoutMs = options.permissionTimeoutMs ?? DEFAULT_PERMISSION_TIMEOUT_MS;
+    this.requestedPermissionMode = options.requestedPermissionMode;
+    if (this.requestedPermissionMode !== void 0 && this.requestedPermissionMode.length === 0) {
+      throw new ValidationError("requestedPermissionMode must be a non-empty mode id, got an empty string");
+    }
+    if (this.resolvePermission && (!Number.isFinite(this.permissionTimeoutMs) || this.permissionTimeoutMs <= 0)) {
+      throw new ValidationError(`permissionTimeoutMs must be a positive finite number, got ${options.permissionTimeoutMs}`);
+    }
   }
   async onStarted(agentName, agentDescription) {
     await super.onStarted(agentName, agentDescription);
@@ -2068,7 +2217,7 @@ var ACPClientAdapter = class extends SimpleAdapter {
     });
     await this.ensureConnection();
   }
-  async onMessage(message, tools, history, _participantsMessage, _contactsMessage, context) {
+  async onMessage(message, tools, history, participantsMessage, contactsMessage, context) {
     if (context.isSessionBootstrap) {
       this.rehydrate(history);
     }
@@ -2084,9 +2233,11 @@ var ACPClientAdapter = class extends SimpleAdapter {
       sessionId,
       (params) => this.handlePermissionRequest(tools, context.roomId, params)
     );
-    const promptText = this.bootstrappedSessions.has(sessionId) ? message.content : `${this.buildSystemContext(context.roomId, message)}
+    const content = replaceUuidMentions(message.content, mentionSubjectsFromMetadata(message.metadata));
+    const messageWithContext = [...systemUpdateParts(participantsMessage, contactsMessage), content].join("\n\n");
+    const promptText = this.bootstrappedSessions.has(sessionId) ? messageWithContext : `${this.buildSystemContext(context.roomId, message)}
 
-${message.content}`;
+${messageWithContext}`;
     this.bootstrappedSessions.add(sessionId);
     try {
       await connection.prompt({
@@ -2122,6 +2273,7 @@ ${message.content}`;
       this.activeSessions.delete(sessionId);
       this.bootstrappedSessions.delete(sessionId);
       this.client?.setPermissionHandler(sessionId, void 0);
+      this.cancelPendingPermissions(sessionId);
     }
   }
   async onRuntimeStop() {
@@ -2134,6 +2286,7 @@ ${message.content}`;
     this.bootstrappedSessions.clear();
     this.roomToSession.clear();
     this.roomTools.clear();
+    this.cancelAllPendingPermissions();
     this.client = null;
     this.connection = null;
     if (this.backend) {
@@ -2211,9 +2364,10 @@ ${message.content}`;
     const mcpServers = await this.buildSessionMcpServers();
     if (existingSessionId) {
       const restored = await this.tryRestoreSession(connection, existingSessionId, mcpServers);
-      if (restored) {
+      if (restored.ok) {
         this.activeSessions.add(existingSessionId);
         this.bootstrappedSessions.add(existingSessionId);
+        await this.applyRequestedPermissionMode(connection, existingSessionId, restored.modes);
         return existingSessionId;
       }
     }
@@ -2223,30 +2377,52 @@ ${message.content}`;
     });
     this.roomToSession.set(roomId, created.sessionId);
     this.activeSessions.add(created.sessionId);
+    await this.applyRequestedPermissionMode(connection, created.sessionId, created.modes);
     return created.sessionId;
   }
   async tryRestoreSession(connection, sessionId, mcpServers) {
+    const capabilities = this.connectionState?.agentCapabilities;
+    const params = { cwd: this.cwd, mcpServers, sessionId };
+    const restore = capabilities?.loadSession ? () => connection.loadSession(params) : capabilities?.sessionCapabilities?.resume ? () => connection.unstable_resumeSession(params) : null;
+    if (!restore) {
+      return { ok: false };
+    }
     try {
-      if (this.connectionState?.agentCapabilities?.loadSession) {
-        await connection.loadSession({
-          cwd: this.cwd,
-          mcpServers,
-          sessionId
-        });
-        return true;
-      }
-      if (this.connectionState?.agentCapabilities?.sessionCapabilities?.resume) {
-        await connection.unstable_resumeSession({
-          cwd: this.cwd,
-          mcpServers,
-          sessionId
-        });
-        return true;
-      }
+      const restored = await restore();
+      return { ok: true, modes: restored?.modes };
     } catch {
-      return false;
+      return { ok: false };
+    }
+  }
+  // Best-effort: never throws, so a mode switch going wrong can't take a
+  // session establishment down with it.
+  async applyRequestedPermissionMode(connection, sessionId, modes) {
+    const requestedModeId = this.requestedPermissionMode;
+    if (!requestedModeId || !modes || modes.currentModeId === requestedModeId) {
+      return;
+    }
+    const availableModes = Array.isArray(modes.availableModes) ? modes.availableModes : [];
+    if (!availableModes.some((mode) => mode?.id === requestedModeId)) {
+      this.safeWarn("requested permission mode is not advertised by this session", {
+        sessionId,
+        requestedModeId,
+        availableModeIds: availableModes.map((mode) => mode?.id)
+      });
+      return;
+    }
+    try {
+      await withTimeout(
+        connection.setSessionMode({ sessionId, modeId: requestedModeId }),
+        SET_SESSION_MODE_TIMEOUT_MS,
+        `setSessionMode did not respond within ${SET_SESSION_MODE_TIMEOUT_MS}ms`
+      );
+    } catch (error) {
+      this.safeWarn("failed to switch session into the requested permission mode", {
+        sessionId,
+        requestedModeId,
+        error: String(error)
+      });
     }
-    return false;
   }
   async buildSessionMcpServers() {
     const mcpServers = [...this.mcpServers];
@@ -2356,28 +2532,103 @@ ${message.content}`;
     ].join("\n");
   }
   async handlePermissionRequest(tools, roomId, params) {
-    const selected = choosePermissionOption(params.options);
     const toolName = params.toolCall.title ?? "unknown";
-    await tools.sendEvent(`Permission requested: ${toolName}`, "tool_call", {
-      permission_request: true,
-      tool_name: toolName,
-      tool_call_id: params.toolCall.toolCallId,
-      acp_session_id: params.sessionId,
-      auto_allowed: selected !== null
-    });
-    if (!selected) {
-      return {
-        outcome: {
-          outcome: "cancelled"
-        }
-      };
+    const autoSelection = this.resolvePermission ? void 0 : choosePermissionOption(params.options);
+    const controller = this.resolvePermission ? new AbortController() : void 0;
+    if (controller) {
+      this.trackPending(params.sessionId, controller);
+    }
+    const [, chosenId] = await Promise.all([
+      // This is the room's only "a permission request is pending" signal,
+      // and the only one other room participants ever see — started
+      // immediately rather than serialized in front of a manual wait that
+      // can take up to `permissionTimeoutMs`.
+      tools.sendEvent(`Permission requested: ${toolName}`, "tool_call", {
+        permission_request: true,
+        tool_name: toolName,
+        tool_call_id: params.toolCall.toolCallId,
+        acp_session_id: params.sessionId,
+        auto_allowed: autoSelection !== void 0 && autoSelection !== null
+      }),
+      controller ? this.resolveManually(params.sessionId, params, controller) : Promise.resolve(autoSelection?.optionId)
+    ]);
+    return this.toResponse(chosenId, params.options);
+  }
+  // `undefined`, or an id absent from this request's own `options` (a buggy
+  // or stale caller), both map to `cancelled` — never silently treated as a
+  // deny. A real match, reject-kind options included, maps to `selected`.
+  toResponse(chosenId, options) {
+    const matched = chosenId !== void 0 && options.some((option) => option.optionId === chosenId);
+    return matched ? { outcome: { outcome: "selected", optionId: chosenId } } : { outcome: { outcome: "cancelled" } };
+  }
+  // A caller-supplied `Logger` isn't guaranteed to be synchronous or
+  // non-throwing. Every best-effort warning in this file routes through here
+  // so one failing sink — a synchronous throw, or an `async` implementation
+  // rejecting (the `Logger` interface's `void` return type permits either;
+  // a bare try/catch only ever catches the former) — can't turn a warning
+  // into an unhandled rejection in its place.
+  safeWarn(message, context) {
+    try {
+      Promise.resolve(this.logger.warn(message, context)).catch(() => void 0);
+    } catch {
+    }
+  }
+  // Races the caller-supplied resolver against a timeout and against
+  // `controller`'s own abort signal — aborted externally by
+  // `cancelPendingPermissions`/`cancelAllPendingPermissions` (fired from
+  // `onCleanup`/`stop()` below) when a room or the whole adapter tears down
+  // while this is still pending. `controller` is the same object tracked in
+  // `pendingPermissions` by the caller, so there is exactly one cancellation
+  // channel here, not a second hand-rolled one alongside it.
+  async resolveManually(sessionId, params, controller) {
+    let timer;
+    const cancelled = new Promise((resolve) => {
+      controller.signal.addEventListener("abort", () => resolve(void 0));
+    });
+    try {
+      const timeout = new Promise((resolve) => {
+        timer = setTimeout(() => resolve(void 0), this.permissionTimeoutMs);
+      });
+      return await Promise.race([
+        // `resolvePermission` is caller-supplied; nothing guarantees it's
+        // `async` or otherwise well-behaved. `Promise.resolve().then(...)`
+        // normalizes a synchronous throw the same way it normalizes a
+        // rejected promise, so both land in the `.catch` below rather than
+        // escaping this race uncaught.
+        Promise.resolve().then(() => this.resolvePermission(params, controller.signal)).catch((error) => {
+          this.safeWarn("resolvePermission threw; treating as no answer", { error: String(error) });
+          return void 0;
+        }),
+        timeout,
+        cancelled
+      ]);
+    } finally {
+      clearTimeout(timer);
+      this.untrackPending(sessionId, controller);
+      controller.abort();
+    }
+  }
+  trackPending(sessionId, controller) {
+    const pending = this.pendingPermissions.get(sessionId) ?? /* @__PURE__ */ new Set();
+    pending.add(controller);
+    this.pendingPermissions.set(sessionId, pending);
+  }
+  untrackPending(sessionId, controller) {
+    const pending = this.pendingPermissions.get(sessionId);
+    pending?.delete(controller);
+    if (pending?.size === 0) {
+      this.pendingPermissions.delete(sessionId);
+    }
+  }
+  cancelPendingPermissions(sessionId) {
+    for (const controller of this.pendingPermissions.get(sessionId) ?? []) {
+      controller.abort();
+    }
+  }
+  cancelAllPendingPermissions() {
+    for (const sessionId of this.pendingPermissions.keys()) {
+      this.cancelPendingPermissions(sessionId);
     }
-    return {
-      outcome: {
-        outcome: "selected",
-        optionId: selected.optionId
-      }
-    };
   }
   async flushChunks(input) {
     const client = this.client;
@@ -2385,13 +2636,14 @@ ${message.content}`;
       return;
     }
     for (const chunk of client.getCollectedChunks(input.sessionId)) {
+      if (isBlankEventContent(chunk.content)) {
+        continue;
+      }
       if (chunk.chunkType === "text") {
-        if (chunk.content.length > 0) {
-          await input.tools.sendMessage(chunk.content, [{
-            id: input.senderId,
-            handle: input.senderHandle
-          }]);
-        }
+        await input.tools.sendMessage(chunk.content, [{
+          id: input.senderId,
+          handle: input.senderHandle
+        }]);
         continue;
       }
       const messageType = chunk.chunkType === "plan" ? "task" : chunk.chunkType;
@@ -2499,14 +2751,6 @@ var ACPServerHistoryConverter = class {
   }
 };
 
-// src/runtime/types.ts
-function ensureHandlePrefix(handle) {
-  if (!handle) {
-    return null;
-  }
-  return handle.startsWith("@") ? handle : `@${handle}`;
-}
-
 // src/converters/shared.ts
 function asOptionalString(value) {
   if (typeof value !== "string") {
@@ -3345,52 +3589,6 @@ function extractPromptText(prompt) {
 // src/adapters/tool-calling/ToolCallingAdapter.ts
 init_protocols();
 
-// src/core/logger.ts
-var noop = () => void 0;
-var NoopLogger = class {
-  debug = noop;
-  info = noop;
-  warn = noop;
-  error = noop;
-};
-
-// src/runtime/formatters.ts
-function isMetadataMap(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function replaceUuidMentions(content, participants) {
-  if (!content || participants.length === 0) {
-    return content;
-  }
-  let next = content;
-  for (const participant of participants) {
-    const participantId = participant.id;
-    const handle = participant.handle;
-    if (typeof participantId === "string" && typeof handle === "string") {
-      next = next.replaceAll(`@[[${participantId}]]`, ensureHandlePrefix(handle) ?? "");
-    }
-  }
-  return next;
-}
-function formatMessageForLlm(message, participants) {
-  const senderType = String(message.sender_type ?? "");
-  const senderName = String(message.sender_name ?? message.name ?? senderType);
-  const content = participants ? replaceUuidMentions(String(message.content ?? ""), participants) : String(message.content ?? "");
-  return {
-    role: senderType === "Agent" ? "assistant" : "user",
-    content,
-    sender_name: senderName,
-    sender_type: senderType,
-    message_type: String(message.message_type ?? "text"),
-    metadata: isMetadataMap(message.metadata) ? message.metadata : {}
-  };
-}
-function formatHistoryForLlm(messages, options) {
-  const excludeId = options?.excludeId;
-  const participants = options?.participants;
-  return messages.filter((message) => String(message.id ?? "") !== excludeId).map((message) => formatMessageForLlm(message, participants));
-}
-
 // src/runtime/tools/customTools.ts
 var import_zod3 = require("zod");
 var import_zod_to_json_schema = require("zod-to-json-schema");
@@ -4929,18 +5127,28 @@ var GoogleADKAdapter = class extends SimpleAdapter {
   }
   async reportExecutionEvent(sdk, event, tools) {
     for (const functionCall of sdk.getFunctionCalls(event)) {
-      await tools.sendEvent(JSON.stringify({
+      const result = await tools.sendEvent(JSON.stringify({
         name: functionCall.name ?? "unknown",
         args: asToolArgs(functionCall.args),
         tool_call_id: functionCall.id ?? ""
       }), "tool_call");
+      this.warnOnFailedSend(result, "Google ADK tool_call event send failed", { toolCallId: functionCall.id ?? "" });
     }
     for (const functionResponse of sdk.getFunctionResponses(event)) {
-      await tools.sendEvent(JSON.stringify({
+      const result = await tools.sendEvent(JSON.stringify({
         name: functionResponse.name ?? "unknown",
         output: String(functionResponse.response ?? ""),
         tool_call_id: functionResponse.id ?? ""
       }), "tool_result");
+      this.warnOnFailedSend(result, "Google ADK tool_result event send failed", { toolCallId: functionResponse.id ?? "" });
+    }
+  }
+  warnOnFailedSend(result, message, meta) {
+    if (result.ok === false) {
+      try {
+        this.logger.warn(message, meta);
+      } catch {
+      }
     }
   }
 };
@@ -9498,29 +9706,6 @@ function delay(ms) {
 init_errors();
 init_schemas();
 
-// src/adapters/shared/conversationPrompt.ts
-function buildConversationPrompt(options) {
-  const parts = [];
-  if (options.isSessionBootstrap && options.history.length > 0) {
-    const historyText = options.history.raw.slice(-(options.maxHistoryMessages ?? 50)).map(formatHistoryLine).join("\n");
-    parts.push(`${options.historyHeader}
-${historyText}`);
-  }
-  if (options.participantsMessage) {
-    parts.push(`[System]: ${options.participantsMessage}`);
-  }
-  if (options.contactsMessage) {
-    parts.push(`[System]: ${options.contactsMessage}`);
-  }
-  parts.push(options.currentMessage);
-  return parts.join("\n\n");
-}
-function formatHistoryLine(entry) {
-  const sender = String(entry.sender_name ?? entry.sender_type ?? "Unknown");
-  const content = String(entry.content ?? "");
-  return `[${sender}]: ${content}`;
-}
-
 // src/converters/claude-sdk.ts
 function extractClaudeSessionId(raw) {
   const metadata = findLatestTaskMetadata(
@@ -10544,11 +10729,8 @@ var CodexAdapter = class extends SimpleAdapter {
         items.push({ type: "text", text: context });
       }
     }
-    if (input.participantsMessage) {
-      items.push({ type: "text", text: `[System]: ${input.participantsMessage}` });
-    }
-    if (input.contactsMessage) {
-      items.push({ type: "text", text: `[System]: ${input.contactsMessage}` });
+    for (const part of systemUpdateParts(input.participantsMessage, input.contactsMessage)) {
+      items.push({ type: "text", text: part });
     }
     items.push({
       type: "text",
@@ -10976,13 +11158,6 @@ var TURN_STATUS_VALUES = /* @__PURE__ */ new Set([
   "failed",
   "inProgress"
 ]);
-function isStructuredToolFailure(value) {
-  if (!value || typeof value !== "object") {
-    return false;
-  }
-  const payload = value;
-  return payload.ok === false && typeof payload.message === "string";
-}
 function isCodexToolOutputError(value) {
   return isToolExecutorError(value) || isStructuredToolFailure(value);
 }