@super-one/cli 0.68.0 → 0.69.0-alpha.1

package/lib/cli.mjs

@@ -1,4 +1,4 @@
-process.env.SUPERONE_VARIANT = "stable";
+process.env.SUPERONE_VARIANT = "alpha";
 import { createRequire as __superoneCreateRequire } from 'node:module';
 import { fileURLToPath as __superoneFileURLToPath } from 'node:url';
 import { dirname as __superoneDirname } from 'node:path';
@@ -359,7 +359,7 @@ var init_interaction_memory = __esm({
 });
 
 // ../../packages/shared/src/superone-tool-descriptions.ts
-var MANUAL_READ_DESCRIPTION, SETUP_MINI_APP_DEV_DESCRIPTION, REGISTER_DEV_MINIAPP_DESCRIPTION, PACK_MINI_APP_DESCRIPTION, UPDATE_SUPERONE_TYPES_DESCRIPTION, RENAME_SESSION_DESCRIPTION, SESSION_TAG_DESCRIPTION, SESSION_TAG_LIST_DESCRIPTION, PROJECT_LIST_DESCRIPTION, SESSION_LIST_DESCRIPTION, SESSION_SEARCH_DESCRIPTION, SESSION_READ_DESCRIPTION, SESSION_TAGS_FILTER_DESCRIPTION, SESSION_TAG_MATCH_DESCRIPTION, SESSION_CLEANUP_DESCRIPTION, CONFIG_READ_DESCRIPTION, CONFIG_APPLY_DESCRIPTION, LIST_MEDIA_PROVIDERS_DESCRIPTION, GENERATE_IMAGE_DESCRIPTION, GENERATE_VIDEO_DESCRIPTION, VIDEO_STATUS_DESCRIPTION, SESSION_LIST_AGENTS_DESCRIPTION, SESSION_REQUEST_AGENTS_DESCRIPTION, LAUNCH_SUMMARY_DESCRIPTION, LAUNCH_TASK_DESCRIPTION, LAUNCH_MODE_DESCRIPTION, LAUNCH_SESSION_ID_DESCRIPTION, LAUNCH_PERMISSION_MODE_DESCRIPTION, LAUNCH_CWD_DESCRIPTION, LAUNCH_WORKTREE_DESCRIPTION, LAUNCH_BRANCH_NAME_DESCRIPTION, SESSION_START_DESCRIPTION, SESSION_SEND_DESCRIPTION, SESSION_RETRIEVE_DESCRIPTION, AUTOMATION_LIST_DESCRIPTION, AUTOMATION_APPLY_DESCRIPTION, AUTOMATION_DELETE_DESCRIPTION, TERMINAL_TABS_DESCRIPTION, TERMINAL_SNAPSHOT_DESCRIPTION, TERMINAL_ACT_DESCRIPTION, TERMINAL_WAIT_FOR_DESCRIPTION;
+var MANUAL_READ_DESCRIPTION, SETUP_MINI_APP_DEV_DESCRIPTION, REGISTER_DEV_MINIAPP_DESCRIPTION, PACK_MINI_APP_DESCRIPTION, UPDATE_SUPERONE_TYPES_DESCRIPTION, RENAME_SESSION_DESCRIPTION, SESSION_TAG_DESCRIPTION, SESSION_TAG_LIST_DESCRIPTION, PROJECT_LIST_DESCRIPTION, SESSION_LIST_DESCRIPTION, SESSION_SEARCH_DESCRIPTION, SESSION_READ_DESCRIPTION, SESSION_TAGS_FILTER_DESCRIPTION, SESSION_TAG_MATCH_DESCRIPTION, SESSION_CLEANUP_DESCRIPTION, CONFIG_READ_DESCRIPTION, CONFIG_APPLY_DESCRIPTION, LIST_MEDIA_PROVIDERS_DESCRIPTION, GENERATE_IMAGE_DESCRIPTION, GENERATE_VIDEO_DESCRIPTION, VIDEO_STATUS_DESCRIPTION, SESSION_LIST_AGENTS_DESCRIPTION, SESSION_REQUEST_AGENTS_DESCRIPTION, LAUNCH_SUMMARY_DESCRIPTION, START_LAUNCH_ID_DESCRIPTION, LAUNCH_TASK_DESCRIPTION, LAUNCH_MODE_DESCRIPTION, LAUNCH_SESSION_ID_DESCRIPTION, LAUNCH_PERMISSION_MODE_DESCRIPTION, LAUNCH_CWD_DESCRIPTION, LAUNCH_WORKTREE_DESCRIPTION, LAUNCH_BRANCH_NAME_DESCRIPTION, SESSION_START_DESCRIPTION, SESSION_SEND_DESCRIPTION, SESSION_SEND_TO_DESCRIPTION, SESSION_SEND_CONTENT_DESCRIPTION, SESSION_RETRIEVE_DESCRIPTION, SESSION_RETRIEVE_FROM_DESCRIPTION, AUTOMATION_LIST_DESCRIPTION, AUTOMATION_APPLY_DESCRIPTION, AUTOMATION_DELETE_DESCRIPTION, TERMINAL_TABS_DESCRIPTION, TERMINAL_SNAPSHOT_DESCRIPTION, TERMINAL_ACT_DESCRIPTION, TERMINAL_WAIT_FOR_DESCRIPTION;
 var init_superone_tool_descriptions = __esm({
   "../../packages/shared/src/superone-tool-descriptions.ts"() {
     "use strict";
@@ -385,18 +385,22 @@ var init_superone_tool_descriptions = __esm({
     GENERATE_VIDEO_DESCRIPTION = "Submit a video generation; the tool opens a parameter review for user approval. Stop on cancelled or error; use returned feedback before retrying. Poll media_video_status about every 30s until generated or error. Results display automatically. Use media_list_providers for configured providers and the matching media provider-task manual for unfamiliar options.";
     VIDEO_STATUS_DESCRIPTION = "Advance a submitted video job and read its status: running, generated with savedPaths, or error with message. Poll about every 30 seconds while running: these calls download and save the completed video. Report it ready only after generated; stop on error.";
     SESSION_LIST_AGENTS_DESCRIPTION = "List the agent profiles available for user-approved child sessions. Only launchable agents are returned. Inspect each profile's harness and defaultConfig before session_collab_request. You may reuse one agentId for multiple launches. Skip this call when the user already named an agent with @ \u2014 that mention carries its agentId.";
-    SESSION_REQUEST_AGENTS_DESCRIPTION = 'Request user approval for collaboration launches. See the mode field for spawn vs handoff vs link. Spawn/handoff: pick an agentId from session_collab_list_agents; require name, role, summary, task. Link: require sessionId + summary. Read read_manual({ domain: "product", topic: "collaboration" }) before the first launch in a session. User must approve; returns the credential for session_collab_start.';
-    LAUNCH_SUMMARY_DESCRIPTION = "Short 2\u20133 sentence task summary shown collapsed in the confirm dialog. Not the full brief \u2014 put detail in task.";
-    LAUNCH_TASK_DESCRIPTION = "Full Markdown brief. Spawn/handoff: delivered to the new session on session_collab_start. A handoff receiver cannot ask you anything back, so make the brief self-contained. Link: optional opening for the peer (mailbox + turn wake, never system prompt). Expandable in the confirm UI.";
+    SESSION_REQUEST_AGENTS_DESCRIPTION = 'Request user approval for collaboration launches. See the mode field for spawn vs handoff vs link. Spawn/handoff: pick an agentId from session_collab_list_agents; require name, role, summary. Link: require sessionId + summary. Read read_manual({ domain: "product", topic: "collaboration" }) before the first launch in a session. User must approve; returns a launchId per launch. Pass the task to session_collab_start, not here.';
+    LAUNCH_SUMMARY_DESCRIPTION = "Short 2\u20133 sentence summary the user approves in the confirm dialog. The full brief goes to session_collab_start.";
+    START_LAUNCH_ID_DESCRIPTION = "A launchId returned by session_collab_request in this session.";
+    LAUNCH_TASK_DESCRIPTION = "Full Markdown brief. Required for spawn/handoff, delivered to the new session. A handoff receiver cannot ask you anything back, so make the brief self-contained. Link: optional opening for the peer (mailbox + turn wake, never system prompt).";
     LAUNCH_MODE_DESCRIPTION = '"spawn" (default) = nested child with a two-way mailbox. "handoff" = top-level sibling, not nested: it owns the task from then on, with no mailbox and no reply \u2014 pass work forward rather than supervise it. "link" = connect to an existing session (sessionId required).';
     LAUNCH_SESSION_ID_DESCRIPTION = 'Existing SuperOne session id to link with (mode "link" only). Required for link; ignore for spawn. Prefer ids from @session mentions or session_list \u2014 never invent ids.';
     LAUNCH_PERMISSION_MODE_DESCRIPTION = 'How autonomous the child session is. Nobody watches a child, so prefer the most autonomous mode it can finish under; "plan"/"default" only when stopping for human review is the point. Per-harness mode names, and why requesting autonomy is safe here: See read_manual({ domain: "product", topic: "collaboration" }).';
     LAUNCH_CWD_DESCRIPTION = 'Only for a genuinely different project root; omit for the current project. Never a same-repo worktree leaf \u2014 express isolation with config.worktree. See read_manual({ domain: "product", topic: "collaboration" }).';
     LAUNCH_WORKTREE_DESCRIPTION = 'Host-managed worktree for same-repo isolation; leave cwd unset. For parallel implementers, not for read-only review of the shared checkout. See read_manual({ domain: "product", topic: "collaboration" }).';
     LAUNCH_BRANCH_NAME_DESCRIPTION = 'With mode "branch", create this unique branch. Git cannot check out one branch in two worktrees.';
-    SESSION_START_DESCRIPTION = "Activate one approved collaboration credential. Spawn: create the child and deliver its task. Handoff: create the sibling session and deliver the task; the credential is spent, no mailbox follows. Link: bind the existing peer and wake it via turn injection (not system prompt). Returns when the peer begins or is notified. Retries are idempotent. Start all credentials back-to-back.";
-    SESSION_SEND_DESCRIPTION = "Send a persistent Markdown message through one collaboration mailbox (spawn parent-child or link peers). Use clientMessageId for retry-safe delivery. The host wakes the peer and later wakes you when it replies. After sending, continue other work or end your turn. Never sleep, resend, or poll session_collab_retrieve while waiting.";
-    SESSION_RETRIEVE_DESCRIPTION = 'Retrieve queued Markdown messages for this session from one or more collaboration mailboxes. Call after a collaboration wake, or once before acting on peer input. This is a non-blocking read: status "empty" is not a retry signal. Do not sleep or poll; end your turn and wait for the next wake.';
+    SESSION_START_DESCRIPTION = "Start one approved launch by launchId and give it its task. Spawn: create the child and deliver the task. Handoff: create the sibling session and deliver the task; no mailbox follows. Link: bind the existing peer and wake it via turn injection (not system prompt). Returns the peer sessionId once it begins or is notified; message it with session_collab_send. Retries are idempotent and keep the first task. Start all approved launches back-to-back.";
+    SESSION_SEND_DESCRIPTION = "Send a persistent Markdown message to a collaboration peer: your spawn parent or child, or a linked session. The host checks that you may message that session. Use clientMessageId for retry-safe delivery. The host wakes the peer and later wakes you when it replies. After sending, continue other work or end your turn. Never sleep, resend, or poll session_collab_retrieve while waiting.";
+    SESSION_SEND_TO_DESCRIPTION = "Peer session id. Omit to message your spawn parent, or your only peer. session_collab_retrieve lists your peers.";
+    SESSION_SEND_CONTENT_DESCRIPTION = "Mailbox message body in Markdown. Prefer structured Markdown (headings, lists, code fences) for agent-to-agent handoffs; the SuperOne UI renders it as a Markdown preview.";
+    SESSION_RETRIEVE_DESCRIPTION = 'Read queued Markdown messages from your collaboration peers and list those peers (session id, name, relation). Call after a collaboration wake, before acting on peer input, or to find out who you can message. This is a non-blocking read: status "empty" is not a retry signal. Do not sleep or poll; end your turn and wait for the next wake.';
+    SESSION_RETRIEVE_FROM_DESCRIPTION = "Only read messages from these peer session ids. Omit to read from every peer.";
     AUTOMATION_LIST_DESCRIPTION = "List project automations with schedule and last/next run. Pass id for full prompt, agentConfig, and schedule; filter by query or enabled. Find unknown ids here before automation_apply or automation_delete; check for duplicates before creation when needed.";
     AUTOMATION_APPLY_DESCRIPTION = 'Create or update a project automation. create needs name, prompt, schedule; update needs id plus any field (pause via enabled=false). Call automation_list first for ids; remove with automation_delete. Always opens a user confirmation dialog and applies nothing without approval. For schedule and agentConfig shapes see read_manual({ domain: "product", topic: "automation" }).';
     AUTOMATION_DELETE_DESCRIPTION = "Permanently delete project automations by id (from automation_list). Always opens a user confirmation dialog. Current project only. Prefer automation_list to choose ids first.";
@@ -463,10 +467,6 @@ var init_host_action_collaboration_descriptors = __esm({
                     "minLength": 1,
                     "description": LAUNCH_SUMMARY_DESCRIPTION
                   },
-                  "task": {
-                    "type": "string",
-                    "description": LAUNCH_TASK_DESCRIPTION
-                  },
                   "name": {
                     "type": "string",
                     "minLength": 1,
@@ -583,12 +583,18 @@ var init_host_action_collaboration_descriptors = __esm({
         "inputSchema": {
           "type": "object",
           "properties": {
-            "credential": {
-              "type": "string"
+            "launchId": {
+              "type": "string",
+              "minLength": 1,
+              "description": START_LAUNCH_ID_DESCRIPTION
+            },
+            "task": {
+              "type": "string",
+              "description": LAUNCH_TASK_DESCRIPTION
             }
           },
           "required": [
-            "credential"
+            "launchId"
           ],
           "additionalProperties": false
         }
@@ -599,20 +605,20 @@ var init_host_action_collaboration_descriptors = __esm({
         "inputSchema": {
           "type": "object",
           "properties": {
-            "credential": {
-              "type": "string"
+            "to": {
+              "type": "string",
+              "description": SESSION_SEND_TO_DESCRIPTION
             },
             "content": {
               "type": "string",
               "maxLength": 1e5,
-              "description": "Mailbox message body in Markdown. Prefer structured Markdown (headings, lists, code fences) for agent-to-agent handoffs; the SuperOne UI renders it as a Markdown preview."
+              "description": SESSION_SEND_CONTENT_DESCRIPTION
             },
             "clientMessageId": {
               "type": "string"
             }
           },
           "required": [
-            "credential",
             "content"
           ],
           "additionalProperties": false
@@ -624,18 +630,15 @@ var init_host_action_collaboration_descriptors = __esm({
         "inputSchema": {
           "type": "object",
           "properties": {
-            "credentials": {
+            "from": {
               "type": "array",
-              "minItems": 1,
               "maxItems": 32,
               "items": {
                 "type": "string"
-              }
+              },
+              "description": SESSION_RETRIEVE_FROM_DESCRIPTION
             }
           },
-          "required": [
-            "credentials"
-          ],
           "additionalProperties": false
         }
       }
@@ -3097,11 +3100,12 @@ var init_host_action_computer_descriptors = __esm({
 });
 
 // ../../packages/shared/src/generative-ui/widget-tool-descriptions.ts
-var WIDGET_SHOW_DESCRIPTION;
+var WIDGET_SHOW_DESCRIPTION, WIDGET_LAYOUT_DESCRIPTION;
 var init_widget_tool_descriptions = __esm({
   "../../packages/shared/src/generative-ui/widget-tool-descriptions.ts"() {
     "use strict";
     WIDGET_SHOW_DESCRIPTION = `Render SVG, diagrams, charts, interactive HTML, or a SuperOne native surface (media gallery, files previewer) inline in chat. Pass widget_code for new content, or template + data to reuse a saved template. To show media you produced yourself, pass a @native/* template so it renders in SuperOne's own gallery (viewer, download, drag-out) instead of a lookalike you build in widget_code \u2014 call widget_list_templates for the list. To hand the user several files to look at one after another (screenshots, reports, changed sources), pass @native/files-previewer with data.files. Before the first new widget in a session, load the relevant design modules with read_manual({ domain: "widget", modules: [...] }).`;
+    WIDGET_LAYOUT_DESCRIPTION = 'How an HTML widget adapts to a narrow screen such as a phone. "fluid" (default) reflows to the available width. "fixed" lays the widget out at 680px and scales it down as a whole, keeping its proportions \u2014 use it for UI mockups, where the layout itself is what the user is reviewing.';
   }
 });
 
@@ -3131,6 +3135,11 @@ var init_host_action_widget_descriptors = __esm({
               "type": "string",
               "description": "Short snake_case identifier for this widget."
             },
+            "layout": {
+              "type": "string",
+              "enum": ["fluid", "fixed"],
+              "description": WIDGET_LAYOUT_DESCRIPTION
+            },
             "widget_code": {
               "type": "string"
             },
@@ -7411,7 +7420,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net2 = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes7, createHash: createHash13 } = __require("crypto");
+    var { randomBytes: randomBytes6, createHash: createHash12 } = __require("crypto");
     var { Duplex, Readable: Readable4 } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -7949,7 +7958,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key = randomBytes7(16).toString("base64");
+      const key = randomBytes6(16).toString("base64");
       const request = isSecure ? https.request : http.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -8079,7 +8088,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash13("sha1").update(key + GUID).digest("base64");
+        const digest = createHash12("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -8448,7 +8457,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash13 } = __require("crypto");
+    var { createHash: createHash12 } = __require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -8755,7 +8764,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash13("sha1").update(key + GUID).digest("base64");
+        const digest = createHash12("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -10230,7 +10239,7 @@ async function openCodexAppServer(opts) {
     stderrBuf = (stderrBuf + chunk).slice(-MAX_STDERR_CHARS);
   });
   const rl = createInterface({ input: child.stdout });
-  const pending = /* @__PURE__ */ new Map();
+  const pending2 = /* @__PURE__ */ new Map();
   const notificationWaiters = [];
   const notificationQueue = [];
   let nextId = 1;
@@ -10250,11 +10259,11 @@ async function openCodexAppServer(opts) {
     }
   };
   const failAll = (err) => {
-    for (const [, p3] of pending) {
+    for (const [, p3] of pending2) {
       clearTimeout(p3.timer);
       p3.reject(err);
     }
-    pending.clear();
+    pending2.clear();
     while (notificationWaiters.length) {
       const w3 = notificationWaiters.shift();
       clearTimeout(w3.timer);
@@ -10354,9 +10363,9 @@ async function openCodexAppServer(opts) {
         }
         if (rec.id != null && (typeof rec.id === "number" || typeof rec.id === "string")) {
           const id = typeof rec.id === "number" ? rec.id : Number(rec.id);
-          const waiter = pending.get(id);
+          const waiter = pending2.get(id);
           if (!waiter) continue;
-          pending.delete(id);
+          pending2.delete(id);
           clearTimeout(waiter.timer);
           if (rec.error) {
             const errObj = rec.error;
@@ -10394,14 +10403,14 @@ async function openCodexAppServer(opts) {
     }
     const id = nextId++;
     const timer = setTimeout(() => {
-      pending.delete(id);
+      pending2.delete(id);
       reject(new Error(`Codex app-server ${method} timed out after ${timeoutMs}ms`));
     }, timeoutMs);
-    pending.set(id, { resolve: resolve17, reject, timer });
+    pending2.set(id, { resolve: resolve17, reject, timer });
     try {
       writeLine({ jsonrpc: "2.0", id, method, params: params ?? {} });
     } catch (err) {
-      pending.delete(id);
+      pending2.delete(id);
       clearTimeout(timer);
       reject(safePublicError("Codex app-server write failed", err));
     }
@@ -11208,9 +11217,9 @@ var init_account_manager = __esm({
               type,
               ...type === "chatgpt" ? { useHostedLoginSuccessPage: true, appBrand: "chatgpt" } : {}
             }));
-            const pending = { accountId: id, connection };
-            this.pending.set(result.loginId, pending);
-            void this.wait(result.loginId, pending);
+            const pending2 = { accountId: id, connection };
+            this.pending.set(result.loginId, pending2);
+            void this.wait(result.loginId, pending2);
             return { ...result, accountId: id };
           } catch (error51) {
             this.failed.add(id);
@@ -11221,53 +11230,53 @@ var init_account_manager = __esm({
           this.starting = false;
         }
       }
-      async wait(loginId, pending) {
+      async wait(loginId, pending2) {
         const deadline = Date.now() + 15 * 6e4;
         const timeout = setTimeout(() => {
           void this.cancel(loginId).catch(() => {
           });
-          this.failed.add(pending.accountId);
+          this.failed.add(pending2.accountId);
         }, 15 * 6e4);
         timeout.unref?.();
         try {
-          while (this.pending.get(loginId) === pending && Date.now() < deadline) {
-            const notification = await pending.connection.nextNotification();
+          while (this.pending.get(loginId) === pending2 && Date.now() < deadline) {
+            const notification = await pending2.connection.nextNotification();
             if (!notification) throw new Error("Login connection closed");
             if (notification?.method !== "account/login/completed" || notification.params.loginId !== loginId) continue;
             if (notification.params.success !== true) throw new Error("Sign-in failed");
-            const status = parseAccountStatus(await pending.connection.request("account/read", { refreshToken: false }));
+            const status = parseAccountStatus(await pending2.connection.request("account/read", { refreshToken: false }));
             if (!status.signedIn) throw new Error("Sign-in did not complete");
-            if (this.pending.get(loginId) !== pending) return;
-            this.store.update(pending.accountId, status);
-            this.store.invalidateCredentials(pending.accountId);
-            this.changed(codexAccountProviderId(pending.accountId));
+            if (this.pending.get(loginId) !== pending2) return;
+            this.store.update(pending2.accountId, status);
+            this.store.invalidateCredentials(pending2.accountId);
+            this.changed(codexAccountProviderId(pending2.accountId));
             return;
           }
-          if (this.pending.get(loginId) === pending) this.failed.add(pending.accountId);
+          if (this.pending.get(loginId) === pending2) this.failed.add(pending2.accountId);
         } catch {
-          this.failed.add(pending.accountId);
+          this.failed.add(pending2.accountId);
         } finally {
           clearTimeout(timeout);
-          if (this.pending.get(loginId) === pending) this.pending.delete(loginId);
-          await pending.connection.close().catch(() => {
+          if (this.pending.get(loginId) === pending2) this.pending.delete(loginId);
+          await pending2.connection.close().catch(() => {
           });
         }
       }
       async cancel(loginId) {
-        const pending = this.pending.get(loginId);
-        if (!pending) return;
+        const pending2 = this.pending.get(loginId);
+        if (!pending2) return;
         this.pending.delete(loginId);
         try {
-          await pending.connection.request("account/login/cancel", { loginId });
+          await pending2.connection.request("account/login/cancel", { loginId });
         } finally {
-          await pending.connection.close();
+          await pending2.connection.close();
         }
       }
       async logout(providerId) {
         const id = codexAccountId(providerId) ?? codexAccountId(this.store.defaultProviderId()) ?? CODEX_CLI_ACCOUNT_ID;
         this.revisions.set(id, (this.revisions.get(id) ?? 0) + 1);
-        for (const [loginId, pending] of this.pending) {
-          if (pending.accountId === id) await this.cancel(loginId);
+        for (const [loginId, pending2] of this.pending) {
+          if (pending2.accountId === id) await this.cancel(loginId);
         }
         const selected = codexAccountProviderId(id);
         const connection = await this.open(selected);
@@ -11799,8 +11808,9 @@ var init_harness_capabilities = __esm({
       },
       dsh: {
         // In-process dsh Cordis tree (docs/draft/deepseek-harness-integration.md).
-        // Flags flip only when the corresponding event path is wired: streaming
-        // tool input → tool-call-delta mapping.
+        // Flags flip only when the corresponding event path is wired.
+        // `supportsStreamingToolInput`: live `tool-call-delta` frames open the row
+        // and stream its arguments before the durable `tool/call` completes it.
         // `supportsCompact`: `compaction-basic` compacts automatically at context
         // pressure and on provider overflow; `/compact` drives `compactNow()`.
         // `supportsMcp` covers both SuperOne's own tools (native dsh rows) and
@@ -11808,13 +11818,17 @@ var init_harness_capabilities = __esm({
         // `supportsSubagents`: foreground delegation (`dsh-tool-subagent` over the
         // in-process spawn provider), rendered as a Task block with the child's
         // steps nested under it. Background and continuable children are not wired.
+        // `supportsPlanMode`: `plan` also turns on dsh plan mode; `exit_plan_mode`
+        // reaches the plan-approval card through the user-questions seam.
+        // `supportsQueuedSteer`: `agent.steer()` lands at the next step boundary
+        // and never cancels a tool, so there is one steer and no separate "soon".
         supportsMcp: true,
-        supportsPlanMode: false,
+        supportsPlanMode: true,
         supportsTodos: true,
         supportsSubagents: true,
         supportsCompact: true,
-        supportsStreamingToolInput: false,
-        supportsQueuedSteer: false,
+        supportsStreamingToolInput: true,
+        supportsQueuedSteer: true,
         supportsQueuedSteerSoon: false,
         // Single cwd.
         supportsAdditionalDirs: false,
@@ -13068,11 +13082,6 @@ var init_message_bridge = __esm({
 });
 
 // ../../packages/shared/src/agent-types.ts
-function resolveLaunchSummary(task, summary2) {
-  const explicit = typeof summary2 === "string" ? summary2.trim() : "";
-  if (explicit) return explicit;
-  return task.split(/\n/, 1)[0]?.trim() || task.trim();
-}
 function hasOneM(id) {
   return id.endsWith(ONE_M_SUFFIX);
 }
@@ -13587,7 +13596,7 @@ async function fetchClaudeModels(opts) {
   };
   let q2;
   try {
-    q2 = (opts.queryFn ?? sdkQuery3)({ prompt: "hi", options });
+    q2 = (opts.queryFn ?? sdkQuery3)({ prompt: CLAUDE_METADATA_PROBE_PROMPT, options });
     const models = await withTimeout(
       (async () => {
         await q2.initializationResult();
@@ -13620,12 +13629,13 @@ function withTimeout(promise2, ms2) {
     );
   });
 }
-var MODEL_NAME_RE, DEFAULT_PROBE_TIMEOUT_MS;
+var CLAUDE_METADATA_PROBE_PROMPT, MODEL_NAME_RE, DEFAULT_PROBE_TIMEOUT_MS;
 var init_fetch_models = __esm({
   "../../packages/claude/src/fetch-models.ts"() {
     "use strict";
     init_resolve_sdk_binary();
     init_root_permission_guard();
+    CLAUDE_METADATA_PROBE_PROMPT = "/help";
     MODEL_NAME_RE = /^(\w+ [\d.]+)(?:\s+with\s+(\w+)\s+context)?/;
     DEFAULT_PROBE_TIMEOUT_MS = 2e4;
   }
@@ -13950,23 +13960,23 @@ function mapPlanRequest(payload, fallbackId) {
     allowedPrompts: Array.isArray(payload.allowedPrompts) ? payload.allowedPrompts : Array.isArray(input.allowedPrompts) ? input.allowedPrompts : []
   };
 }
-function userMessage(ctx, blockId, text2, nowIso) {
+function userMessage(ctx, blockId, text2, nowIso2) {
   return {
     id: blockId,
     role: "user",
     status: "complete",
     content: text2 ? [{ type: "text", text: text2 }] : [],
-    createdAt: nowIso,
+    createdAt: nowIso2,
     providerId: ctx.providerId ?? "codex"
   };
 }
-function assistantMessage(ctx, blockId, nowIso) {
+function assistantMessage(ctx, blockId, nowIso2) {
   return {
     id: blockId,
     role: "assistant",
     status: "streaming",
     content: [],
-    createdAt: nowIso,
+    createdAt: nowIso2,
     providerId: ctx.providerId ?? "codex"
   };
 }
@@ -13982,7 +13992,7 @@ function createNodeSessionEventMapper(ctx) {
   const completedAssistantIds = /* @__PURE__ */ new Set();
   let lastAssistantId = null;
   let rawTerminalThisTurn = false;
-  const nowIso = ctx.nowIso ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const nowIso2 = ctx.nowIso ?? (() => (/* @__PURE__ */ new Date()).toISOString());
   const ensureAssistant = (push, preferredId) => {
     if (lastAssistantId) return lastAssistantId;
     const id = preferredId && preferredId.length > 0 ? preferredId : `assistant-${ctx.sessionId}`;
@@ -13990,7 +14000,7 @@ function createNodeSessionEventMapper(ctx) {
       startedAssistantIds.add(id);
       push({
         type: "message_start",
-        message: assistantMessage(ctx, id, nowIso())
+        message: assistantMessage(ctx, id, nowIso2())
       });
     }
     lastAssistantId = id;
@@ -14012,7 +14022,7 @@ function createNodeSessionEventMapper(ctx) {
         const text2 = asString(payload.text) ?? "";
         push({
           type: "user_message_appended",
-          message: userMessage(ctx, blockId, text2, nowIso())
+          message: userMessage(ctx, blockId, text2, nowIso2())
         });
         break;
       }
@@ -14906,6 +14916,20 @@ var init_session_title = __esm({
   }
 });
 
+// ../../packages/shared/src/host-wake.ts
+function isModelOnlyHostWake(text2) {
+  return MODEL_ONLY_WAKE.test(text2.trimStart());
+}
+var MODEL_ONLY_WAKE;
+var init_host_wake = __esm({
+  "../../packages/shared/src/host-wake.ts"() {
+    "use strict";
+    MODEL_ONLY_WAKE = new RegExp(
+      '^(?:<task_notification source="(?:browser_download|artifact_sync)"|A collaboration mailbox message is ready\\.|A user-approved collaboration link is active with SuperOne session )'
+    );
+  }
+});
+
 // ../../packages/runtime/src/session/host-action-store.ts
 import { createHash as createHash2, randomBytes as randomBytes2, randomUUID as randomUUID4, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
 function hashToken(token) {
@@ -15624,15 +15648,6 @@ var init_host_action_store = __esm({
   }
 });
 
-// ../../packages/runtime/src/session/types.ts
-var DEFAULT_PERMISSION_TIMEOUT_MS;
-var init_types = __esm({
-  "../../packages/runtime/src/session/types.ts"() {
-    "use strict";
-    DEFAULT_PERMISSION_TIMEOUT_MS = 6e4;
-  }
-});
-
 // ../../packages/runtime/src/session/runtime-policy.ts
 function getRuntimeIdleTimeoutMs(activeRuntimeCount) {
   if (activeRuntimeCount <= 4) return TWENTY_MINUTES_MS;
@@ -15652,9 +15667,6 @@ var init_runtime_policy = __esm({
 
 // ../../packages/runtime/src/session/session-runtime.ts
 import { randomUUID as randomUUID5 } from "node:crypto";
-function redactTaskNotificationForDisplay(content) {
-  return content.replace(/\s+with credential\s+(?:"[^"]*"|'[^']*')/gi, "").replace(/\bs1sc_[A-Za-z0-9_-]+/g, "[redacted]").replace(/\s{2,}/g, " ").trim();
-}
 function deriveSessionTitleFromUserText(text2) {
   const cleaned = stripMiniAppMarkup(text2).trim().replace(/\s+/g, " ");
   if (!cleaned) return null;
@@ -15758,10 +15770,9 @@ var init_session_runtime = __esm({
     init_message_catalog();
     init_miniapp_prompt_tags();
     init_session_title();
+    init_host_wake();
     init_host_action_store();
-    init_types();
     init_runtime_policy();
-    init_types();
     DEFAULT_AGENTS_CONFIRM_TIMEOUT_MS = 10 * 6e4;
     SessionRuntime = class {
       constructor(store, events, leases, environmentId, turnRunner, opts) {
@@ -15771,7 +15782,6 @@ var init_session_runtime = __esm({
         this.environmentId = environmentId;
         this.turnRunner = turnRunner;
         this.defaultApiProviderId = opts?.defaultApiProviderId;
-        this.permissionTimeoutMs = opts?.permissionTimeoutMs ?? DEFAULT_PERMISSION_TIMEOUT_MS;
         this.agentsConfirmTimeoutMs = opts?.agentsConfirmTimeoutMs ?? DEFAULT_AGENTS_CONFIRM_TIMEOUT_MS;
         this.hostActions = opts?.hostActions ?? null;
         this.hydrateFromStore();
@@ -15806,14 +15816,13 @@ var init_session_runtime = __esm({
       disposing = false;
       /**
        * Active permission waiters keyed by interactionId.
-       * respondPermission resolves these; timeout/abort/close deny them.
+       * respondPermission resolves these; abort/close deny them.
        */
       permissionWaiters = /* @__PURE__ */ new Map();
       questionWaiters = /* @__PURE__ */ new Map();
       planWaiters = /* @__PURE__ */ new Map();
       agentsConfirmWaiters = /* @__PURE__ */ new Map();
       defaultApiProviderId;
-      permissionTimeoutMs;
       agentsConfirmTimeoutMs;
       hostActions;
       /** Live waiters for requestHostAction terminal settlement. */
@@ -16422,18 +16431,18 @@ var init_session_runtime = __esm({
         return { delivered: true };
       }
       appendUserMessage(session, opts) {
-        const displayText = opts.source === "task-notification" ? redactTaskNotificationForDisplay(opts.text) : opts.text;
+        if (opts.source === "task-notification" && isModelOnlyHostWake(opts.text)) return;
         const userBlock = {
           id: randomUUID5(),
           role: "user",
-          text: displayText,
+          text: opts.text,
           createdAt: Date.now()
         };
         session.transcript.push(userBlock);
         session.updatedAt = Date.now();
         let autoTitle = null;
         if (!session.title || !session.title.trim()) {
-          autoTitle = deriveSessionTitleFromUserText(displayText);
+          autoTitle = deriveSessionTitleFromUserText(opts.text);
           if (autoTitle) session.title = autoTitle;
         }
         this.persist(session);
@@ -16442,7 +16451,7 @@ var init_session_runtime = __esm({
           eventType: SESSION_DURABLE_EVENT.userMessage,
           payload: {
             blockId: userBlock.id,
-            text: displayText,
+            text: opts.text,
             ...opts.source ? { source: opts.source } : {}
           },
           causationRequestId: opts.requestId
@@ -16651,7 +16660,7 @@ var init_session_runtime = __esm({
         this.aborts.delete(sessionId);
         session.closed = true;
         session.status = "ended";
-        this.rejectPendingPermission(session, "aborted");
+        this.rejectPendingPermission(session);
         this.cancelHostActionsForSession(sessionId, "session_closed");
         session.updatedAt = Date.now();
         this.persist(session);
@@ -17079,11 +17088,11 @@ var init_session_runtime = __esm({
           generation: input.generation,
           holderClientId: input.client.clientSessionId
         });
-        const pending = session.pendingInteraction;
-        if (!pending || pending.interactionId !== input.interactionId) {
+        const pending2 = session.pendingInteraction;
+        if (!pending2 || pending2.interactionId !== input.interactionId) {
           throw Object.assign(new Error("no matching pending permission"), { code: "failed_precondition" });
         }
-        if (pending.kind === "session_agents_confirm") {
+        if (pending2.kind === "session_agents_confirm") {
           const waiter2 = this.agentsConfirmWaiters.get(input.interactionId);
           if (!waiter2 || waiter2.sessionId !== input.sessionId) {
             throw Object.assign(new Error("no matching pending agents confirm"), {
@@ -17101,7 +17110,7 @@ var init_session_runtime = __esm({
           });
           return;
         }
-        if (pending.kind && pending.kind !== "permission") {
+        if (pending2.kind && pending2.kind !== "permission") {
           throw Object.assign(new Error("no matching pending permission"), { code: "failed_precondition" });
         }
         const waiter = this.permissionWaiters.get(input.interactionId);
@@ -17138,7 +17147,7 @@ var init_session_runtime = __esm({
           );
         }
         if (session.pendingInteraction) {
-          this.rejectPendingPermission(session, "aborted");
+          this.rejectPendingPermission(session);
         }
         const interaction = {
           interactionId: `sessionagents_${Date.now()}_${randomUUID5().slice(0, 8)}`,
@@ -17264,11 +17273,11 @@ var init_session_runtime = __esm({
       }
       /**
        * Block the turn until the control-lease holder responds, or until
-       * timeout / abort / session close. Always emits a durable permission event.
+       * abort / session close. Always emits a durable permission event.
        */
       waitForPermissionDecision(session, interaction, signal, requestId) {
         if (session.pendingInteraction) {
-          this.rejectPendingPermission(session, "aborted");
+          this.rejectPendingPermission(session);
         }
         return new Promise((resolve17) => {
           let settled = false;
@@ -17284,11 +17293,7 @@ var init_session_runtime = __esm({
           const settle = (result) => {
             if (settled) return;
             settled = true;
-            const waiter = this.permissionWaiters.get(interaction.interactionId);
-            if (waiter) {
-              clearTimeout(waiter.timer);
-              this.permissionWaiters.delete(interaction.interactionId);
-            }
+            this.permissionWaiters.delete(interaction.interactionId);
             if (session.pendingInteraction?.interactionId === interaction.interactionId) {
               session.pendingInteraction = null;
               session.updatedAt = Date.now();
@@ -17303,12 +17308,6 @@ var init_session_runtime = __esm({
                   decision: result.clientDecision ?? result.decision
                 }
               });
-            } else if (result.reason === "timeout") {
-              this.events.appendSession({
-                sessionId: session.sessionId,
-                eventType: SESSION_DURABLE_EVENT.permissionTimeout,
-                payload: { interactionId: interaction.interactionId, decision: "deny" }
-              });
             } else {
               this.events.appendSession({
                 sessionId: session.sessionId,
@@ -17318,13 +17317,9 @@ var init_session_runtime = __esm({
             }
             resolve17(result.decision);
           };
-          const timer = setTimeout(() => {
-            settle({ decision: "deny", reason: "timeout" });
-          }, this.permissionTimeoutMs);
           this.permissionWaiters.set(interaction.interactionId, {
             sessionId: session.sessionId,
-            settle,
-            timer
+            settle
           });
           if (signal.aborted) {
             settle({ decision: "deny", reason: "aborted" });
@@ -17340,59 +17335,55 @@ var init_session_runtime = __esm({
         });
       }
       /** Deny and clear any active permission waiter for this session. */
-      rejectPendingPermission(session, reason) {
-        const pending = session.pendingInteraction;
-        if (!pending) return;
-        if (pending.kind === "question") {
-          const qw = this.questionWaiters.get(pending.interactionId);
-          if (qw) qw.settle({ answers: {}, reason });
+      rejectPendingPermission(session) {
+        const pending2 = session.pendingInteraction;
+        if (!pending2) return;
+        if (pending2.kind === "question") {
+          const qw = this.questionWaiters.get(pending2.interactionId);
+          if (qw) qw.settle({ answers: {}, reason: "aborted" });
           else session.pendingInteraction = null;
           return;
         }
-        if (pending.kind === "plan") {
-          const pw = this.planWaiters.get(pending.interactionId);
-          if (pw) pw.settle({ decision: "reject", reason });
+        if (pending2.kind === "plan") {
+          const pw = this.planWaiters.get(pending2.interactionId);
+          if (pw) pw.settle({ decision: "reject", reason: "aborted" });
           else session.pendingInteraction = null;
           return;
         }
-        if (pending.kind === "session_agents_confirm") {
-          const aw = this.agentsConfirmWaiters.get(pending.interactionId);
-          if (aw) aw.settle({ action: "cancel", reason });
+        if (pending2.kind === "session_agents_confirm") {
+          const aw = this.agentsConfirmWaiters.get(pending2.interactionId);
+          if (aw) aw.settle({ action: "cancel", reason: "aborted" });
           else session.pendingInteraction = null;
           return;
         }
-        const waiter = this.permissionWaiters.get(pending.interactionId);
+        const waiter = this.permissionWaiters.get(pending2.interactionId);
         if (waiter) {
-          waiter.settle({ decision: "deny", reason });
+          waiter.settle({ decision: "deny", reason: "aborted" });
         } else {
           session.pendingInteraction = null;
         }
       }
       waitForQuestionDecision(session, interaction, signal, requestId) {
         if (session.pendingInteraction) {
-          this.rejectPendingPermission(session, "aborted");
+          this.rejectPendingPermission(session);
         }
-        const pending = { ...interaction, kind: "question" };
+        const pending2 = { ...interaction, kind: "question" };
         return new Promise((resolve17) => {
           let settled = false;
-          session.pendingInteraction = pending;
+          session.pendingInteraction = pending2;
           session.updatedAt = Date.now();
           this.persist(session);
           this.events.appendSession({
             sessionId: session.sessionId,
             eventType: SESSION_DURABLE_EVENT.questionRequested,
-            payload: pending,
+            payload: pending2,
             causationRequestId: requestId
           });
           const settle = (result) => {
             if (settled) return;
             settled = true;
-            const waiter = this.questionWaiters.get(pending.interactionId);
-            if (waiter) {
-              clearTimeout(waiter.timer);
-              this.questionWaiters.delete(pending.interactionId);
-            }
-            if (session.pendingInteraction?.interactionId === pending.interactionId) {
+            this.questionWaiters.delete(pending2.interactionId);
+            if (session.pendingInteraction?.interactionId === pending2.interactionId) {
               session.pendingInteraction = null;
               session.updatedAt = Date.now();
               this.persist(session);
@@ -17401,30 +17392,20 @@ var init_session_runtime = __esm({
               this.events.appendSession({
                 sessionId: session.sessionId,
                 eventType: SESSION_DURABLE_EVENT.questionResponded,
-                payload: { interactionId: pending.interactionId, answers: result.answers }
-              });
-            } else if (result.reason === "timeout") {
-              this.events.appendSession({
-                sessionId: session.sessionId,
-                eventType: SESSION_DURABLE_EVENT.questionTimeout,
-                payload: { interactionId: pending.interactionId }
+                payload: { interactionId: pending2.interactionId, answers: result.answers }
               });
             } else {
               this.events.appendSession({
                 sessionId: session.sessionId,
                 eventType: SESSION_DURABLE_EVENT.questionAborted,
-                payload: { interactionId: pending.interactionId }
+                payload: { interactionId: pending2.interactionId }
               });
             }
             resolve17(result.answers);
           };
-          const timer = setTimeout(() => {
-            settle({ answers: {}, reason: "timeout" });
-          }, this.permissionTimeoutMs);
-          this.questionWaiters.set(pending.interactionId, {
+          this.questionWaiters.set(pending2.interactionId, {
             sessionId: session.sessionId,
-            settle,
-            timer
+            settle
           });
           if (signal.aborted) {
             settle({ answers: {}, reason: "aborted" });
@@ -17441,29 +17422,25 @@ var init_session_runtime = __esm({
       }
       waitForPlanDecision(session, interaction, signal, requestId) {
         if (session.pendingInteraction) {
-          this.rejectPendingPermission(session, "aborted");
+          this.rejectPendingPermission(session);
         }
-        const pending = { ...interaction, kind: "plan" };
+        const pending2 = { ...interaction, kind: "plan" };
         return new Promise((resolve17) => {
           let settled = false;
-          session.pendingInteraction = pending;
+          session.pendingInteraction = pending2;
           session.updatedAt = Date.now();
           this.persist(session);
           this.events.appendSession({
             sessionId: session.sessionId,
             eventType: SESSION_DURABLE_EVENT.planRequested,
-            payload: pending,
+            payload: pending2,
             causationRequestId: requestId
           });
           const settle = (result) => {
             if (settled) return;
             settled = true;
-            const waiter = this.planWaiters.get(pending.interactionId);
-            if (waiter) {
-              clearTimeout(waiter.timer);
-              this.planWaiters.delete(pending.interactionId);
-            }
-            if (session.pendingInteraction?.interactionId === pending.interactionId) {
+            this.planWaiters.delete(pending2.interactionId);
+            if (session.pendingInteraction?.interactionId === pending2.interactionId) {
               session.pendingInteraction = null;
               session.updatedAt = Date.now();
               this.persist(session);
@@ -17473,33 +17450,23 @@ var init_session_runtime = __esm({
                 sessionId: session.sessionId,
                 eventType: SESSION_DURABLE_EVENT.planResponded,
                 payload: {
-                  interactionId: pending.interactionId,
+                  interactionId: pending2.interactionId,
                   decision: result.decision,
                   options: result.options
                 }
               });
-            } else if (result.reason === "timeout") {
-              this.events.appendSession({
-                sessionId: session.sessionId,
-                eventType: SESSION_DURABLE_EVENT.planTimeout,
-                payload: { interactionId: pending.interactionId, decision: "reject" }
-              });
             } else {
               this.events.appendSession({
                 sessionId: session.sessionId,
                 eventType: SESSION_DURABLE_EVENT.planAborted,
-                payload: { interactionId: pending.interactionId, decision: "reject" }
+                payload: { interactionId: pending2.interactionId, decision: "reject" }
               });
             }
             resolve17({ decision: result.decision, options: result.options });
           };
-          const timer = setTimeout(() => {
-            settle({ decision: "reject", reason: "timeout" });
-          }, this.permissionTimeoutMs);
-          this.planWaiters.set(pending.interactionId, {
+          this.planWaiters.set(pending2.interactionId, {
             sessionId: session.sessionId,
-            settle,
-            timer
+            settle
           });
           if (signal.aborted) {
             settle({ decision: "reject", reason: "aborted" });
@@ -18696,7 +18663,7 @@ var init_relay_identify = __esm({
 
 // ../../packages/shared/src/platform-registry/types.ts
 var CONSUMER_TASK;
-var init_types2 = __esm({
+var init_types = __esm({
   "../../packages/shared/src/platform-registry/types.ts"() {
     "use strict";
     CONSUMER_TASK = {
@@ -19027,10 +18994,10 @@ var init_builtin = __esm({
     init_effective_endpoints();
     init_protocols();
     XIAOMI_MODELS = {
-      default: { id: "mimo-v2.5-pro[1m]", name: "MiMo V2.5 Pro" },
-      opus: { id: "mimo-v2.5-pro[1m]", name: "MiMo V2.5 Pro" },
-      sonnet: { id: "mimo-v2.5-pro[1m]", name: "MiMo V2.5 Pro" },
-      haiku: { id: "mimo-v2.5-pro", name: "MiMo V2.5 Pro" }
+      default: { id: "mimo-v2.6-pro[1m]", name: "MiMo V2.6 Pro" },
+      opus: { id: "mimo-v2.6-pro[1m]", name: "MiMo V2.6 Pro" },
+      sonnet: { id: "mimo-v2.6-pro[1m]", name: "MiMo V2.6 Pro" },
+      haiku: { id: "mimo-v2.6-pro", name: "MiMo V2.6 Pro" }
     };
     BAILIAN_CODING_PLAN_MODELS = {
       default: { id: "qwen3.7-plus", name: "Qwen 3.7 Plus" },
@@ -19535,6 +19502,7 @@ var init_builtin = __esm({
             auth: "api-key",
             baseUrl: "https://api.minimax.cn",
             apiKeyUrl: "https://platform.minimax.cn/user-center/basic-information/interface-key",
+            catalogProviderId: "minimax-cn",
             endpoints: [
               anthropic("/anthropic", {
                 extraEnv: MINIMAX_EXTRA_ENV,
@@ -19552,6 +19520,7 @@ var init_builtin = __esm({
             auth: "api-key",
             baseUrl: "https://api.minimax.io",
             apiKeyUrl: "https://platform.minimax.io/user-center/basic-information/interface-key",
+            catalogProviderId: "minimax",
             endpoints: [
               anthropic("/anthropic", {
                 extraEnv: MINIMAX_EXTRA_ENV,
@@ -19648,6 +19617,7 @@ var init_builtin = __esm({
             auth: "api-key",
             baseUrl: "https://token-plan-cn.xiaomimimo.com",
             apiKeyUrl: "https://platform.xiaomimimo.com/#/console/api-keys",
+            catalogProviderId: "xiaomi-token-plan-cn",
             endpoints: [
               anthropic("/anthropic", {
                 extraEnv: { ...EMPTY_AUTH_TOKEN },
@@ -19661,6 +19631,7 @@ var init_builtin = __esm({
             auth: "api-key",
             baseUrl: "https://api.xiaomimimo.com",
             apiKeyUrl: "https://platform.xiaomimimo.com/#/console/api-keys",
+            catalogProviderId: "xiaomi",
             endpoints: [
               anthropic("/anthropic", {
                 extraEnv: { ...EMPTY_AUTH_TOKEN },
@@ -19779,6 +19750,7 @@ var init_builtin = __esm({
         brand: "longcat",
         name: "Longcat",
         description: "Longcat \u2014 \u957F\u732B AI \u7F16\u7A0B\u52A9\u624B",
+        catalogProviderId: "longcat",
         plans: [
           {
             id: "coding",
@@ -19883,6 +19855,7 @@ var init_builtin = __esm({
         brand: "modelscope",
         name: "ModelScope",
         description: "ModelScope \u9B54\u642D \u2014 \u963F\u91CC\u5DF4\u5DF4\u6A21\u578B\u805A\u5408\u5E73\u53F0",
+        catalogProviderId: "modelscope",
         plans: [
           {
             id: "api",
@@ -19909,6 +19882,7 @@ var init_builtin = __esm({
         brand: "siliconcloud",
         name: "SiliconFlow",
         description: "SiliconFlow \u7845\u57FA\u6D41\u52A8 \u2014 AI \u6A21\u578B\u805A\u5408\u63A8\u7406\u5E73\u53F0",
+        catalogProviderId: "siliconflow-cn",
         plans: [
           {
             id: "api",
@@ -19958,6 +19932,7 @@ var init_builtin = __esm({
         brand: "bedrock",
         name: "AWS Bedrock",
         description: "Amazon Bedrock \u2014 run Claude on AWS infrastructure with IAM authentication",
+        catalogProviderId: "amazon-bedrock",
         plans: [
           {
             id: "aws",
@@ -19979,6 +19954,7 @@ var init_builtin = __esm({
         brand: "vertexai",
         name: "Google Vertex",
         description: "Google Vertex AI \u2014 run Claude on GCP infrastructure with service account authentication",
+        catalogProviderId: "google-vertex-anthropic",
         plans: [
           {
             id: "gcp",
@@ -20118,9 +20094,9 @@ var init_platform_registry = __esm({
     "use strict";
     init_relay_identify();
     init_protocols();
-    init_types2();
+    init_types();
     init_protocols();
-    init_types2();
+    init_types();
     init_capabilities2();
     init_claude_env();
     init_merge();
@@ -64627,6 +64603,23 @@ var init_cursor_store = __esm({
   }
 });
 
+// ../../packages/cursor/src/cursor-sdk.ts
+function loadCursorSdk() {
+  pending ??= import("@cursor/sdk").then((sdk) => loaded = sdk);
+  return pending;
+}
+function isCursorSdkError(error51, name) {
+  return loaded !== null && error51 instanceof loaded[name];
+}
+var pending, loaded;
+var init_cursor_sdk = __esm({
+  "../../packages/cursor/src/cursor-sdk.ts"() {
+    "use strict";
+    pending = null;
+    loaded = null;
+  }
+});
+
 // ../../packages/shared/src/model-option-params.ts
 function parseCatalogContextWindow(raw) {
   if (!raw) return null;
@@ -64677,33 +64670,30 @@ var init_cursor_model_selection = __esm({
 });
 
 // ../../packages/cursor/src/cursor-client.ts
-import { Agent as Agent2, Cursor } from "@cursor/sdk";
 var init_cursor_client = __esm({
   "../../packages/cursor/src/cursor-client.ts"() {
     "use strict";
+    init_cursor_sdk();
     init_cursor_config();
     init_cursor_model_selection();
   }
 });
 
 // ../../packages/cursor/src/cursor-cloud.ts
-import {
-  Agent as Agent3,
-  Cursor as Cursor2
-} from "@cursor/sdk";
 var init_cursor_cloud = __esm({
   "../../packages/cursor/src/cursor-cloud.ts"() {
     "use strict";
+    init_cursor_sdk();
     init_cursor_config();
     init_cursor_store();
   }
 });
 
 // ../../packages/cursor/src/cursor-sdk-auth.ts
-import { Cursor as Cursor3 } from "@cursor/sdk";
 var init_cursor_sdk_auth = __esm({
   "../../packages/cursor/src/cursor-sdk-auth.ts"() {
     "use strict";
+    init_cursor_sdk();
   }
 });
 
@@ -64742,9 +64732,7 @@ var init_cursor_local_options = __esm({
 });
 
 // ../../packages/cursor/src/cursor-network-retry.ts
-import { NetworkError } from "@cursor/sdk";
 function isCursorRetryableNetworkError(error51) {
-  if (error51 instanceof NetworkError) return error51.isRetryable;
   if (!error51 || typeof error51 !== "object") return false;
   const name = "name" in error51 ? String(error51.name) : "";
   if (name !== "NetworkError") return false;
@@ -64828,14 +64816,8 @@ var init_cursor_sdk_trace = __esm({
 });
 
 // ../../packages/cursor/src/cursor-runtime.ts
-import {
-  Agent as Agent4,
-  AgentBusyError,
-  Cursor as Cursor4,
-  IntegrationNotConnectedError
-} from "@cursor/sdk";
 function formatCursorError(error51) {
-  if (error51 instanceof IntegrationNotConnectedError) {
+  if (isCursorSdkError(error51, "IntegrationNotConnectedError")) {
     return new CursorIntegrationError(
       `${error51.message} Connect ${error51.provider} at ${error51.helpUrl} then retry.`,
       { provider: error51.provider, helpUrl: error51.helpUrl }
@@ -64863,9 +64845,10 @@ async function createCursorRuntime(opts) {
       "Cursor User API Key missing. Create one at https://cursor.com/dashboard/api, set it on the Cursor provider, or export CURSOR_API_KEY."
     );
   }
+  const { Agent: Agent2, Cursor } = await loadCursorSdk();
   if (plan.config.useHttp1ForAgent != null) {
     try {
-      Cursor4.configure({ local: { useHttp1ForAgent: plan.config.useHttp1ForAgent } });
+      Cursor.configure({ local: { useHttp1ForAgent: plan.config.useHttp1ForAgent } });
     } catch (error51) {
       log2.debug("[CursorRuntime] Cursor.configure useHttp1ForAgent failed:", error51);
     }
@@ -64917,7 +64900,7 @@ async function createCursorRuntime(opts) {
   }, opts.sessionId);
   const openAgent = (sandbox) => withCursorPlatformLookup(async () => {
     if (opts.providerSessionId) {
-      return Agent4.resume(opts.providerSessionId, {
+      return Agent2.resume(opts.providerSessionId, {
         apiKey,
         ...model ? { model } : {},
         ...agentName ? { name: agentName } : {},
@@ -64940,7 +64923,7 @@ async function createCursorRuntime(opts) {
       });
     }
     if (isCloud) {
-      return Agent4.create({
+      return Agent2.create({
         apiKey,
         ...model ? { model } : {},
         ...agentName ? { name: agentName } : {},
@@ -64949,7 +64932,7 @@ async function createCursorRuntime(opts) {
         cloud: buildCloudOptions(config2)
       });
     }
-    return Agent4.create({
+    return Agent2.create({
       apiKey,
       model,
       ...agentName ? { name: agentName } : {},
@@ -65132,7 +65115,7 @@ ${text2}` : text2;
       try {
         run = await agent.send(userMessage2, sendOptions);
       } catch (error51) {
-        if (error51 instanceof AgentBusyError && !sendOpts?.force && !isCloud) {
+        if (isCursorSdkError(error51, "AgentBusyError") && !sendOpts?.force && !isCloud) {
           log2.warn("[CursorRuntime] AgentBusyError \u2014 retrying with local.force");
           tracer.runtime("agent_busy_retry", {
             message: error51 instanceof Error ? error51.message : String(error51)
@@ -65303,6 +65286,7 @@ var init_cursor_runtime = __esm({
   "../../packages/cursor/src/cursor-runtime.ts"() {
     "use strict";
     init_superone_system_prompt();
+    init_cursor_sdk();
     init_cursor_config();
     init_cursor_local_options();
     init_cursor_network_retry();
@@ -65335,10 +65319,10 @@ var init_cursor_runtime = __esm({
 });
 
 // ../../packages/cursor/src/cursor-workspace-prewarm.ts
-import { createAgentPlatform } from "@cursor/sdk";
 var init_cursor_workspace_prewarm = __esm({
   "../../packages/cursor/src/cursor-workspace-prewarm.ts"() {
     "use strict";
+    init_cursor_sdk();
     init_cursor_sdk_trace();
     init_cursor_local_options();
     init_cursor_platform_binaries();
@@ -65486,6 +65470,7 @@ var init_src5 = __esm({
     init_cursor_event_map();
     init_cursor_store();
     init_cursor_client();
+    init_cursor_sdk();
     init_cursor_model_selection();
     init_cursor_cloud();
     init_cursor_sdk_auth();
@@ -71246,8 +71231,8 @@ var require_multipleOf = __commonJS({
         const { gen, data, schemaCode, it: it2 } = cxt;
         const prec = it2.opts.multipleOfPrecision;
         const res = gen.let("res");
-        const invalid2 = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
-        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid2}))`);
+        const invalid3 = prec ? (0, codegen_1._)`Math.abs(Math.round(${res}) - ${res}) > 1e-${prec}` : (0, codegen_1._)`${res} !== parseInt(${res})`;
+        cxt.fail$data((0, codegen_1._)`(${schemaCode} === 0 || (${res} = ${data}/${schemaCode}, ${invalid3}))`);
       }
     };
     exports.default = def;
@@ -73403,8 +73388,8 @@ import { fileURLToPath } from "node:url";
 function resolveCliReleaseVersion() {
   const fromEnv = process.env.SUPERONE_CLI_VERSION?.trim();
   if (fromEnv) return fromEnv;
-  if ("0.68.0".trim()) {
-    return "0.68.0".trim();
+  if ("0.69.0-alpha.1".trim()) {
+    return "0.69.0-alpha.1".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;
@@ -74599,7 +74584,7 @@ CREATE TABLE IF NOT EXISTS session_collaboration_grants (
   credential_secret TEXT,
   credential_hint TEXT NOT NULL,
   parent_session_id TEXT NOT NULL,
-  child_session_id TEXT UNIQUE,
+  child_session_id TEXT,
   agent_id TEXT NOT NULL,
   task TEXT NOT NULL,
   config_json TEXT NOT NULL,
@@ -74684,6 +74669,66 @@ CREATE INDEX IF NOT EXISTS idx_session_providers_harness ON session_providers(ha
 `;
 var SCHEMA_GENERATION = 1;
 
+// ../../packages/runtime/src/collaboration/schema.ts
+var GRANTS_TABLE = "session_collaboration_grants";
+function ensureCollaborationGrantUniqueness(db, { warn = console.warn } = {}) {
+  const rebuiltDdl = hasColumnUniqueChild(db) ? ddlWithoutColumnUnique(db) : null;
+  if (rebuiltDdl === void 0) {
+    warn(`[collaboration] ${GRANTS_TABLE}: unrecognized child_session_id UNIQUE DDL; keeping one link per peer`);
+  }
+  const apply = () => {
+    if (rebuiltDdl) rebuildTable(db, rebuiltDdl);
+    db.exec(`
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_session_collaboration_spawn_child
+        ON ${GRANTS_TABLE}(child_session_id) WHERE kind = 'spawn';
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_session_collaboration_link_pair
+        ON ${GRANTS_TABLE}(parent_session_id, child_session_id) WHERE kind = 'link';
+    `);
+  };
+  const foreignKeysOn = Boolean(rebuiltDdl) && db.pragma("foreign_keys", { simple: true }) === 1;
+  if (db.inTransaction) {
+    if (foreignKeysOn) {
+      throw new Error(`Rebuilding ${GRANTS_TABLE} inside a transaction requires foreign keys off`);
+    }
+    apply();
+    return;
+  }
+  if (foreignKeysOn) db.pragma("foreign_keys = OFF");
+  try {
+    db.transaction(apply)();
+  } finally {
+    if (foreignKeysOn) db.pragma("foreign_keys = ON");
+  }
+}
+function hasColumnUniqueChild(db) {
+  const indexes = db.prepare(`PRAGMA index_list(${GRANTS_TABLE})`).all();
+  return indexes.some((index) => {
+    if (index.origin !== "u") return false;
+    const columns = db.prepare(`PRAGMA index_info(${JSON.stringify(index.name)})`).all();
+    return columns.length === 1 && columns[0].name === "child_session_id";
+  });
+}
+var REBUILT_TABLE = `${GRANTS_TABLE}_rebuild`;
+function ddlWithoutColumnUnique(db) {
+  const { sql } = db.prepare(`SELECT sql FROM sqlite_master WHERE type = 'table' AND name = ?`).get(GRANTS_TABLE);
+  const withoutUnique = sql.replace(/(\bchild_session_id\s+TEXT)\s+UNIQUE\b/i, "$1");
+  const renamed = withoutUnique.replace(
+    /^CREATE TABLE\s+(?:IF NOT EXISTS\s+)?["`]?session_collaboration_grants["`]?/i,
+    `CREATE TABLE ${REBUILT_TABLE}`
+  );
+  return withoutUnique !== sql && renamed !== withoutUnique ? renamed : void 0;
+}
+function rebuildTable(db, ddl) {
+  const indexes = db.prepare(`
+    SELECT sql FROM sqlite_master WHERE type = 'index' AND tbl_name = ? AND sql IS NOT NULL
+  `).all(GRANTS_TABLE);
+  db.exec(ddl);
+  db.exec(`INSERT INTO ${REBUILT_TABLE} SELECT * FROM ${GRANTS_TABLE}`);
+  db.exec("DROP TABLE session_collaboration_grants");
+  db.exec(`ALTER TABLE ${REBUILT_TABLE} RENAME TO session_collaboration_grants`);
+  for (const index of indexes) db.exec(index.sql);
+}
+
 // ../../packages/runtime/src/db/database.ts
 init_session_provider_definitions();
 init_platform_registry();
@@ -74920,7 +74965,7 @@ CREATE TABLE IF NOT EXISTS session_collaboration_grants (
   credential_secret TEXT,
   credential_hint TEXT NOT NULL,
   parent_session_id TEXT NOT NULL,
-  child_session_id TEXT UNIQUE,
+  child_session_id TEXT,
   agent_id TEXT NOT NULL,
   task TEXT NOT NULL,
   config_json TEXT NOT NULL,
@@ -74962,6 +75007,7 @@ CREATE TABLE IF NOT EXISTS session_collaboration_cursors (
   if (!grantCols.some((c) => c.name === "kind")) {
     db.exec(`ALTER TABLE session_collaboration_grants ADD COLUMN kind TEXT NOT NULL DEFAULT 'spawn'`);
   }
+  ensureCollaborationGrantUniqueness(db);
 }
 function ensureSessionTagsColumn(db) {
   const cols = db.prepare(`PRAGMA table_info(sessions)`).all();
@@ -79999,10 +80045,9 @@ async function handleCollaborationStart(payload, ctx) {
   const denied = requireScopes8(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
   const p3 = asRecord24(payload);
-  const credential = typeof p3.credential === "string" ? p3.credential : void 0;
-  const grantId = typeof p3.grantId === "string" ? p3.grantId : void 0;
-  if (!credential && !grantId) {
-    return { error: { code: "invalid_argument", message: "credential or grantId required" } };
+  const launchId = typeof p3.launchId === "string" ? p3.launchId.trim() : "";
+  if (!launchId) {
+    return { error: { code: "invalid_argument", message: "launchId required" } };
   }
   const callerSessionId = typeof p3.callerSessionId === "string" && p3.callerSessionId.trim() ? p3.callerSessionId.trim() : typeof p3.parentSessionId === "string" && p3.parentSessionId.trim() ? p3.parentSessionId.trim() : "";
   if (!callerSessionId) {
@@ -80030,8 +80075,8 @@ async function handleCollaborationStart(payload, ctx) {
   try {
     return {
       result: await ctx.collaboration.start({
-        credential,
-        grantId,
+        launchId,
+        task: typeof p3.task === "string" ? p3.task : void 0,
         formAnswers: p3.formAnswers && typeof p3.formAnswers === "object" ? p3.formAnswers : void 0,
         callerSessionId,
         controllerClientSessionId: ctx.client.clientSessionId
@@ -80041,36 +80086,39 @@ async function handleCollaborationStart(payload, ctx) {
     return mapThrown8(err);
   }
 }
+function assertMailboxLease(p3, sessionId, ctx) {
+  const leaseId = String(p3.leaseId ?? "").trim();
+  if (!leaseId) return { error: { code: "invalid_argument", message: "leaseId required" } };
+  try {
+    ctx.leases.assertValid({
+      resource: { environmentId: ctx.identity.environmentId, sessionId },
+      leaseId,
+      generation: String(p3.generation ?? ""),
+      holderClientId: ctx.client.clientSessionId
+    });
+    return null;
+  } catch (err) {
+    return mapThrown8(err);
+  }
+}
 function handleCollaborationSend(payload, ctx) {
   const denied = requireScopes8(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
   const p3 = asRecord24(payload);
-  const credential = String(p3.credential ?? "");
   const sessionId = String(p3.sessionId ?? p3.fromSessionId ?? "");
   const content = typeof p3.content === "string" ? p3.content : p3.body !== void 0 ? typeof p3.body === "string" ? p3.body : JSON.stringify(p3.body) : "";
-  if (!credential) {
-    return { error: { code: "invalid_argument", message: "credential required" } };
-  }
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
   }
-  const leaseId = String(p3.leaseId ?? "").trim();
-  if (!leaseId) {
-    return { error: { code: "invalid_argument", message: "leaseId required" } };
-  }
+  const leaseDenied = assertMailboxLease(p3, sessionId, ctx);
+  if (leaseDenied) return leaseDenied;
   try {
-    ctx.leases.assertValid({
-      resource: { environmentId: ctx.identity.environmentId, sessionId },
-      leaseId,
-      generation: String(p3.generation ?? ""),
-      holderClientId: ctx.client.clientSessionId
-    });
     return {
       result: ctx.collaboration.send({
-        credential,
+        sessionId,
+        to: typeof p3.to === "string" ? p3.to : void 0,
         content,
-        clientMessageId: typeof p3.clientMessageId === "string" ? p3.clientMessageId : void 0,
-        sessionId
+        clientMessageId: typeof p3.clientMessageId === "string" ? p3.clientMessageId : void 0
       })
     };
   } catch (err) {
@@ -80078,22 +80126,20 @@ function handleCollaborationSend(payload, ctx) {
   }
 }
 function handleCollaborationRetrieve(payload, ctx) {
-  const denied = requireScopes8(ctx.client, OPERATION_SCOPES.readSession);
+  const denied = requireScopes8(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
   const p3 = asRecord24(payload);
-  const credential = String(p3.credential ?? "");
   const sessionId = String(p3.sessionId ?? "");
-  if (!credential) {
-    return { error: { code: "invalid_argument", message: "credential required" } };
-  }
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
   }
+  const leaseDenied = assertMailboxLease(p3, sessionId, ctx);
+  if (leaseDenied) return leaseDenied;
   try {
     return {
       result: ctx.collaboration.retrieve({
-        credential,
         sessionId,
+        from: Array.isArray(p3.from) ? p3.from.filter((id) => typeof id === "string") : void 0,
         max: typeof p3.max === "number" ? p3.max : void 0
       })
     };
@@ -87037,1187 +87083,1148 @@ var SessionRuntime2 = class extends SessionRuntime {
 init_harness_runners();
 init_codex_turn_runner();
 
-// src/session/collaboration.ts
-init_agent_types();
-init_environment();
-import { createHash as createHash9, randomBytes as randomBytes5, randomUUID as randomUUID11 } from "node:crypto";
-import { existsSync as existsSync39, statSync as statSync15 } from "node:fs";
-import { resolve as pathResolve2 } from "node:path";
-
-// ../../packages/shared/src/acp-brand.ts
-init_acp_brand();
-
-// src/session/collaboration.ts
-init_resolve_service();
-var MAX_MESSAGES_PER_RETRIEVE = 100;
-var EMPTY_MAILBOX_HINT = "No peer has replied yet. Do not retrieve again, do not sleep, do not wait in place \u2014 end your turn or do unrelated work. A task notification will start a new turn for you as soon as a message arrives.";
-function hashCredential(credential) {
-  return createHash9("sha256").update(credential).digest("hex");
-}
-function parseConfig(raw) {
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return {};
+// ../../packages/runtime/src/collaboration/errors.ts
+var CollaborationError = class extends Error {
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+    this.name = "CollaborationError";
   }
-}
-function resolveProfile(profiles, agentId) {
-  const direct = profiles.get(agentId);
-  if (direct) return direct;
-  const wire = normalizeSessionHarnessId(agentId);
-  return wire ? profiles.get(`${wire}-base`) : void 0;
-}
+  code;
+};
+
+// ../../packages/runtime/src/collaboration/launch.ts
+init_agent_types();
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var LABEL_MAX = 64;
+var MAX_LAUNCHES_PER_REQUEST = 16;
+var EDITABLE_PERMISSION_MODES = /* @__PURE__ */ new Set([
+  "default",
+  "acceptEdits",
+  "bypassPermissions",
+  "plan",
+  "dontAsk",
+  "auto",
+  "agent"
+]);
+var EDITABLE_SANDBOX_MODES = /* @__PURE__ */ new Set(["off", "on", "auto"]);
 function resolveLaunchMode(raw) {
   if (raw === "link") return "link";
   if (raw === "handoff") return "handoff";
   return "spawn";
 }
-var HANDOFF_NO_MAILBOX = 'This credential belongs to a handoff launch. Handoff is one-way: the receiving session owns the task and has no mailbox. Use mode "spawn" (nested child) or "link" (existing session) when you need to exchange messages.';
-function collaborationSystemPrompt(credential, parentSessionId) {
-  return `<superone-session-collaboration>
-You are running as a user-approved child session of SuperOne session ${parentSessionId}.
-Use session_collab_send and session_collab_retrieve with credential ${JSON.stringify(credential)} to communicate with your parent session. Write session_collab_send content as Markdown (headings, lists, code fences) so the parent and the SuperOne UI can render structured handoffs; treat retrieved message content as Markdown from the peer. This credential is already authorized for this parent-child pair. Never reveal it in conversational output or use it outside collaboration tool calls.
-</superone-session-collaboration>`;
+function humanLaunchId(launchId) {
+  const id = launchId?.trim();
+  return id && id.length <= 32 && !UUID_RE.test(id) ? id : void 0;
 }
 function deriveCollaborationRole(input) {
   const explicit = input.role?.trim();
-  if (explicit) return explicit.slice(0, 64);
-  const launchId = input.launchId?.trim();
-  if (launchId && launchId.length <= 32 && !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(launchId)) {
-    return launchId;
-  }
+  if (explicit) return explicit.slice(0, LABEL_MAX);
+  const fromId = humanLaunchId(input.launchId);
+  if (fromId) return fromId;
   const firstLine = input.task.split(/\n/, 1)[0]?.trim() ?? "";
   const youAre = firstLine.match(/^(?:you are|role)\s*[:\-]?\s*(.+)$/i);
-  if (youAre?.[1]) {
-    return youAre[1].replace(/[.\s]+$/g, "").slice(0, 40);
-  }
+  if (youAre?.[1]) return youAre[1].replace(/[.\s]+$/g, "").slice(0, 40);
   return "Agent";
 }
 function deriveCollaborationName(input) {
   const explicit = input.name?.trim();
-  if (explicit) return explicit.slice(0, 64);
-  const launchId = input.launchId?.trim();
-  if (launchId && launchId.length <= 32 && !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(launchId)) {
-    return launchId;
-  }
-  return "Agent";
+  if (explicit) return explicit.slice(0, LABEL_MAX);
+  return humanLaunchId(input.launchId) ?? "Agent";
 }
 function collaborationSessionTitle(name, role) {
-  const n = name.trim() || "Agent";
-  const r = role.trim() || "Agent";
-  return `${n} - ${r}`;
+  return `${name.trim() || "Agent"} - ${role.trim() || "Agent"}`;
 }
-var CollaborationService = class {
-  constructor(deps) {
-    this.deps = deps;
+function parseGrantConfig(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return {};
   }
-  deps;
-  /** Agent profiles from session_providers (+ ready-harness fallback). */
-  listProfiles() {
-    const { harnesses, providers, sessions, sessionProviders } = this.deps;
-    const profiles = [];
-    const seen = /* @__PURE__ */ new Set();
-    const providerOptions = {
-      experimentalClaudeOpenAiChatEnabled: this.deps.experimentalClaudeOpenAiChatEnabled?.() ?? false
-    };
-    const pushProfile = (profileId, harnessId, name, description, profileConfig) => {
-      if (seen.has(profileId)) return;
-      if (!harnesses.isSessionHarnessRunnable(harnessId)) return;
-      seen.add(profileId);
-      const harnessModels = listHarnessModels(providers, harnessId, null, providerOptions);
-      const models = harnessModels.map((m3) => ({
-        id: m3.id,
-        name: m3.name || m3.id,
-        ...m3.description ? { description: m3.description } : {},
-        ...m3.serviceTiers?.length ? { serviceTiers: m3.serviceTiers } : {}
-      }));
-      const defaultModel = harnessModels.find((m3) => m3.isDefault) ?? harnessModels[0];
-      const efforts = /* @__PURE__ */ new Set();
-      for (const m3 of harnessModels) {
-        for (const e of m3.supportedEffortLevels ?? []) efforts.add(e);
-      }
-      const cfg = profileConfig && typeof profileConfig === "object" && !Array.isArray(profileConfig) ? profileConfig : {};
-      const cfgModel = typeof cfg.model === "string" && cfg.model.trim() ? cfg.model.trim() : void 0;
-      const cfgEffort = typeof cfg.effort === "string" && cfg.effort.trim() ? cfg.effort.trim() : typeof cfg.reasoningEffort === "string" && cfg.reasoningEffort.trim() ? cfg.reasoningEffort.trim() : void 0;
-      const acpAgentId = harnessId === "acp" && typeof cfg.agentId === "string" && cfg.agentId.trim() ? cfg.agentId.trim() : null;
-      const modelDefault = cfgModel ?? defaultModel?.id;
-      const effortDefault = cfgEffort ?? (efforts.has("high") ? "high" : efforts.has("medium") ? "medium" : efforts.size > 0 ? [...efforts][0] : void 0);
-      profiles.push({
-        id: profileId,
-        name: harnessId === "acp" ? acpAgentDisplayName(acpAgentId) : name,
-        harnessId,
-        ...acpAgentId ? { acpAgentId } : {},
-        brandKey: resolveHarnessBrandKey(harnessId, acpAgentId),
-        description,
-        defaultConfig: {
-          ...modelDefault ? { model: modelDefault } : {},
-          ...effortDefault ? { effort: effortDefault } : {},
-          ...harnessId === "codex" ? { fastMode: typeof cfg.fastMode === "boolean" ? cfg.fastMode : false } : {}
-        },
-        models: models.length > 0 ? models : [{ id: "default", name: "Default" }],
-        efforts: [...efforts],
-        apiProviders: listHarnessApiProviders(providers, harnessId, providerOptions)
-      });
+}
+function invalid2(message) {
+  throw new CollaborationError(message, "invalid_argument");
+}
+function assertLabel(kind, value) {
+  if (value.length > LABEL_MAX) invalid2(`A launch ${kind} may contain at most ${LABEL_MAX} characters`);
+  return value;
+}
+function assertLaunchCount(count) {
+  if (count === 0) invalid2("launches must contain at least one proposed session");
+  if (count > MAX_LAUNCHES_PER_REQUEST) {
+    invalid2(`A single request may contain at most ${MAX_LAUNCHES_PER_REQUEST} launches`);
+  }
+}
+function normalizeLaunchLabels(mode, launch2, linkPeerTitle) {
+  const summary2 = launch2.summary?.trim();
+  if (!summary2) invalid2("Every launch must include a non-empty summary");
+  if (mode === "link") {
+    return {
+      summary: summary2,
+      name: assertLabel("name", launch2.name?.trim() || linkPeerTitle || ""),
+      role: assertLabel("role", launch2.role?.trim() || "Peer")
     };
-    if (sessionProviders) {
-      for (const p3 of sessionProviders.list()) {
-        pushProfile(
-          p3.id,
-          p3.harnessId,
-          p3.name,
-          p3.isBase ? `${p3.harnessId} harness with the built-in configuration` : `Custom ${p3.harnessId} profile`,
-          p3.config
-        );
-      }
-    }
-    if (profiles.length === 0) {
-      const seedIds = new Set(harnesses.readySessionHarnessIds());
-      for (const s4 of sessions.list()) {
-        if (s4.harnessId) seedIds.add(s4.harnessId);
-      }
-      for (const id of seedIds) {
-        const harnessId = normalizeSessionHarnessId(id) ?? id;
-        pushProfile(harnessId, harnessId, harnessId, `${harnessId} harness`);
-      }
-    }
-    return profiles;
   }
-  /**
-   * Request child launches. When `requireUserConfirm` is true (MCP tool path),
-   * emits pendingInteraction kind session_agents_confirm and waits for the
-   * desktop remote UI accept/decline/cancel (+ formAnswers).
-   * RPC path defaults to auto-approve (already-trusted controller).
-   */
-  async request(input) {
-    const parent = this.deps.sessions.get(input.parentSessionId);
-    if (!parent) {
-      throw Object.assign(new Error("Parent session is not available"), { code: "not_found" });
-    }
-    const nested = this.deps.db.prepare(
-      `SELECT 1 FROM session_collaboration_grants
-         WHERE child_session_id = ? AND COALESCE(kind, 'spawn') = 'spawn' LIMIT 1`
-    ).get(input.parentSessionId);
-    if (nested) {
-      throw Object.assign(
-        new Error(
-          "Nested collaboration is not supported. Only top-level (non-collaboration-child) sessions may request agents."
-        ),
-        { code: "failed_precondition" }
+  const name = launch2.name?.trim();
+  if (!name) invalid2(`Every ${mode} launch must include a non-empty name`);
+  const role = launch2.role?.trim();
+  if (!role) invalid2(`Every ${mode} launch must include a non-empty role`);
+  return { summary: summary2, name: assertLabel("name", name), role: assertLabel("role", role) };
+}
+function normalizeStartTask(mode, raw) {
+  const task = typeof raw === "string" ? raw.trim() : "";
+  if (!task && mode !== "link") invalid2(`Starting a ${mode} launch requires a non-empty task`);
+  if (task.length > SESSION_AGENT_TASK_MAX) {
+    invalid2(`A launch task may contain at most ${SESSION_AGENT_TASK_MAX.toLocaleString()} characters`);
+  }
+  return task;
+}
+function patchEditableLaunchConfig(base, rawPatch) {
+  const patch = rawPatch && typeof rawPatch === "object" ? rawPatch : {};
+  return {
+    ...base,
+    ...typeof patch.model === "string" && patch.model.trim() ? { model: patch.model.trim() } : {},
+    ...typeof patch.effort === "string" && patch.effort.trim() ? { effort: patch.effort.trim() } : {},
+    ...typeof patch.fastMode === "boolean" ? { fastMode: patch.fastMode } : {},
+    ...patch.apiProviderId === null || typeof patch.apiProviderId === "string" ? { apiProviderId: patch.apiProviderId } : {},
+    ...typeof patch.permissionMode === "string" && EDITABLE_PERMISSION_MODES.has(patch.permissionMode) ? { permissionMode: patch.permissionMode } : {},
+    ...typeof patch.sandboxMode === "string" && EDITABLE_SANDBOX_MODES.has(patch.sandboxMode) ? { sandboxMode: patch.sandboxMode } : {}
+  };
+}
+function mergeConfirmedLaunches(proposed, content) {
+  const packed = content?.[SESSION_AGENT_LAUNCHES_FIELD];
+  if (typeof packed !== "string") return proposed;
+  let edited;
+  try {
+    edited = JSON.parse(packed);
+  } catch {
+    invalid2("The confirmed launch configuration is invalid");
+  }
+  if (!Array.isArray(edited)) invalid2("The confirmed launch configuration is invalid");
+  if (edited.length !== proposed.length) {
+    invalid2("The confirmed request must contain the same launches that were proposed");
+  }
+  const proposedById = new Map(proposed.map((launch2) => [launch2.launchId, launch2]));
+  const seen = /* @__PURE__ */ new Set();
+  return edited.map((raw) => {
+    if (!raw || typeof raw !== "object") invalid2("The confirmed launch configuration is invalid");
+    const item = raw;
+    const launchId = typeof item.launchId === "string" ? item.launchId : "";
+    const base = proposedById.get(launchId);
+    if (!base) invalid2(`Unknown launchId in confirmed configuration: ${launchId || "(missing)"}`);
+    if (seen.has(launchId)) invalid2("Confirmed launches must have unique launchIds");
+    seen.add(launchId);
+    if (base.mode === "link") return { ...base, config: { ...base.config } };
+    return {
+      ...base,
+      // A tampered mode could turn a supervised child into a one-way handoff.
+      mode: base.mode ?? "spawn",
+      config: patchEditableLaunchConfig(base.config, item.config)
+    };
+  });
+}
+
+// ../../packages/runtime/src/collaboration/text.ts
+var HANDOFF_NO_MAILBOX = 'That session was created by a one-way handoff: it owns the task and has no mailbox, so neither side can message the other. Use mode "spawn" (nested child) or "link" (existing session) when you need to exchange messages.';
+var EMPTY_MAILBOX_HINT = "No peer has replied yet. Do not retrieve again, do not sleep, do not wait in place \u2014 end your turn or do unrelated work. A task notification will start a new turn for you as soon as a message arrives.";
+var NO_PEERS_HINT = "You have no collaboration peers. Launch or link one with session_collab_request, then session_collab_start.";
+var NESTED_COLLABORATION_UNSUPPORTED = "Nested collaboration is not supported. Only top-level (non-collaboration-child) sessions may request agents.";
+function collaborationSystemPrompt(parentSessionId) {
+  return `<superone-session-collaboration>
+You are running as a user-approved child session of SuperOne session ${parentSessionId}.
+Your parent is your default collaboration peer: session_collab_send without \`to\` messages it, and session_collab_retrieve reads its messages. Sessions the user links to you later are peers too; reply to them with \`to\` set to their session id. Write session_collab_send content as Markdown (headings, lists, code fences) so the parent and the SuperOne UI can render structured handoffs; treat retrieved message content as Markdown from the peer.
+</superone-session-collaboration>`;
+}
+function sessionLabel(sessionId, title) {
+  return `SuperOne session ${sessionId} ("${title}")`;
+}
+function mailboxWakeText(from) {
+  return `A collaboration mailbox message is ready. It is from ${sessionLabel(from.sessionId, from.title)}. Call session_collab_retrieve to receive it, then act on it and end your turn \u2014 you will be woken again the same way for every later message, so never wait in place for one.`;
+}
+function linkActivationWakeText(input) {
+  return `A user-approved collaboration link is active with ${sessionLabel(input.initiatorSessionId, input.initiatorTitle)}. Call session_collab_retrieve` + (input.hasOpening ? " to read the opening message" : " if a mailbox message is waiting") + `, then reply with session_collab_send({ to: ${JSON.stringify(input.initiatorSessionId)} }). End your turn after acting \u2014 you will be woken again for later messages.`;
+}
+function handoffTaskContent(input) {
+  const title = input.parentTitle || input.parentSessionId.slice(0, 8);
+  return `> Handed off from SuperOne session \`${input.parentSessionId}\` ("${title}"). This is a one-way handoff: you own this task now and cannot message that session back. Read its context with session_read({ sessionId }) if you need it.
+
+` + input.task;
+}
+
+// ../../packages/runtime/src/collaboration/mailbox.ts
+var MAX_MAILBOX_CONTENT = 1e5;
+var MAX_MESSAGES_PER_RETRIEVE = 100;
+function describeLaunchedPeer(grant) {
+  const config2 = parseGrantConfig(grant.config_json);
+  const name = deriveCollaborationName({ name: config2.name });
+  const role = deriveCollaborationRole({ role: config2.role, task: grant.task });
+  return { name, role, title: collaborationSessionTitle(name, role), agentId: grant.agent_id, config: config2 };
+}
+function describePeerForCaller(grant, callerSessionId, sessionTitle2) {
+  const relation = grant.kind === "link" ? "link" : callerSessionId === grant.child_session_id ? "parent" : "child";
+  if (callerSessionId === grant.child_session_id) {
+    const title = sessionTitle2(grant.parent_session_id)?.trim() || grant.parent_session_id.slice(0, 8);
+    return {
+      sessionId: grant.parent_session_id,
+      name: relation === "parent" ? "Parent" : title,
+      role: relation === "parent" ? "" : "Peer",
+      title,
+      relation
+    };
+  }
+  const child = describeLaunchedPeer(grant);
+  return {
+    sessionId: grant.child_session_id ?? "",
+    name: child.name,
+    role: child.role,
+    title: child.title,
+    relation
+  };
+}
+function listMailboxChannels(store, callerSessionId, sessionTitle2) {
+  return store.channelsFor(callerSessionId).map((grant) => ({
+    grant,
+    peer: describePeerForCaller(grant, callerSessionId, sessionTitle2)
+  }));
+}
+function peersOf(channels) {
+  return [...new Map(channels.map((channel) => [channel.peer.sessionId, channel.peer])).values()];
+}
+function assertNotPeeredElsewhere(store, callerSessionId, peerSessionId) {
+  const other = store.channelsFor(callerSessionId).find((grant) => (grant.parent_session_id === peerSessionId || grant.child_session_id === peerSessionId) && !(grant.kind === "link" && grant.parent_session_id === callerSessionId));
+  if (other) {
+    throw new CollaborationError(
+      `Session ${peerSessionId} is already one of your collaboration peers; message it with session_collab_send({ to: ${JSON.stringify(peerSessionId)} }).`,
+      "failed_precondition"
+    );
+  }
+}
+function formatPeers(peers) {
+  return peers.map((peer) => `${peer.sessionId} ("${peer.title}", ${peer.relation})`).join("; ");
+}
+function resolveSendChannel(store, callerSessionId, to2, sessionTitle2) {
+  const channels = listMailboxChannels(store, callerSessionId, sessionTitle2);
+  const peers = peersOf(channels);
+  const target = to2?.trim();
+  if (!target) {
+    if (peers.length === 0) throw new CollaborationError(NO_PEERS_HINT, "failed_precondition");
+    const parent = channels.find((channel) => channel.peer.relation === "parent");
+    if (parent) return parent;
+    if (peers.length > 1) {
+      throw new CollaborationError(
+        `You have several collaboration peers; pass \`to\` with one of their session ids: ${formatPeers(peers)}`,
+        "invalid_argument"
       );
     }
-    const launches = input.launches;
-    if (!Array.isArray(launches) || launches.length === 0) {
-      throw Object.assign(new Error("launches must contain at least one proposed session"), {
-        code: "invalid_argument"
-      });
-    }
-    if (launches.length > 16) {
-      throw Object.assign(new Error("A single request may contain at most 16 launches"), {
-        code: "invalid_argument"
-      });
+    return channels[channels.length - 1];
+  }
+  const matches = channels.filter((channel) => channel.peer.sessionId === target);
+  if (matches.length > 0) return matches[matches.length - 1];
+  if (store.isHandoffPair(callerSessionId, target)) {
+    throw new CollaborationError(HANDOFF_NO_MAILBOX, "failed_precondition");
+  }
+  throw new CollaborationError(
+    `Session ${target} is not one of your collaboration peers. ` + (peers.length > 0 ? `Your peers: ${formatPeers(peers)}` : NO_PEERS_HINT),
+    "forbidden"
+  );
+}
+function normalizeMailboxContent(raw) {
+  const content = typeof raw === "string" ? raw.trim() : "";
+  if (!content) throw new CollaborationError("content must not be empty", "invalid_argument");
+  if (content.length > MAX_MAILBOX_CONTENT) {
+    throw new CollaborationError("content may contain at most 100,000 characters", "invalid_argument");
+  }
+  return content;
+}
+function readCallerMailbox(store, callerSessionId, options, sessionTitle2) {
+  const channels = listMailboxChannels(store, callerSessionId, sessionTitle2);
+  const peers = peersOf(channels);
+  const from = options.from?.map((id) => id.trim()).filter(Boolean) ?? [];
+  if (from.length > 0) {
+    const known = new Set(peers.map((peer) => peer.sessionId));
+    const unknown2 = from.filter((id) => !known.has(id));
+    if (unknown2.length > 0) {
+      throw new CollaborationError(
+        `Not your collaboration peers: ${unknown2.join(", ")}. ` + (peers.length > 0 ? `Your peers: ${formatPeers(peers)}` : NO_PEERS_HINT),
+        "forbidden"
+      );
     }
-    const profileList = this.listProfiles();
-    const profiles = new Map(profileList.map((p3) => [p3.id, p3]));
-    const normalized = launches.map((launch2) => {
-      const mode = resolveLaunchMode(launch2.mode);
-      const launchId = launch2.launchId?.trim() || randomUUID11();
-      if (mode === "link") {
-        const peerSessionId = launch2.sessionId?.trim();
-        if (!peerSessionId) {
-          throw Object.assign(
-            new Error("Link launches require sessionId of an existing SuperOne session"),
-            { code: "invalid_argument" }
-          );
-        }
-        if (peerSessionId === input.parentSessionId) {
-          throw Object.assign(new Error("Cannot link a session to itself"), {
-            code: "invalid_argument"
-          });
-        }
-        const peer = this.deps.sessions.get(peerSessionId);
-        if (!peer) {
-          throw Object.assign(new Error(`Unknown sessionId for link: ${peerSessionId}`), {
-            code: "not_found"
-          });
-        }
-        const summary3 = launch2.summary?.trim() || resolveLaunchSummary(launch2.task ?? "", launch2.summary);
-        if (!summary3) {
-          throw Object.assign(new Error("Every launch must include a non-empty summary"), {
-            code: "invalid_argument"
-          });
-        }
-        const task2 = (launch2.task ?? "").trim();
-        if (task2.length > SESSION_AGENT_TASK_MAX) {
-          throw Object.assign(
-            new Error(`A launch task may contain at most ${SESSION_AGENT_TASK_MAX.toLocaleString()} characters`),
-            { code: "invalid_argument" }
-          );
-        }
-        const peerTitle = peer.title?.trim() || peerSessionId.slice(0, 8);
-        const name2 = launch2.name?.trim() || peerTitle;
-        const role2 = launch2.role?.trim() || "Peer";
-        const projectPath = this.deps.projects.get(peer.projectId)?.path;
-        return {
+  }
+  const selected = from.length > 0 ? channels.filter((channel) => from.includes(channel.peer.sessionId)) : channels;
+  if (selected.length === 0) return { messages: [], peers };
+  const limit = Math.min(MAX_MESSAGES_PER_RETRIEVE, Math.max(1, Math.floor(options.limit ?? MAX_MESSAGES_PER_RETRIEVE)));
+  const peerByGrant = new Map(selected.map((channel) => [channel.grant.grant_id, channel.peer]));
+  const perGrantLimit = Math.max(1, Math.floor(limit / selected.length));
+  const messages = store.readMailbox(callerSessionId, [...peerByGrant.keys()], perGrantLimit).flatMap(({ grantId, rows }) => rows.map((row) => ({
+    messageId: row.id,
+    sequence: row.sequence,
+    fromSessionId: row.sender_session_id,
+    from: peerByGrant.get(grantId),
+    content: row.content,
+    createdAt: row.created_at
+  }))).sort((a, b3) => a.createdAt.localeCompare(b3.createdAt)).slice(0, limit);
+  return { messages, peers };
+}
+
+// ../../packages/runtime/src/collaboration/start.ts
+var START_APPROVED_LAUNCHES_HINT = "Start each launch with session_collab_start({ launchId, task }); task is the full Markdown brief (optional for link, where it becomes the opening message).";
+function recordApprovedLaunch(store, parentSessionId, launch2, config2) {
+  const mode = resolveLaunchMode(launch2.mode);
+  const { launchId, summary: summary2, name, role } = launch2;
+  const title = collaborationSessionTitle(name, role);
+  if (mode === "link") {
+    const peerSessionId = launch2.sessionId?.trim();
+    if (!peerSessionId) throw new CollaborationError("Link launches require sessionId", "invalid_argument");
+    const existing = store.findLinkGrant(parentSessionId, peerSessionId);
+    if (existing) {
+      const existingConfig = { ...parseGrantConfig(existing.config_json), launchId };
+      store.updateConfig(existing.grant_id, existingConfig);
+      return {
+        grantId: existing.grant_id,
+        approved: {
           launchId,
-          mode: "link",
-          agentId: "",
+          mode,
+          agentId: existing.agent_id,
           sessionId: peerSessionId,
-          peerTitle,
-          peerProjectPath: projectPath,
-          summary: summary3,
-          task: task2,
-          name: name2,
-          role: role2,
-          config: { name: name2, role: role2, summary: summary3 }
-        };
-      }
-      const agentId = launch2.agentId?.trim();
-      if (!agentId) {
-        throw Object.assign(
-          new Error(`${mode} launches require agentId from session_collab_list_agents`),
-          { code: "invalid_argument" }
-        );
-      }
-      const profile = resolveProfile(profiles, agentId);
-      if (!profile) {
-        throw Object.assign(new Error(`Unknown agent profile: ${agentId}`), {
-          code: "invalid_argument"
-        });
-      }
-      const task = launch2.task?.trim();
-      if (!task) {
-        throw Object.assign(new Error("Every spawn launch must include a non-empty task"), {
-          code: "invalid_argument"
-        });
-      }
-      if (task.length > SESSION_AGENT_TASK_MAX) {
-        throw Object.assign(
-          new Error(`A launch task may contain at most ${SESSION_AGENT_TASK_MAX.toLocaleString()} characters`),
-          { code: "invalid_argument" }
-        );
-      }
-      const summary2 = resolveLaunchSummary(task, launch2.summary);
-      if (!summary2) {
-        throw Object.assign(new Error("Every launch must include a non-empty summary"), {
-          code: "invalid_argument"
-        });
-      }
-      const name = launch2.name?.trim();
-      if (!name) {
-        throw Object.assign(new Error(`Every ${mode} launch must include a non-empty name`), {
-          code: "invalid_argument"
-        });
-      }
-      const role = launch2.role?.trim();
-      if (!role) {
-        throw Object.assign(new Error(`Every ${mode} launch must include a non-empty role`), {
-          code: "invalid_argument"
-        });
-      }
-      const raw = launch2.config && typeof launch2.config === "object" ? launch2.config : {};
-      const safeFromLaunch = {};
-      if (typeof raw.model === "string" && raw.model.trim()) safeFromLaunch.model = raw.model.trim();
-      if (typeof raw.effort === "string" && raw.effort.trim()) safeFromLaunch.effort = raw.effort.trim();
-      if (raw.apiProviderId === null) safeFromLaunch.apiProviderId = null;
-      else if (typeof raw.apiProviderId === "string" && raw.apiProviderId.trim()) {
-        safeFromLaunch.apiProviderId = raw.apiProviderId.trim();
-      }
-      if (raw.worktree && typeof raw.worktree === "object") safeFromLaunch.worktree = raw.worktree;
-      if (typeof raw.worktreePath === "string" && raw.worktreePath.trim()) {
-        safeFromLaunch.worktreePath = raw.worktreePath.trim();
-      }
-      if (typeof raw.cwd === "string" && raw.cwd.trim()) safeFromLaunch.cwd = raw.cwd.trim();
-      return {
-        launchId,
-        mode,
-        agentId,
-        summary: summary2,
-        task,
-        name,
-        role,
-        config: {
-          ...profile.defaultConfig,
-          ...safeFromLaunch,
-          permissionMode: "default",
-          sandboxMode: "off",
-          cwd: typeof safeFromLaunch.cwd === "string" ? safeFromLaunch.cwd : parent.cwd ?? this.deps.projects.get(parent.projectId)?.path,
+          summary: summary2,
           name,
-          role
-        }
-      };
-    });
-    const launchIds = new Set(normalized.map((l) => l.launchId));
-    if (launchIds.size !== normalized.length) {
-      throw Object.assign(new Error("Every confirmed launch must have a unique launchId"), {
-        code: "invalid_argument"
-      });
-    }
-    let confirmed = normalized;
-    if (input.requireUserConfirm) {
-      const outcome = await this.deps.sessions.requestAgentsConfirm({
-        sessionId: input.parentSessionId,
-        launches: normalized,
-        profiles: profileList,
-        signal: input.signal
-      });
-      if (outcome.action === "cancel") {
-        return { status: "cancelled" };
-      }
-      if (outcome.action === "decline") {
-        return { status: "rejected", feedback: outcome.content?.feedback };
-      }
-      confirmed = this.mergeConfirmedLaunches(normalized, outcome.content);
-    }
-    const insertChild = this.deps.db.prepare(`
-      INSERT INTO session_collaboration_grants
-        (credential_hash, credential_secret, credential_hint, parent_session_id, agent_id, task, config_json, created_at, kind)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `);
-    const insertLink = this.deps.db.prepare(`
-      INSERT INTO session_collaboration_grants
-        (credential_hash, credential_secret, credential_hint, parent_session_id, child_session_id, agent_id, task, config_json, created_at, kind)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'link')
-    `);
-    const results = this.deps.db.transaction(
-      () => confirmed.map((launch2) => {
-        const mode = resolveLaunchMode(launch2.mode);
-        if (mode === "link") {
-          const peerSessionId = launch2.sessionId;
-          const existing = this.deps.db.prepare(
-            `SELECT credential_hash, credential_secret, agent_id, task, config_json
-               FROM session_collaboration_grants
-               WHERE parent_session_id = ? AND child_session_id = ? AND kind = 'link'`
-          ).get(input.parentSessionId, peerSessionId);
-          if (existing?.credential_secret) {
-            const credential3 = this.deps.secrets.decrypt(existing.credential_secret);
-            if (credential3) {
-              return {
-                launchId: launch2.launchId,
-                mode: "link",
-                agentId: existing.agent_id,
-                sessionId: peerSessionId,
-                peerSessionId,
-                summary: launch2.summary,
-                task: existing.task,
-                name: launch2.name,
-                role: launch2.role,
-                title: collaborationSessionTitle(launch2.name, launch2.role),
-                config: parseConfig(existing.config_json),
-                credential: credential3,
-                grantId: existing.credential_hash,
-                reused: true
-              };
-            }
-          }
-          const credential2 = `s1sc_${randomBytes5(32).toString("base64url")}`;
-          const credentialHash2 = hashCredential(credential2);
-          const task = launch2.task.trim();
-          const config3 = {
-            name: launch2.name,
-            role: launch2.role,
-            summary: launch2.summary,
-            peerSessionId,
-            peerTitle: launch2.peerTitle,
-            peerProjectPath: launch2.peerProjectPath
-          };
-          try {
-            insertLink.run(
-              credentialHash2,
-              this.deps.secrets.encrypt(credential2),
-              credential2.slice(-8),
-              input.parentSessionId,
-              peerSessionId,
-              "",
-              task,
-              JSON.stringify(config3),
-              (/* @__PURE__ */ new Date()).toISOString()
-            );
-          } catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            if (/UNIQUE|unique/i.test(message)) {
-              throw Object.assign(
-                new Error(
-                  `Session ${peerSessionId} is already bound as a collaboration endpoint (spawn child or link peer). A session cannot be the non-initiator endpoint of two grants.`
-                ),
-                { code: "failed_precondition" }
-              );
-            }
-            throw err;
-          }
-          this.deps.events.append({
-            aggregateType: "session",
-            aggregateId: input.parentSessionId,
-            eventType: "collaboration.grant_created",
-            payload: {
-              grantId: credentialHash2,
-              mode: "link",
-              peerSessionId,
-              launchId: launch2.launchId
-            }
-          });
-          return {
-            launchId: launch2.launchId,
-            mode: "link",
-            agentId: "",
-            sessionId: peerSessionId,
-            peerSessionId,
-            summary: launch2.summary,
-            task,
-            name: launch2.name,
-            role: launch2.role,
-            title: collaborationSessionTitle(launch2.name, launch2.role),
-            config: config3,
-            credential: credential2,
-            grantId: credentialHash2,
-            reused: false
-          };
-        }
-        const credential = `s1sc_${randomBytes5(32).toString("base64url")}`;
-        const credentialHash = hashCredential(credential);
-        const config2 = {
-          ...launch2.config,
-          name: launch2.name,
-          role: launch2.role,
-          summary: launch2.summary
-        };
-        insertChild.run(
-          credentialHash,
-          this.deps.secrets.encrypt(credential),
-          credential.slice(-8),
-          input.parentSessionId,
-          launch2.agentId,
-          launch2.task,
-          JSON.stringify(config2),
-          (/* @__PURE__ */ new Date()).toISOString(),
-          mode
-        );
-        this.deps.events.append({
-          aggregateType: "session",
-          aggregateId: input.parentSessionId,
-          eventType: "collaboration.grant_created",
-          payload: {
-            grantId: credentialHash,
-            mode,
-            agentId: launch2.agentId,
-            launchId: launch2.launchId
-          }
-        });
-        return {
-          launchId: launch2.launchId,
-          mode,
-          agentId: launch2.agentId,
-          summary: launch2.summary,
-          task: launch2.task,
-          name: launch2.name,
-          role: launch2.role,
-          title: collaborationSessionTitle(launch2.name, launch2.role),
-          config: config2,
-          credential,
-          grantId: credentialHash,
-          reused: false
-        };
-      })
-    )();
-    return { status: "approved", launches: results };
-  }
-  async start(input) {
-    let grant = this.resolveGrant(input.credential, input.grantId);
-    if (!grant) {
-      throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
-    }
-    const hasBearer = typeof input.credential === "string" && input.credential.trim().length > 0;
-    if (!hasBearer) {
-      if (!input.callerSessionId || input.callerSessionId !== grant.parent_session_id) {
-        throw Object.assign(
-          new Error("grantId start requires callerSessionId matching the parent session"),
-          { code: "forbidden" }
-        );
-      }
-    } else if (input.callerSessionId && grant.parent_session_id !== input.callerSessionId) {
-      throw Object.assign(new Error("Only the parent session may start this credential"), {
-        code: "forbidden"
-      });
-    }
-    const credential = input.credential ?? (grant.credential_secret ? this.deps.secrets.decrypt(grant.credential_secret) : "");
-    if (!credential) {
-      throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
-    }
-    if (grant.kind !== "link" && input.formAnswers && typeof input.formAnswers === "object") {
-      grant = this.applyFormAnswers(grant, input.formAnswers);
-    }
-    if (grant.kind === "link") {
-      if (!grant.child_session_id) {
-        throw Object.assign(new Error("Link grant is missing peer session id"), {
-          code: "failed_precondition"
-        });
-      }
-      const peerSessionId = grant.child_session_id;
-      if (!this.deps.sessions.get(peerSessionId)) {
-        throw Object.assign(new Error(`Peer session no longer exists: ${peerSessionId}`), {
-          code: "not_found"
-        });
-      }
-      const alreadyStarted = Boolean(grant.started_at);
-      if (!alreadyStarted) {
-        this.deps.db.prepare(
-          `UPDATE session_collaboration_grants SET started_at = ?
-             WHERE credential_hash = ? AND started_at IS NULL`
-        ).run((/* @__PURE__ */ new Date()).toISOString(), grant.credential_hash);
-      }
-      const opening = grant.task?.trim() ?? "";
-      const initiator = this.deps.sessions.get(grant.parent_session_id);
-      const initiatorTitle = initiator?.title?.trim() || grant.parent_session_id.slice(0, 8);
-      if (!alreadyStarted && opening) {
-        await this.deliverLinkOpening(grant, credential, initiatorTitle);
-      } else {
-        void this.wakeLinkPeer(peerSessionId, credential, grant.parent_session_id, initiatorTitle, false);
-        if (!alreadyStarted) {
-          this.deps.db.prepare(`UPDATE session_collaboration_grants SET task_sent = 1 WHERE credential_hash = ?`).run(grant.credential_hash);
+          role,
+          title,
+          config: existingConfig,
+          reused: true
         }
-      }
-      const peer = this.describePeer(grant);
-      return {
-        status: "linked",
-        mode: "link",
-        sessionId: peerSessionId,
-        peerSessionId,
-        reused: alreadyStarted,
-        name: peer.name,
-        role: peer.role,
-        title: peer.title,
-        config: peer.config,
-        credential,
-        grantId: grant.credential_hash
-      };
-    }
-    const isHandoff = grant.kind === "handoff";
-    const existingHandoffSessionId = isHandoff ? parseConfig(grant.config_json).handoffSessionId : void 0;
-    if (existingHandoffSessionId) {
-      if (!this.deps.sessions.get(existingHandoffSessionId)) {
-        throw Object.assign(
-          new Error(`The handoff session no longer exists: ${existingHandoffSessionId}`),
-          { code: "not_found" }
-        );
-      }
-      await this.deliverInitialTask(grant, existingHandoffSessionId);
-      const peer = this.describePeer(grant);
-      return {
-        status: "started",
-        mode: "handoff",
-        sessionId: existingHandoffSessionId,
-        reused: true,
-        name: peer.name,
-        role: peer.role,
-        title: peer.title,
-        config: peer.config,
-        credential,
-        grantId: grant.credential_hash
       };
     }
-    if (grant.child_session_id) {
-      const existing = this.deps.sessions.get(grant.child_session_id);
-      if (existing) {
-        this.deps.sessions.setSystemPromptAppend(
-          existing.sessionId,
-          collaborationSystemPrompt(credential, grant.parent_session_id)
-        );
-        await this.deliverInitialTask(grant, existing.sessionId);
-      }
-      const peer = this.describePeer(grant);
-      return {
-        status: "started",
-        mode: "spawn",
-        sessionId: grant.child_session_id,
-        reused: true,
-        name: peer.name,
-        role: peer.role,
-        title: peer.title,
-        config: peer.config,
-        credential,
-        grantId: grant.credential_hash
-      };
-    }
-    const parent = this.deps.sessions.get(grant.parent_session_id);
-    if (!parent) {
-      throw Object.assign(new Error("Parent session is not available"), { code: "not_found" });
-    }
-    const config2 = parseConfig(grant.config_json);
-    let cwd = this.resolveCwd(config2, parent.projectId, parent.cwd);
-    if (config2.worktreePath && typeof config2.worktreePath === "string" && config2.worktreePath.trim()) {
-      cwd = pathResolve2(config2.worktreePath.trim());
-    } else if (config2.worktree?.enabled) {
-      const wt2 = this.deps.workspaceGit.activateWorktree(parent.projectId, {
-        baseBranch: config2.worktree.baseBranch || "HEAD",
-        mode: config2.worktree.mode ?? "branch",
-        branchName: config2.worktree.branchName,
-        carryLocalChanges: config2.worktree.carryLocalChanges
-      });
-      cwd = wt2.path;
-    }
-    const profile = resolveProfile(
-      new Map(this.listProfiles().map((p3) => [p3.id, p3])),
-      grant.agent_id
-    );
-    const harnessId = profile?.harnessId ?? normalizeSessionHarnessId(grant.agent_id) ?? "claude";
-    const displayName = deriveCollaborationName({ name: config2.name });
-    const role = deriveCollaborationRole({ role: config2.role, task: grant.task });
-    const title = collaborationSessionTitle(displayName, role);
-    let child;
-    try {
-      child = this.deps.sessions.create({
-        projectId: parent.projectId,
-        harnessId,
-        providerId: grant.agent_id,
-        title,
-        cwd,
-        model: config2.model ?? null,
-        effort: config2.effort ?? null,
-        permissionMode: config2.permissionMode ?? null,
-        sandboxMode: config2.sandboxMode ?? null,
-        apiProviderId: config2.apiProviderId ?? null,
-        controllerClientSessionId: input.controllerClientSessionId ?? parent.controllerClientSessionId,
-        // Handoff is one-way by construction: never hand the receiver a credential.
-        ...isHandoff ? {} : { systemPromptAppend: collaborationSystemPrompt(credential, grant.parent_session_id) }
-      });
-      const updated = isHandoff ? this.deps.db.prepare(
-        `UPDATE session_collaboration_grants
-             SET config_json = ?, started_at = ?
-             WHERE credential_hash = ? AND started_at IS NULL`
-      ).run(
-        JSON.stringify({ ...config2, handoffSessionId: child.sessionId }),
-        (/* @__PURE__ */ new Date()).toISOString(),
-        grant.credential_hash
-      ) : this.deps.db.prepare(
-        `UPDATE session_collaboration_grants
-             SET child_session_id = ?, started_at = ?
-             WHERE credential_hash = ? AND child_session_id IS NULL`
-      ).run(child.sessionId, (/* @__PURE__ */ new Date()).toISOString(), grant.credential_hash);
-      if (updated.changes !== 1) {
-        throw Object.assign(new Error("Credential was already consumed"), {
-          code: "failed_precondition"
-        });
-      }
-    } catch (err) {
-      if (child?.sessionId) {
-        try {
-          this.deps.sessions.remove(child.sessionId);
-        } catch {
-        }
-      }
-      throw err;
-    }
-    grant = isHandoff ? grant : { ...grant, child_session_id: child.sessionId };
-    await this.deliverInitialTask(grant, child.sessionId);
-    this.deps.events.append({
-      aggregateType: "session",
-      aggregateId: grant.parent_session_id,
-      eventType: isHandoff ? "collaboration.handoff_started" : "collaboration.child_started",
-      payload: {
-        grantId: grant.credential_hash,
-        childSessionId: child.sessionId
-      }
+    const linkConfig = {
+      launchId,
+      name,
+      role,
+      summary: summary2,
+      peerSessionId,
+      peerTitle: launch2.peerTitle,
+      peerProjectPath: launch2.peerProjectPath
+    };
+    const grantId2 = store.createGrant({
+      kind: "link",
+      parentSessionId,
+      childSessionId: peerSessionId,
+      agentId: "",
+      config: linkConfig
     });
     return {
-      status: "started",
-      mode: grant.kind,
-      sessionId: child.sessionId,
-      reused: false,
-      name: displayName,
-      role,
-      title,
-      config: {
-        model: config2.model,
-        effort: config2.effort,
-        fastMode: config2.fastMode,
-        permissionMode: config2.permissionMode,
-        sandboxMode: config2.sandboxMode,
-        cwd,
-        apiProviderId: config2.apiProviderId ?? null,
-        name: displayName,
+      grantId: grantId2,
+      approved: {
+        launchId,
+        mode,
+        agentId: "",
+        sessionId: peerSessionId,
+        summary: summary2,
+        name,
         role,
-        ...config2.worktree ? { worktree: config2.worktree } : {},
-        ...config2.worktreePath ? { worktreePath: config2.worktreePath } : {}
-      },
-      credential,
-      grantId: grant.credential_hash
-    };
-  }
-  send(input) {
-    const grant = this.grantForCredential(input.credential);
-    if (!grant) {
-      throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
-    }
-    this.assertEndpoint(grant, input.sessionId);
-    if (!grant.child_session_id) {
-      throw Object.assign(
-        new Error(
-          grant.kind === "link" ? "The linked peer session is missing" : "The child session has not been started"
-        ),
-        { code: "failed_precondition" }
-      );
-    }
-    if (grant.kind === "link" && !grant.started_at) {
-      throw Object.assign(new Error("The collaboration link has not been started"), {
-        code: "failed_precondition"
-      });
-    }
-    const recipientSessionId = input.sessionId === grant.parent_session_id ? grant.child_session_id : grant.parent_session_id;
-    const content = input.content?.trim();
-    if (!content) {
-      throw Object.assign(new Error("content must not be empty"), { code: "invalid_argument" });
-    }
-    if (content.length > 1e5) {
-      throw Object.assign(new Error("content may contain at most 100,000 characters"), {
-        code: "invalid_argument"
-      });
-    }
-    const insert = this.deps.db.transaction(() => {
-      if (input.clientMessageId) {
-        const existing = this.deps.db.prepare(
-          `SELECT * FROM session_collaboration_messages
-             WHERE credential_hash = ? AND sender_session_id = ? AND client_message_id = ?`
-        ).get(grant.credential_hash, input.sessionId, input.clientMessageId);
-        if (existing) return { row: existing, reused: true };
+        title,
+        config: linkConfig,
+        reused: false
       }
-      const sequence = this.nextSequence(grant.credential_hash);
-      const row = {
-        id: randomUUID11(),
-        credential_hash: grant.credential_hash,
-        sequence,
-        sender_session_id: input.sessionId,
-        recipient_session_id: recipientSessionId,
-        client_message_id: input.clientMessageId ?? null,
-        content,
-        created_at: (/* @__PURE__ */ new Date()).toISOString(),
-        delivered_at: null
-      };
-      this.deps.db.prepare(
-        `INSERT INTO session_collaboration_messages
-            (id, credential_hash, sequence, sender_session_id, recipient_session_id, client_message_id, content, created_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
-      ).run(
-        row.id,
-        row.credential_hash,
-        row.sequence,
-        row.sender_session_id,
-        row.recipient_session_id,
-        row.client_message_id,
-        row.content,
-        row.created_at
-      );
-      return { row, reused: false };
-    })();
-    if (!insert.reused) {
-      this.deps.events.append({
-        aggregateType: "session",
-        aggregateId: input.sessionId,
-        eventType: "collaboration.message",
-        payload: {
-          messageId: insert.row.id,
-          grantId: grant.credential_hash,
-          toSessionId: recipientSessionId,
-          sequence: insert.row.sequence
-        }
-      });
-      void this.wakePeer(recipientSessionId, input.credential);
-    }
-    return {
-      status: "sent",
-      messageId: insert.row.id,
-      sequence: insert.row.sequence,
-      reused: insert.reused,
-      peerSessionId: recipientSessionId
     };
   }
-  retrieve(input) {
-    const credentials = [
-      ...typeof input.credential === "string" && input.credential.trim() ? [input.credential.trim()] : [],
-      ...Array.isArray(input.credentials) ? input.credentials.filter((c) => typeof c === "string" && c.trim().length > 0) : []
-    ];
-    if (credentials.length === 0) {
-      throw Object.assign(new Error("credentials required"), { code: "invalid_argument" });
+  const grantConfig = { ...config2, launchId, name, role, summary: summary2 };
+  const grantId = store.createGrant({ kind: mode, parentSessionId, agentId: launch2.agentId, config: grantConfig });
+  return {
+    grantId,
+    approved: {
+      launchId,
+      mode,
+      agentId: launch2.agentId,
+      summary: summary2,
+      name,
+      role,
+      title,
+      config: grantConfig,
+      reused: false
     }
-    const max = Math.min(
-      MAX_MESSAGES_PER_RETRIEVE,
-      Math.max(1, typeof input.max === "number" && Number.isFinite(input.max) ? Math.floor(input.max) : MAX_MESSAGES_PER_RETRIEVE)
+  };
+}
+function prepareLaunchStart(store, callerSessionId, input) {
+  const launchId = typeof input.launchId === "string" ? input.launchId.trim() : "";
+  if (!launchId) throw new CollaborationError("launchId is required", "invalid_argument");
+  const grant = store.grantForLaunch(callerSessionId, launchId);
+  if (!grant) {
+    throw new CollaborationError(
+      `No approved launch "${launchId}" in this session. Pass a launchId returned by session_collab_request.`,
+      "not_found"
     );
-    const all = [];
-    for (const credential of credentials) {
-      const grant = this.grantForCredential(credential);
-      if (!grant) {
-        throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
-      }
-      this.assertEndpoint(grant, input.sessionId);
-      const messages = this.deps.db.transaction(() => {
-        const cursor = this.deps.db.prepare(
-          `SELECT last_sequence FROM session_collaboration_cursors
-             WHERE credential_hash = ? AND session_id = ?`
-        ).get(grant.credential_hash, input.sessionId);
-        const rows = this.deps.db.prepare(
-          `SELECT * FROM session_collaboration_messages
-             WHERE credential_hash = ? AND recipient_session_id = ? AND sequence > ?
-             ORDER BY sequence LIMIT ?`
-        ).all(
-          grant.credential_hash,
-          input.sessionId,
-          cursor?.last_sequence ?? 0,
-          max
-        );
-        if (rows.length === 0) return [];
-        const lastSequence = rows[rows.length - 1].sequence;
-        const now = (/* @__PURE__ */ new Date()).toISOString();
-        this.deps.db.prepare(
-          `INSERT INTO session_collaboration_cursors (credential_hash, session_id, last_sequence)
-             VALUES (?, ?, ?)
-             ON CONFLICT(credential_hash, session_id) DO UPDATE SET last_sequence = excluded.last_sequence`
-        ).run(grant.credential_hash, input.sessionId, lastSequence);
-        this.deps.db.prepare(
-          `UPDATE session_collaboration_messages SET delivered_at = COALESCE(delivered_at, ?)
-             WHERE credential_hash = ? AND recipient_session_id = ? AND sequence <= ?`
-        ).run(now, grant.credential_hash, input.sessionId, lastSequence);
-        return rows;
-      })();
-      for (const row of messages) {
-        all.push({
-          messageId: row.id,
-          sequence: row.sequence,
-          fromSessionId: row.sender_session_id,
-          content: row.content,
-          createdAt: row.created_at,
-          ...credentials.length > 1 ? { credential } : {}
-        });
-      }
-    }
-    if (all.length === 0) {
-      return { status: "empty", messages: [], hint: EMPTY_MAILBOX_HINT };
-    }
-    return { status: "messages", messages: all };
   }
-  /** Reconstruct system-prompt append for spawn children after restart (never link). */
-  rehydrateSystemPrompts() {
-    const rows = this.deps.db.prepare(
-      `SELECT credential_secret, parent_session_id, child_session_id
-         FROM session_collaboration_grants
-         WHERE child_session_id IS NOT NULL
-           AND credential_secret IS NOT NULL
-           AND COALESCE(kind, 'spawn') = 'spawn'`
-    ).all();
-    for (const row of rows) {
-      const credential = this.deps.secrets.decrypt(row.credential_secret);
-      if (!credential) continue;
-      if (!this.deps.sessions.get(row.child_session_id)) continue;
-      this.deps.sessions.setSystemPromptAppend(
-        row.child_session_id,
-        collaborationSystemPrompt(credential, row.parent_session_id)
-      );
-    }
+  if (grant.task_sent === 1 || grant.task) return grant;
+  const task = normalizeStartTask(grant.kind, input.task);
+  if (!task) return grant;
+  store.setTask(grant.grant_id, task);
+  return { ...grant, task };
+}
+
+// ../../packages/runtime/src/collaboration/store.ts
+import { randomUUID as randomUUID11 } from "node:crypto";
+var GRANT_COLUMNS = `credential_hash AS grant_id, parent_session_id, child_session_id,
+  agent_id, task, config_json, task_sent, COALESCE(kind, 'spawn') AS kind, started_at`;
+var MESSAGE_COLUMNS = `id, sequence, sender_session_id, recipient_session_id, client_message_id, content, created_at`;
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+var CollaborationStore = class {
+  constructor(db) {
+    this.db = db;
   }
-  // --- internals -----------------------------------------------------------
-  resolveGrant(credential, grantId) {
-    if (credential && credential.trim()) return this.grantForCredential(credential.trim());
-    if (grantId && grantId.trim()) {
-      return this.deps.db.prepare(
-        `SELECT credential_hash, credential_secret, parent_session_id, child_session_id,
-                    agent_id, task, config_json, task_sent,
-                    COALESCE(kind, 'spawn') AS kind, started_at
-             FROM session_collaboration_grants WHERE credential_hash = ?`
-      ).get(grantId.trim()) ?? null;
-    }
-    return null;
+  db;
+  transaction(fn) {
+    return this.db.transaction(fn)();
   }
-  grantForCredential(credential) {
-    return this.deps.db.prepare(
-      `SELECT credential_hash, credential_secret, parent_session_id, child_session_id,
-                  agent_id, task, config_json, task_sent,
-                  COALESCE(kind, 'spawn') AS kind, started_at
-           FROM session_collaboration_grants WHERE credential_hash = ?`
-    ).get(hashCredential(credential)) ?? null;
-  }
-  async deliverLinkOpening(grant, credential, initiatorTitle) {
-    if (grant.task_sent === 1 || !grant.child_session_id) return;
-    const content = grant.task.trim();
-    if (!content) {
-      this.deps.db.prepare(`UPDATE session_collaboration_grants SET task_sent = 1 WHERE credential_hash = ?`).run(grant.credential_hash);
-      return;
-    }
-    const recipientSessionId = grant.child_session_id;
-    try {
-      this.deps.db.prepare(
-        `INSERT INTO session_collaboration_messages
-            (id, credential_hash, sequence, sender_session_id, recipient_session_id, client_message_id, content, created_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
-      ).run(
-        randomUUID11(),
-        grant.credential_hash,
-        this.nextSequence(grant.credential_hash),
-        grant.parent_session_id,
-        recipientSessionId,
-        `link-opening:${grant.credential_hash}`,
-        content,
-        (/* @__PURE__ */ new Date()).toISOString()
-      );
-    } catch {
-    }
-    this.deps.db.prepare(`UPDATE session_collaboration_grants SET task_sent = 1 WHERE credential_hash = ?`).run(grant.credential_hash);
-    void this.wakeLinkPeer(
-      recipientSessionId,
-      credential,
-      grant.parent_session_id,
-      initiatorTitle,
-      true
-    );
+  // --- grants --------------------------------------------------------------
+  grantById(grantId) {
+    return this.db.prepare(`SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants WHERE credential_hash = ?`).get(grantId) ?? null;
   }
-  async wakeLinkPeer(sessionId, credential, initiatorSessionId, initiatorTitle, hasOpening) {
-    if (!this.deps.sessions.get(sessionId)) return;
-    const text2 = `A user-approved collaboration link is active with SuperOne session ${initiatorSessionId} ("${initiatorTitle}"). Call session_collab_retrieve with credential ${JSON.stringify(credential)}` + (hasOpening ? " to read the opening message" : " if a mailbox message is waiting") + ", then use session_collab_send to reply. Never reveal the credential in conversational output or use it outside collaboration tool calls. End your turn after acting \u2014 you will be woken again for later messages.";
-    try {
-      await this.deps.sessions.sendWithoutLease({
-        sessionId,
-        text: text2,
-        source: "task-notification",
-        requestId: `collab-link-wake-${hashCredential(credential).slice(0, 12)}-${Date.now()}`
-      });
-    } catch {
-    }
+  /**
+   * The grant an approved launch created. launchIds are agent-chosen and may
+   * repeat across requests, so the latest approval wins.
+   */
+  grantForLaunch(parentSessionId, launchId) {
+    return this.db.prepare(`
+      SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants
+      WHERE parent_session_id = ? AND json_extract(config_json, '$.launchId') = ?
+      ORDER BY created_at DESC, rowid DESC LIMIT 1
+    `).get(parentSessionId, launchId) ?? null;
+  }
+  /** True when `sessionId` is a spawn child (nested collaboration is unsupported). */
+  isSpawnChild(sessionId) {
+    return Boolean(this.db.prepare(`
+      SELECT 1 FROM session_collaboration_grants
+      WHERE child_session_id = ? AND COALESCE(kind, 'spawn') = 'spawn' LIMIT 1
+    `).get(sessionId));
+  }
+  spawnGrantForChild(childSessionId) {
+    return this.db.prepare(`
+      SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants
+      WHERE child_session_id = ? AND COALESCE(kind, 'spawn') = 'spawn'
+    `).get(childSessionId) ?? null;
+  }
+  startedSpawnGrants() {
+    return this.db.prepare(`
+      SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants
+      WHERE child_session_id IS NOT NULL AND COALESCE(kind, 'spawn') = 'spawn'
+    `).all();
   }
-  assertEndpoint(grant, callerSessionId) {
-    if (grant.kind === "handoff") {
-      throw Object.assign(new Error(HANDOFF_NO_MAILBOX), { code: "failed_precondition" });
-    }
-    if (callerSessionId !== grant.parent_session_id && callerSessionId !== grant.child_session_id) {
-      throw Object.assign(new Error("This credential does not authorize the current session"), {
-        code: "forbidden"
-      });
+  /**
+   * Open mailbox channels of `sessionId`: spawn grants with a bound child and
+   * started link grants, oldest first. Handoff grants are never channels.
+   */
+  channelsFor(sessionId) {
+    return this.db.prepare(`
+      SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants
+      WHERE (parent_session_id = ? OR child_session_id = ?)
+        AND child_session_id IS NOT NULL
+        AND (COALESCE(kind, 'spawn') = 'spawn' OR (kind = 'link' AND started_at IS NOT NULL))
+      ORDER BY created_at, rowid
+    `).all(sessionId, sessionId);
+  }
+  /** True when one of the two sessions was created by a handoff from the other. */
+  isHandoffPair(a, b3) {
+    return Boolean(this.db.prepare(`
+      SELECT 1 FROM session_collaboration_grants
+      WHERE kind = 'handoff' AND (
+        (parent_session_id = ? AND json_extract(config_json, '$.handoffSessionId') = ?)
+        OR (parent_session_id = ? AND json_extract(config_json, '$.handoffSessionId') = ?)
+      ) LIMIT 1
+    `).get(a, b3, b3, a));
+  }
+  findLinkGrant(initiatorSessionId, peerSessionId) {
+    return this.db.prepare(`
+      SELECT ${GRANT_COLUMNS} FROM session_collaboration_grants
+      WHERE parent_session_id = ? AND child_session_id = ? AND kind = 'link'
+    `).get(initiatorSessionId, peerSessionId) ?? null;
+  }
+  /**
+   * Persist an approved launch. Link grants bind the peer at once; spawn and
+   * handoff grants bind their session on start. The brief arrives on start.
+   */
+  createGrant(input) {
+    const grantId = randomUUID11();
+    try {
+      this.db.prepare(`
+        INSERT INTO session_collaboration_grants
+          (credential_hash, credential_secret, credential_hint, parent_session_id, child_session_id,
+           agent_id, task, config_json, created_at, kind)
+        VALUES (?, NULL, '', ?, ?, ?, '', ?, ?, ?)
+      `).run(
+        grantId,
+        input.parentSessionId,
+        input.childSessionId ?? null,
+        input.agentId,
+        JSON.stringify(input.config),
+        nowIso(),
+        input.kind
+      );
+    } catch (error51) {
+      const message = error51 instanceof Error ? error51.message : String(error51);
+      if (input.childSessionId && /UNIQUE|unique/i.test(message)) {
+        throw new CollaborationError(
+          `Session ${input.parentSessionId} already has a link to ${input.childSessionId}; request it again to reuse it.`,
+          "failed_precondition"
+        );
+      }
+      throw error51;
     }
+    return grantId;
   }
-  nextSequence(credentialHash) {
-    const row = this.deps.db.prepare(
-      `SELECT COALESCE(MAX(sequence), 0) + 1 AS next_sequence
-         FROM session_collaboration_messages WHERE credential_hash = ?`
-    ).get(credentialHash);
-    return row.next_sequence;
+  updateConfig(grantId, config2) {
+    this.db.prepare("UPDATE session_collaboration_grants SET config_json = ? WHERE credential_hash = ?").run(JSON.stringify(config2), grantId);
   }
-  describePeer(grant) {
-    const config2 = parseConfig(grant.config_json);
-    const name = deriveCollaborationName({ name: config2.name });
-    const role = deriveCollaborationRole({ role: config2.role, task: grant.task });
-    return {
-      name,
-      role,
-      title: collaborationSessionTitle(name, role),
-      config: config2
-    };
+  /** Record the brief of a grant whose task has not been delivered yet. */
+  setTask(grantId, task) {
+    this.db.prepare("UPDATE session_collaboration_grants SET task = ? WHERE credential_hash = ? AND task_sent = 0").run(task, grantId);
   }
-  resolveCwd(config2, projectId, parentCwd) {
-    const project = this.deps.projects.get(projectId);
-    const fallback = parentCwd || project?.path || process.cwd();
-    const cwd = pathResolve2(config2.cwd || fallback);
-    if (!existsSync39(cwd) || !statSync15(cwd).isDirectory()) {
-      throw Object.assign(new Error(`Working directory does not exist: ${cwd}`), {
-        code: "invalid_argument"
-      });
-    }
-    return cwd;
+  markTaskSent(grantId) {
+    this.db.prepare("UPDATE session_collaboration_grants SET task_sent = 1 WHERE credential_hash = ?").run(grantId);
   }
-  applyFormAnswers(grant, formAnswers) {
-    const packed = formAnswers[SESSION_AGENT_LAUNCHES_FIELD] ?? formAnswers.sessionAgentLaunchesJson;
-    if (typeof packed !== "string") return grant;
-    let edited;
-    try {
-      edited = JSON.parse(packed);
-    } catch {
-      return grant;
-    }
-    if (!Array.isArray(edited) || edited.length === 0) return grant;
-    const item = edited[0];
-    if (!item?.config || typeof item.config !== "object") return grant;
-    const base = parseConfig(grant.config_json);
-    const patch = item.config;
-    const next = {
-      ...base,
-      ...typeof patch.model === "string" && patch.model.trim() ? { model: patch.model.trim() } : {},
-      ...typeof patch.effort === "string" && patch.effort.trim() ? { effort: patch.effort.trim() } : {},
-      ...typeof patch.fastMode === "boolean" ? { fastMode: patch.fastMode } : {},
-      ...typeof patch.permissionMode === "string" ? { permissionMode: patch.permissionMode } : {},
-      ...typeof patch.sandboxMode === "string" ? { sandboxMode: patch.sandboxMode } : {},
-      ...patch.apiProviderId === null || typeof patch.apiProviderId === "string" ? { apiProviderId: patch.apiProviderId } : {}
-    };
-    this.deps.db.prepare(`UPDATE session_collaboration_grants SET config_json = ? WHERE credential_hash = ?`).run(JSON.stringify(next), grant.credential_hash);
-    return { ...grant, config_json: JSON.stringify(next) };
+  /** Link start. Returns false when the grant had already been started. */
+  markStarted(grantId) {
+    return this.db.prepare(`
+      UPDATE session_collaboration_grants SET started_at = ? WHERE credential_hash = ? AND started_at IS NULL
+    `).run(nowIso(), grantId).changes === 1;
   }
   /**
-   * Apply multi-launch form edits from desktop SessionAgentsConfirmPrompt.
-   * Only editable fields (model/effort/permission/sandbox/apiProvider) may change.
+   * Record the session a spawn/handoff start created. Throws when a concurrent
+   * start already consumed the grant.
+   *
+   * A handoff session is deliberately *not* written to child_session_id: that
+   * column holds channel endpoints (spawn children, link peers), and a handoff
+   * sibling is neither. The created id lives in config_json instead.
    */
-  mergeConfirmedLaunches(proposed, content) {
-    const packed = content?.[SESSION_AGENT_LAUNCHES_FIELD];
-    if (typeof packed !== "string") return proposed;
-    let edited;
-    try {
-      edited = JSON.parse(packed);
-    } catch {
-      throw Object.assign(new Error("The confirmed launch configuration is invalid"), {
-        code: "invalid_argument"
-      });
-    }
-    if (!Array.isArray(edited)) {
-      throw Object.assign(new Error("The confirmed launch configuration is invalid"), {
-        code: "invalid_argument"
-      });
-    }
-    if (edited.length !== proposed.length) {
-      throw Object.assign(
-        new Error("The confirmed request must contain the same launches that were proposed"),
-        { code: "invalid_argument" }
-      );
-    }
-    const proposedById = new Map(proposed.map((l) => [l.launchId, l]));
-    const seen = /* @__PURE__ */ new Set();
-    return edited.map((raw) => {
-      if (!raw || typeof raw !== "object") {
-        throw Object.assign(new Error("The confirmed launch configuration is invalid"), {
-          code: "invalid_argument"
-        });
-      }
-      const item = raw;
-      const launchId = typeof item.launchId === "string" ? item.launchId : "";
-      const base = proposedById.get(launchId);
-      if (!base) {
-        throw Object.assign(
-          new Error(`Unknown launchId in confirmed configuration: ${launchId || "(missing)"}`),
-          { code: "invalid_argument" }
-        );
+  bindStartedSession(grant, sessionId, config2) {
+    const changes = grant.kind === "handoff" ? this.db.prepare(`
+          UPDATE session_collaboration_grants SET config_json = ?, started_at = ?
+          WHERE credential_hash = ? AND started_at IS NULL
+        `).run(JSON.stringify({ ...config2, handoffSessionId: sessionId }), nowIso(), grant.grant_id).changes : this.db.prepare(`
+          UPDATE session_collaboration_grants SET child_session_id = ?, started_at = ?
+          WHERE credential_hash = ? AND child_session_id IS NULL
+        `).run(sessionId, nowIso(), grant.grant_id).changes;
+    if (changes !== 1) throw new CollaborationError("This launch was already started", "failed_precondition");
+  }
+  // --- mailbox -------------------------------------------------------------
+  nextSequence(grantId) {
+    const row = this.db.prepare(`
+      SELECT COALESCE(MAX(sequence), 0) + 1 AS next_sequence
+      FROM session_collaboration_messages WHERE credential_hash = ?
+    `).get(grantId);
+    return row.next_sequence;
+  }
+  insertMessage(grantId, input) {
+    const row = {
+      id: randomUUID11(),
+      sequence: this.nextSequence(grantId),
+      sender_session_id: input.senderSessionId,
+      recipient_session_id: input.recipientSessionId,
+      client_message_id: input.clientMessageId,
+      content: input.content,
+      created_at: nowIso()
+    };
+    this.db.prepare(`
+      INSERT INTO session_collaboration_messages
+        (id, credential_hash, sequence, sender_session_id, recipient_session_id, client_message_id, content, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(
+      row.id,
+      grantId,
+      row.sequence,
+      row.sender_session_id,
+      row.recipient_session_id,
+      row.client_message_id,
+      row.content,
+      row.created_at
+    );
+    return row;
+  }
+  /** Append one message; a repeated `clientMessageId` returns the stored row. */
+  appendMessage(input) {
+    return this.transaction(() => {
+      if (input.clientMessageId) {
+        const existing = this.db.prepare(`
+          SELECT ${MESSAGE_COLUMNS} FROM session_collaboration_messages
+          WHERE credential_hash = ? AND sender_session_id = ? AND client_message_id = ?
+        `).get(input.grantId, input.senderSessionId, input.clientMessageId);
+        if (existing) return { row: existing, reused: true };
       }
-      if (seen.has(launchId)) {
-        throw Object.assign(new Error("Confirmed launches must have unique launchIds"), {
-          code: "invalid_argument"
+      const row = this.insertMessage(input.grantId, { ...input, clientMessageId: input.clientMessageId ?? null });
+      return { row, reused: false };
+    });
+  }
+  /** Queue a link grant's opening body for the peer exactly once, then mark the task sent. */
+  appendLinkOpening(grant, recipientSessionId, content) {
+    this.transaction(() => {
+      try {
+        this.insertMessage(grant.grant_id, {
+          senderSessionId: grant.parent_session_id,
+          recipientSessionId,
+          clientMessageId: `link-opening:${grant.grant_id}`,
+          content
         });
+      } catch {
       }
-      seen.add(launchId);
-      if (base.mode === "link") {
-        return {
-          ...base,
-          mode: "link",
-          sessionId: base.sessionId,
-          peerTitle: base.peerTitle,
-          peerProjectPath: base.peerProjectPath,
-          config: { ...base.config }
-        };
-      }
-      const patch = item.config && typeof item.config === "object" ? item.config : {};
-      return {
-        ...base,
-        // Mode comes from the server-side proposal, never from renderer formAnswers.
-        mode: base.mode ?? "spawn",
-        config: {
-          ...base.config,
-          ...typeof patch.model === "string" && patch.model.trim() ? { model: patch.model.trim() } : {},
-          ...typeof patch.effort === "string" && patch.effort.trim() ? { effort: patch.effort.trim() } : {},
-          ...typeof patch.fastMode === "boolean" ? { fastMode: patch.fastMode } : {},
-          ...typeof patch.permissionMode === "string" ? { permissionMode: patch.permissionMode } : {},
-          ...typeof patch.sandboxMode === "string" ? { sandboxMode: patch.sandboxMode } : {},
-          ...patch.apiProviderId === null || typeof patch.apiProviderId === "string" ? { apiProviderId: patch.apiProviderId } : {}
-        }
-      };
+      this.markTaskSent(grant.grant_id);
     });
   }
   /**
-   * Opening body for the receiving session. A handoff has no credential and no
-   * mailbox, so this line is the receiver's only way to trace where the work came from.
+   * Drain unread messages addressed to `sessionId` across grants, advancing this
+   * endpoint's cursor. Batches keep the order of `grantIds`.
    */
-  initialTaskContent(grant) {
-    if (grant.kind !== "handoff") return grant.task;
-    const initiator = this.deps.sessions.get(grant.parent_session_id);
-    const title = initiator?.title?.trim() || grant.parent_session_id.slice(0, 8);
-    return `> Handed off from SuperOne session \`${grant.parent_session_id}\` ("${title}"). This is a one-way handoff: you own this task now and cannot message that session back. Read its context with session_read({ sessionId }) if you need it.
+  readMailbox(sessionId, grantIds, limitPerGrant) {
+    return this.transaction(() => grantIds.flatMap((grantId) => {
+      const cursor = this.db.prepare(`
+        SELECT last_sequence FROM session_collaboration_cursors WHERE credential_hash = ? AND session_id = ?
+      `).get(grantId, sessionId);
+      const rows = this.db.prepare(`
+        SELECT ${MESSAGE_COLUMNS} FROM session_collaboration_messages
+        WHERE credential_hash = ? AND recipient_session_id = ? AND sequence > ?
+        ORDER BY sequence LIMIT ?
+      `).all(grantId, sessionId, cursor?.last_sequence ?? 0, limitPerGrant);
+      if (rows.length === 0) return [];
+      const lastSequence = rows[rows.length - 1].sequence;
+      this.db.prepare(`
+        INSERT INTO session_collaboration_cursors (credential_hash, session_id, last_sequence)
+        VALUES (?, ?, ?)
+        ON CONFLICT(credential_hash, session_id) DO UPDATE SET last_sequence = excluded.last_sequence
+      `).run(grantId, sessionId, lastSequence);
+      this.db.prepare(`
+        UPDATE session_collaboration_messages SET delivered_at = COALESCE(delivered_at, ?)
+        WHERE credential_hash = ? AND recipient_session_id = ? AND sequence <= ?
+      `).run(nowIso(), grantId, sessionId, lastSequence);
+      return [{ grantId, rows }];
+    }));
+  }
+};
 
-` + grant.task;
+// src/session/collaboration-messaging.ts
+function sessionTitle(ctx) {
+  return (sessionId) => ctx.deps.sessions.get(sessionId)?.title ?? null;
+}
+async function wakePeer(ctx, sessionId, fromSessionId) {
+  if (!ctx.deps.sessions.get(sessionId)) return;
+  const fromTitle = ctx.deps.sessions.get(fromSessionId)?.title?.trim() || fromSessionId.slice(0, 8);
+  try {
+    await ctx.deps.sessions.sendWithoutLease({
+      sessionId,
+      text: mailboxWakeText({ sessionId: fromSessionId, title: fromTitle }),
+      source: "task-notification",
+      requestId: `collab-wake-${fromSessionId.slice(0, 8)}-${Date.now()}`
+    });
+  } catch {
   }
-  async deliverInitialTask(grant, childSessionId) {
-    if (grant.task_sent === 1) return;
-    const config2 = parseConfig(grant.config_json);
-    try {
-      await this.deps.sessions.sendWithoutLease({
-        sessionId: childSessionId,
-        text: this.initialTaskContent(grant),
-        model: config2.model,
-        effort: config2.effort,
-        permissionMode: config2.permissionMode,
-        sandboxMode: config2.sandboxMode,
-        apiProviderId: config2.apiProviderId,
-        requestId: `collaboration-task-${grant.credential_hash.slice(0, 16)}`
-      });
-    } catch {
+}
+function sendCollaborationMessage(ctx, input) {
+  const channel = resolveSendChannel(ctx.store, input.sessionId, input.to, sessionTitle(ctx));
+  const content = normalizeMailboxContent(input.content);
+  const recipientSessionId = channel.peer.sessionId;
+  const insert = ctx.store.appendMessage({
+    grantId: channel.grant.grant_id,
+    senderSessionId: input.sessionId,
+    recipientSessionId,
+    clientMessageId: input.clientMessageId,
+    content
+  });
+  if (!insert.reused) {
+    ctx.deps.events.append({
+      aggregateType: "session",
+      aggregateId: input.sessionId,
+      eventType: "collaboration.message",
+      payload: {
+        messageId: insert.row.id,
+        grantId: channel.grant.grant_id,
+        toSessionId: recipientSessionId,
+        sequence: insert.row.sequence
+      }
+    });
+    void wakePeer(ctx, recipientSessionId, input.sessionId);
+  }
+  return {
+    status: "sent",
+    messageId: insert.row.id,
+    sequence: insert.row.sequence,
+    reused: insert.reused,
+    to: channel.peer,
+    peerSessionId: recipientSessionId
+  };
+}
+function retrieveCollaborationMessages(ctx, input) {
+  const { messages, peers } = readCallerMailbox(
+    ctx.store,
+    input.sessionId,
+    { from: input.from, limit: input.max },
+    sessionTitle(ctx)
+  );
+  if (messages.length > 0) return { status: "messages", messages, peers };
+  return { status: "empty", messages: [], peers, hint: peers.length > 0 ? EMPTY_MAILBOX_HINT : NO_PEERS_HINT };
+}
+
+// src/session/collaboration-profiles.ts
+init_environment();
+
+// ../../packages/shared/src/acp-brand.ts
+init_acp_brand();
+
+// src/session/collaboration-profiles.ts
+init_resolve_service();
+function listCollaborationProfiles(deps) {
+  const { harnesses, providers, sessions, sessionProviders } = deps;
+  const profiles = [];
+  const seen = /* @__PURE__ */ new Set();
+  const providerOptions = {
+    experimentalClaudeOpenAiChatEnabled: deps.experimentalClaudeOpenAiChatEnabled?.() ?? false
+  };
+  const pushProfile = (profileId, harnessId, name, description, profileConfig) => {
+    if (seen.has(profileId)) return;
+    if (!harnesses.isSessionHarnessRunnable(harnessId)) return;
+    seen.add(profileId);
+    const harnessModels = listHarnessModels(providers, harnessId, null, providerOptions);
+    const models = harnessModels.map((m3) => ({
+      id: m3.id,
+      name: m3.name || m3.id,
+      ...m3.description ? { description: m3.description } : {},
+      ...m3.serviceTiers?.length ? { serviceTiers: m3.serviceTiers } : {}
+    }));
+    const defaultModel = harnessModels.find((m3) => m3.isDefault) ?? harnessModels[0];
+    const efforts = /* @__PURE__ */ new Set();
+    for (const m3 of harnessModels) {
+      for (const e of m3.supportedEffortLevels ?? []) efforts.add(e);
+    }
+    const cfg = profileConfig && typeof profileConfig === "object" && !Array.isArray(profileConfig) ? profileConfig : {};
+    const cfgModel = typeof cfg.model === "string" && cfg.model.trim() ? cfg.model.trim() : void 0;
+    const cfgEffort = typeof cfg.effort === "string" && cfg.effort.trim() ? cfg.effort.trim() : typeof cfg.reasoningEffort === "string" && cfg.reasoningEffort.trim() ? cfg.reasoningEffort.trim() : void 0;
+    const acpAgentId = harnessId === "acp" && typeof cfg.agentId === "string" && cfg.agentId.trim() ? cfg.agentId.trim() : null;
+    const modelDefault = cfgModel ?? defaultModel?.id;
+    const effortDefault = cfgEffort ?? (efforts.has("high") ? "high" : efforts.has("medium") ? "medium" : efforts.size > 0 ? [...efforts][0] : void 0);
+    profiles.push({
+      id: profileId,
+      name: harnessId === "acp" ? acpAgentDisplayName(acpAgentId) : name,
+      harnessId,
+      ...acpAgentId ? { acpAgentId } : {},
+      brandKey: resolveHarnessBrandKey(harnessId, acpAgentId),
+      description,
+      defaultConfig: {
+        ...modelDefault ? { model: modelDefault } : {},
+        ...effortDefault ? { effort: effortDefault } : {},
+        ...harnessId === "codex" ? { fastMode: typeof cfg.fastMode === "boolean" ? cfg.fastMode : false } : {}
+      },
+      models: models.length > 0 ? models : [{ id: "default", name: "Default" }],
+      efforts: [...efforts],
+      apiProviders: listHarnessApiProviders(providers, harnessId, providerOptions)
+    });
+  };
+  if (sessionProviders) {
+    for (const p3 of sessionProviders.list()) {
+      pushProfile(
+        p3.id,
+        p3.harnessId,
+        p3.name,
+        p3.isBase ? `${p3.harnessId} harness with the built-in configuration` : `Custom ${p3.harnessId} profile`,
+        p3.config
+      );
     }
-    this.deps.db.prepare(`UPDATE session_collaboration_grants SET task_sent = 1 WHERE credential_hash = ?`).run(grant.credential_hash);
   }
-  async wakePeer(sessionId, credential) {
-    if (!this.deps.sessions.get(sessionId)) return;
-    try {
-      await this.deps.sessions.sendWithoutLease({
-        sessionId,
-        text: `A collaboration mailbox message is ready. Call session_collab_retrieve with credential ${JSON.stringify(credential)} to receive it, then act on it and end your turn \u2014 you will be woken again the same way for every later message, so never wait in place for one.`,
-        source: "task-notification",
-        requestId: `collab-wake-${hashCredential(credential).slice(0, 12)}-${Date.now()}`
-      });
-    } catch {
+  if (profiles.length === 0) {
+    const seedIds = new Set(harnesses.readySessionHarnessIds());
+    for (const s4 of sessions.list()) {
+      if (s4.harnessId) seedIds.add(s4.harnessId);
+    }
+    for (const id of seedIds) {
+      const harnessId = normalizeSessionHarnessId(id) ?? id;
+      pushProfile(harnessId, harnessId, harnessId, `${harnessId} harness`);
     }
   }
-};
+  return profiles;
+}
 
-// src/provider/secret-crypto.ts
-import { existsSync as existsSync40, mkdirSync as mkdirSync23, readFileSync as readFileSync20, writeFileSync as writeFileSync18, chmodSync as chmodSync2 } from "node:fs";
-import { dirname as dirname18 } from "node:path";
-import { createCipheriv, createDecipheriv, randomBytes as randomBytes6 } from "node:crypto";
-var ENC_PREFIX2 = "enc:v1:";
-var KEY_BYTES = 32;
-function isEncryptedSecret(value) {
-  return typeof value === "string" && value.startsWith(ENC_PREFIX2);
+// src/session/collaboration-request.ts
+import { randomUUID as randomUUID12 } from "node:crypto";
+
+// src/session/collaboration-context.ts
+init_environment();
+function resolveProfile(profiles, agentId) {
+  const direct = profiles.get(agentId);
+  if (direct) return direct;
+  const wire = normalizeSessionHarnessId(agentId);
+  return wire ? profiles.get(`${wire}-base`) : void 0;
 }
-function ensureKeyFile(keyPath) {
-  if (existsSync40(keyPath)) {
-    const raw = readFileSync20(keyPath);
-    if (raw.length === KEY_BYTES) return raw;
+function initiatorTitleOf(ctx, grant) {
+  return ctx.deps.sessions.get(grant.parent_session_id)?.title?.trim() || grant.parent_session_id.slice(0, 8);
+}
+
+// src/session/collaboration-request.ts
+function safeLaunchConfig(raw) {
+  const config2 = raw && typeof raw === "object" ? raw : {};
+  const safe = {};
+  if (typeof config2.model === "string" && config2.model.trim()) safe.model = config2.model.trim();
+  if (typeof config2.effort === "string" && config2.effort.trim()) safe.effort = config2.effort.trim();
+  if (config2.apiProviderId === null) safe.apiProviderId = null;
+  else if (typeof config2.apiProviderId === "string" && config2.apiProviderId.trim()) {
+    safe.apiProviderId = config2.apiProviderId.trim();
+  }
+  if (config2.worktree && typeof config2.worktree === "object") safe.worktree = config2.worktree;
+  if (typeof config2.worktreePath === "string" && config2.worktreePath.trim()) {
+    safe.worktreePath = config2.worktreePath.trim();
+  }
+  if (typeof config2.cwd === "string" && config2.cwd.trim()) safe.cwd = config2.cwd.trim();
+  return safe;
+}
+function normalizeLaunches(ctx, input, profileList) {
+  const parent = ctx.deps.sessions.get(input.parentSessionId);
+  const profiles = new Map(profileList.map((p3) => [p3.id, p3]));
+  return input.launches.map((launch2) => {
+    const mode = resolveLaunchMode(launch2.mode);
+    const launchId = launch2.launchId?.trim() || randomUUID12();
+    if (mode === "link") {
+      const peerSessionId = launch2.sessionId?.trim();
+      if (!peerSessionId) {
+        throw new CollaborationError("Link launches require sessionId of an existing SuperOne session", "invalid_argument");
+      }
+      if (peerSessionId === input.parentSessionId) {
+        throw new CollaborationError("Cannot link a session to itself", "invalid_argument");
+      }
+      const peer = ctx.deps.sessions.get(peerSessionId);
+      if (!peer) throw new CollaborationError(`Unknown sessionId for link: ${peerSessionId}`, "not_found");
+      assertNotPeeredElsewhere(ctx.store, input.parentSessionId, peerSessionId);
+      const peerTitle = peer.title?.trim() || peerSessionId.slice(0, 8);
+      const { summary: summary3, name: name2, role: role2 } = normalizeLaunchLabels("link", launch2, peerTitle);
+      return {
+        launchId,
+        mode: "link",
+        agentId: "",
+        sessionId: peerSessionId,
+        peerTitle,
+        peerProjectPath: ctx.deps.projects.get(peer.projectId)?.path,
+        summary: summary3,
+        name: name2,
+        role: role2,
+        config: { name: name2, role: role2, summary: summary3 }
+      };
+    }
+    const agentId = launch2.agentId?.trim();
+    if (!agentId) {
+      throw new CollaborationError(`${mode} launches require agentId from session_collab_list_agents`, "invalid_argument");
+    }
+    const profile = resolveProfile(profiles, agentId);
+    if (!profile) throw new CollaborationError(`Unknown agent profile: ${agentId}`, "invalid_argument");
+    const { summary: summary2, name, role } = normalizeLaunchLabels(mode, launch2);
+    const safe = safeLaunchConfig(launch2.config);
+    return {
+      launchId,
+      mode,
+      agentId,
+      summary: summary2,
+      name,
+      role,
+      config: {
+        ...profile.defaultConfig,
+        ...safe,
+        permissionMode: "default",
+        sandboxMode: "off",
+        cwd: safe.cwd ?? (parent.cwd ?? ctx.deps.projects.get(parent.projectId)?.path),
+        name,
+        role
+      }
+    };
+  });
+}
+function createGrant(ctx, parentSessionId, launch2) {
+  const { grantId, approved } = recordApprovedLaunch(ctx.store, parentSessionId, launch2, launch2.config);
+  if (approved.reused) return approved;
+  ctx.deps.events.append({
+    aggregateType: "session",
+    aggregateId: parentSessionId,
+    eventType: "collaboration.grant_created",
+    payload: approved.mode === "link" ? { grantId, mode: "link", peerSessionId: approved.sessionId, launchId: approved.launchId } : { grantId, mode: approved.mode, agentId: approved.agentId, launchId: approved.launchId }
+  });
+  return approved;
+}
+async function requestCollaboration(ctx, input) {
+  if (!ctx.deps.sessions.get(input.parentSessionId)) {
+    throw new CollaborationError("Parent session is not available", "not_found");
+  }
+  if (ctx.store.isSpawnChild(input.parentSessionId)) {
+    throw new CollaborationError(NESTED_COLLABORATION_UNSUPPORTED, "failed_precondition");
+  }
+  if (!Array.isArray(input.launches)) {
+    throw new CollaborationError("launches must contain at least one proposed session", "invalid_argument");
+  }
+  assertLaunchCount(input.launches.length);
+  const profileList = ctx.listProfiles();
+  const normalized = normalizeLaunches(ctx, input, profileList);
+  const launchIds = new Set(normalized.map((l) => l.launchId));
+  if (launchIds.size !== normalized.length) {
+    throw new CollaborationError("Every confirmed launch must have a unique launchId", "invalid_argument");
+  }
+  let confirmed = normalized;
+  if (input.requireUserConfirm) {
+    const outcome = await ctx.deps.sessions.requestAgentsConfirm({
+      sessionId: input.parentSessionId,
+      launches: normalized,
+      profiles: profileList,
+      signal: input.signal
+    });
+    if (outcome.action === "cancel") return { status: "cancelled" };
+    if (outcome.action === "decline") return { status: "rejected", feedback: outcome.content?.feedback };
+    confirmed = mergeConfirmedLaunches(normalized, outcome.content);
   }
-  mkdirSync23(dirname18(keyPath), { recursive: true, mode: 448 });
-  const key = randomBytes6(KEY_BYTES);
-  writeFileSync18(keyPath, key, { mode: 384 });
+  const launches = ctx.store.transaction(() => confirmed.map((launch2) => createGrant(ctx, input.parentSessionId, launch2)));
+  return { status: "approved", launches, next: START_APPROVED_LAUNCHES_HINT };
+}
+
+// src/session/collaboration-start.ts
+init_agent_types();
+init_environment();
+import { existsSync as existsSync39, statSync as statSync15 } from "node:fs";
+import { resolve as pathResolve2 } from "node:path";
+function resolveCwd(ctx, config2, projectId, parentCwd) {
+  const project = ctx.deps.projects.get(projectId);
+  const fallback = parentCwd || project?.path || process.cwd();
+  const cwd = pathResolve2(config2.cwd || fallback);
+  if (!existsSync39(cwd) || !statSync15(cwd).isDirectory()) {
+    throw new CollaborationError(`Working directory does not exist: ${cwd}`, "invalid_argument");
+  }
+  return cwd;
+}
+function applyFormAnswers(ctx, grant, formAnswers) {
+  const packed = formAnswers[SESSION_AGENT_LAUNCHES_FIELD];
+  if (typeof packed !== "string") return grant;
+  let edited;
   try {
-    chmodSync2(keyPath, 384);
+    edited = JSON.parse(packed);
+  } catch {
+    return grant;
+  }
+  if (!Array.isArray(edited) || edited.length === 0) return grant;
+  const patch = edited[0]?.config;
+  if (!patch || typeof patch !== "object") return grant;
+  const next = patchEditableLaunchConfig(parseGrantConfig(grant.config_json), patch);
+  ctx.store.updateConfig(grant.grant_id, next);
+  return { ...grant, config_json: JSON.stringify(next) };
+}
+async function deliverInitialTask(ctx, grant, childSessionId) {
+  if (grant.task_sent === 1) return;
+  const config2 = parseGrantConfig(grant.config_json);
+  const text2 = grant.kind === "handoff" ? handoffTaskContent({
+    parentSessionId: grant.parent_session_id,
+    parentTitle: ctx.deps.sessions.get(grant.parent_session_id)?.title?.trim() || null,
+    task: grant.task
+  }) : grant.task;
+  try {
+    await ctx.deps.sessions.sendWithoutLease({
+      sessionId: childSessionId,
+      text: text2,
+      model: config2.model,
+      effort: config2.effort,
+      permissionMode: config2.permissionMode,
+      sandboxMode: config2.sandboxMode,
+      apiProviderId: config2.apiProviderId,
+      requestId: `collaboration-task-${grant.grant_id.slice(0, 16)}`
+    });
   } catch {
   }
-  return key;
+  ctx.store.markTaskSent(grant.grant_id);
 }
-function createNodeSecretCrypto(keyPath) {
-  const key = ensureKeyFile(keyPath);
+async function wakeLinkPeer(ctx, sessionId, grant, hasOpening) {
+  if (!ctx.deps.sessions.get(sessionId)) return;
+  try {
+    await ctx.deps.sessions.sendWithoutLease({
+      sessionId,
+      text: linkActivationWakeText({
+        initiatorSessionId: grant.parent_session_id,
+        initiatorTitle: initiatorTitleOf(ctx, grant),
+        hasOpening
+      }),
+      source: "task-notification",
+      requestId: `collab-link-wake-${grant.grant_id.slice(0, 12)}-${Date.now()}`
+    });
+  } catch {
+  }
+}
+async function startLink(ctx, grant) {
+  if (!grant.child_session_id) {
+    throw new CollaborationError("Link grant is missing peer session id", "failed_precondition");
+  }
+  const peerSessionId = grant.child_session_id;
+  if (!ctx.deps.sessions.get(peerSessionId)) {
+    throw new CollaborationError(`Peer session no longer exists: ${peerSessionId}`, "not_found");
+  }
+  const alreadyStarted = Boolean(grant.started_at);
+  if (!alreadyStarted) ctx.store.markStarted(grant.grant_id);
+  const opening = grant.task?.trim() ?? "";
+  if (!alreadyStarted && opening) {
+    if (grant.task_sent !== 1) {
+      ctx.store.appendLinkOpening(grant, peerSessionId, opening);
+      void wakeLinkPeer(ctx, peerSessionId, grant, true);
+    }
+  } else {
+    void wakeLinkPeer(ctx, peerSessionId, grant, false);
+    if (!alreadyStarted) ctx.store.markTaskSent(grant.grant_id);
+  }
+  const peer = describeLaunchedPeer(grant);
   return {
-    encrypt(plain) {
-      if (!plain) return "";
-      if (isEncryptedSecret(plain)) return plain;
-      const iv = randomBytes6(12);
-      const cipher = createCipheriv("aes-256-gcm", key, iv);
-      const ciphertext = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
-      const tag = cipher.getAuthTag();
-      return ENC_PREFIX2 + Buffer.concat([iv, tag, ciphertext]).toString("base64");
-    },
-    decrypt(stored) {
-      if (!stored) return "";
-      if (!isEncryptedSecret(stored)) return stored;
+    status: "linked",
+    mode: "link",
+    sessionId: peerSessionId,
+    peerSessionId,
+    reused: alreadyStarted,
+    name: peer.name,
+    role: peer.role,
+    title: peer.title,
+    config: peer.config
+  };
+}
+async function startCollaboration(ctx, input) {
+  let grant = prepareLaunchStart(ctx.store, input.callerSessionId, input);
+  if (grant.kind !== "link" && input.formAnswers && typeof input.formAnswers === "object") {
+    grant = applyFormAnswers(ctx, grant, input.formAnswers);
+  }
+  if (grant.kind === "link") return startLink(ctx, grant);
+  const isHandoff = grant.kind === "handoff";
+  const existingHandoffSessionId = isHandoff ? parseGrantConfig(grant.config_json).handoffSessionId : void 0;
+  const existingSessionId = existingHandoffSessionId ?? grant.child_session_id;
+  if (existingSessionId) {
+    const existing = ctx.deps.sessions.get(existingSessionId);
+    if (isHandoff && !existing) {
+      throw new CollaborationError(`The handoff session no longer exists: ${existingSessionId}`, "not_found");
+    }
+    if (existing && !isHandoff) {
+      ctx.deps.sessions.setSystemPromptAppend(
+        existing.sessionId,
+        collaborationSystemPrompt(grant.parent_session_id)
+      );
+    }
+    if (existing) await deliverInitialTask(ctx, grant, existingSessionId);
+    const peer = describeLaunchedPeer(grant);
+    return {
+      status: "started",
+      mode: grant.kind,
+      sessionId: existingSessionId,
+      reused: true,
+      name: peer.name,
+      role: peer.role,
+      title: peer.title,
+      config: peer.config
+    };
+  }
+  const parent = ctx.deps.sessions.get(grant.parent_session_id);
+  if (!parent) throw new CollaborationError("Parent session is not available", "not_found");
+  const config2 = parseGrantConfig(grant.config_json);
+  let cwd = resolveCwd(ctx, config2, parent.projectId, parent.cwd);
+  if (config2.worktreePath && typeof config2.worktreePath === "string" && config2.worktreePath.trim()) {
+    cwd = pathResolve2(config2.worktreePath.trim());
+  } else if (config2.worktree?.enabled) {
+    cwd = ctx.deps.workspaceGit.activateWorktree(parent.projectId, {
+      baseBranch: config2.worktree.baseBranch || "HEAD",
+      mode: config2.worktree.mode ?? "branch",
+      branchName: config2.worktree.branchName,
+      carryLocalChanges: config2.worktree.carryLocalChanges
+    }).path;
+  }
+  const profile = resolveProfile(new Map(ctx.listProfiles().map((p3) => [p3.id, p3])), grant.agent_id);
+  const harnessId = profile?.harnessId ?? normalizeSessionHarnessId(grant.agent_id) ?? "claude";
+  const displayName = deriveCollaborationName({ name: config2.name });
+  const role = deriveCollaborationRole({ role: config2.role, task: grant.task });
+  const title = collaborationSessionTitle(displayName, role);
+  let child;
+  try {
+    child = ctx.deps.sessions.create({
+      projectId: parent.projectId,
+      harnessId,
+      providerId: grant.agent_id,
+      title,
+      cwd,
+      model: config2.model ?? null,
+      effort: config2.effort ?? null,
+      permissionMode: config2.permissionMode ?? null,
+      sandboxMode: config2.sandboxMode ?? null,
+      apiProviderId: config2.apiProviderId ?? null,
+      controllerClientSessionId: input.controllerClientSessionId ?? parent.controllerClientSessionId,
+      // Handoff is one-way by construction: the receiver gets no collaboration prompt.
+      ...isHandoff ? {} : { systemPromptAppend: collaborationSystemPrompt(grant.parent_session_id) }
+    });
+    ctx.store.bindStartedSession(grant, child.sessionId, config2);
+  } catch (err) {
+    if (child?.sessionId) {
       try {
-        const buf = Buffer.from(stored.slice(ENC_PREFIX2.length), "base64");
-        const iv = buf.subarray(0, 12);
-        const tag = buf.subarray(12, 28);
-        const data = buf.subarray(28);
-        const decipher = createDecipheriv("aes-256-gcm", key, iv);
-        decipher.setAuthTag(tag);
-        return Buffer.concat([decipher.update(data), decipher.final()]).toString("utf8");
+        ctx.deps.sessions.remove(child.sessionId);
       } catch {
-        return "";
       }
     }
+    throw err;
+  }
+  grant = isHandoff ? grant : { ...grant, child_session_id: child.sessionId };
+  await deliverInitialTask(ctx, grant, child.sessionId);
+  ctx.deps.events.append({
+    aggregateType: "session",
+    aggregateId: grant.parent_session_id,
+    eventType: isHandoff ? "collaboration.handoff_started" : "collaboration.child_started",
+    payload: { grantId: grant.grant_id, childSessionId: child.sessionId }
+  });
+  return {
+    status: "started",
+    mode: grant.kind,
+    sessionId: child.sessionId,
+    reused: false,
+    name: displayName,
+    role,
+    title,
+    config: {
+      model: config2.model,
+      effort: config2.effort,
+      fastMode: config2.fastMode,
+      permissionMode: config2.permissionMode,
+      sandboxMode: config2.sandboxMode,
+      cwd,
+      apiProviderId: config2.apiProviderId ?? null,
+      name: displayName,
+      role,
+      ...config2.worktree ? { worktree: config2.worktree } : {},
+      ...config2.worktreePath ? { worktreePath: config2.worktreePath } : {}
+    }
   };
 }
 
+// src/session/collaboration.ts
+var CollaborationService = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.ctx = {
+      deps,
+      store: new CollaborationStore(deps.db),
+      listProfiles: () => this.listProfiles()
+    };
+  }
+  deps;
+  ctx;
+  /** Agent profiles from session_providers (+ ready-harness fallback). */
+  listProfiles() {
+    return listCollaborationProfiles(this.deps);
+  }
+  request(input) {
+    return requestCollaboration(this.ctx, input);
+  }
+  start(input) {
+    return startCollaboration(this.ctx, input);
+  }
+  send(input) {
+    return sendCollaborationMessage(this.ctx, input);
+  }
+  retrieve(input) {
+    return retrieveCollaborationMessages(this.ctx, input);
+  }
+  /** Reconstruct system-prompt append for spawn children after restart (never link). */
+  rehydrateSystemPrompts() {
+    for (const grant of this.ctx.store.startedSpawnGrants()) {
+      if (!grant.child_session_id || !this.deps.sessions.get(grant.child_session_id)) continue;
+      this.deps.sessions.setSystemPromptAppend(grant.child_session_id, collaborationSystemPrompt(grant.parent_session_id));
+    }
+  }
+};
+
 // src/workspace/watch-service.ts
 import { watch } from "node:fs";
 
@@ -88324,7 +88331,7 @@ var WorkspaceWatchService = class {
 
 // src/workspace/tail-watch-service.ts
 init_fs();
-import { existsSync as existsSync41, fstatSync as fstatSync2, openSync as openSync2, closeSync as closeSync2, statSync as statSync16, readSync as readSync2, realpathSync as realpathSync6 } from "node:fs";
+import { existsSync as existsSync40, fstatSync as fstatSync2, openSync as openSync2, closeSync as closeSync2, statSync as statSync16, readSync as readSync2, realpathSync as realpathSync6 } from "node:fs";
 var MAX_POLL_BYTES = 10 * 1024 * 1024;
 var WorkspaceTailWatchService = class {
   constructor(projects, fs2) {
@@ -88348,7 +88355,7 @@ var WorkspaceTailWatchService = class {
         );
       }
       try {
-        resolvedAbs = existsSync41(absolutePath) ? realpathSync6(absolutePath) : absolutePath;
+        resolvedAbs = existsSync40(absolutePath) ? realpathSync6(absolutePath) : absolutePath;
       } catch {
         resolvedAbs = absolutePath;
       }
@@ -88379,7 +88386,7 @@ var WorkspaceTailWatchService = class {
         code: "invalid_argument"
       });
     }
-    if (existsSync41(resolvedAbs)) {
+    if (existsSync40(resolvedAbs)) {
       try {
         const st2 = statSync16(resolvedAbs);
         if (!st2.isFile()) {
@@ -88430,7 +88437,7 @@ var WorkspaceTailWatchService = class {
         { code: "invalid_argument" }
       );
     }
-    if (!existsSync41(absolutePath)) {
+    if (!existsSync40(absolutePath)) {
       return {
         content: "",
         encoding: "base64",
@@ -88521,7 +88528,7 @@ var WorkspaceTailWatchService = class {
 };
 
 // src/auth/idempotency.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 var IdempotencyService = class {
   constructor(db) {
     this.db = db;
@@ -88529,7 +88536,7 @@ var IdempotencyService = class {
   db;
   inflight = /* @__PURE__ */ new Map();
   payloadHash(payload) {
-    return createHash10("sha256").update(JSON.stringify(payload ?? null)).digest("hex");
+    return createHash9("sha256").update(JSON.stringify(payload ?? null)).digest("hex");
   }
   key(clientIdentity, operation, idempotencyKey) {
     return `${clientIdentity}\0${operation}\0${idempotencyKey}`;
@@ -88628,7 +88635,62 @@ var IdempotencyService = class {
 };
 
 // src/provider/provider-store.ts
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
+
+// src/provider/secret-crypto.ts
+import { existsSync as existsSync41, mkdirSync as mkdirSync23, readFileSync as readFileSync20, writeFileSync as writeFileSync18, chmodSync as chmodSync2 } from "node:fs";
+import { dirname as dirname18 } from "node:path";
+import { createCipheriv, createDecipheriv, randomBytes as randomBytes5 } from "node:crypto";
+var ENC_PREFIX2 = "enc:v1:";
+var KEY_BYTES = 32;
+function isEncryptedSecret(value) {
+  return typeof value === "string" && value.startsWith(ENC_PREFIX2);
+}
+function ensureKeyFile(keyPath) {
+  if (existsSync41(keyPath)) {
+    const raw = readFileSync20(keyPath);
+    if (raw.length === KEY_BYTES) return raw;
+  }
+  mkdirSync23(dirname18(keyPath), { recursive: true, mode: 448 });
+  const key = randomBytes5(KEY_BYTES);
+  writeFileSync18(keyPath, key, { mode: 384 });
+  try {
+    chmodSync2(keyPath, 384);
+  } catch {
+  }
+  return key;
+}
+function createNodeSecretCrypto(keyPath) {
+  const key = ensureKeyFile(keyPath);
+  return {
+    encrypt(plain) {
+      if (!plain) return "";
+      if (isEncryptedSecret(plain)) return plain;
+      const iv = randomBytes5(12);
+      const cipher = createCipheriv("aes-256-gcm", key, iv);
+      const ciphertext = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()]);
+      const tag = cipher.getAuthTag();
+      return ENC_PREFIX2 + Buffer.concat([iv, tag, ciphertext]).toString("base64");
+    },
+    decrypt(stored) {
+      if (!stored) return "";
+      if (!isEncryptedSecret(stored)) return stored;
+      try {
+        const buf = Buffer.from(stored.slice(ENC_PREFIX2.length), "base64");
+        const iv = buf.subarray(0, 12);
+        const tag = buf.subarray(12, 28);
+        const data = buf.subarray(28);
+        const decipher = createDecipheriv("aes-256-gcm", key, iv);
+        decipher.setAuthTag(tag);
+        return Buffer.concat([decipher.update(data), decipher.final()]).toString("utf8");
+      } catch {
+        return "";
+      }
+    }
+  };
+}
+
+// src/provider/provider-store.ts
 function safeParse3(text2, fallback) {
   if (!text2) return fallback;
   try {
@@ -88660,7 +88722,7 @@ var ProviderStore = class {
   }
   createCredential(input) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    const id = input.id?.trim() || randomUUID12();
+    const id = input.id?.trim() || randomUUID13();
     const maxOrder = this.db.prepare("SELECT MAX(sort_order) as m FROM provider_credentials").get()?.m ?? -1;
     this.db.prepare(
       `INSERT INTO provider_credentials
@@ -88856,7 +88918,7 @@ var ProviderStore = class {
 };
 
 // src/session/host-action-mcp-server.ts
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID15 } from "node:crypto";
 import {
   createServer as createHttpServer
 } from "node:http";
@@ -92451,7 +92513,7 @@ init_interaction_memory();
 // ../../packages/runtime/src/fs/interaction-memory.ts
 init_superone_home();
 init_interaction_memory();
-import { createHash as createHash11, randomUUID as randomUUID13 } from "node:crypto";
+import { createHash as createHash10, randomUUID as randomUUID14 } from "node:crypto";
 import { lstat, mkdir, open, readdir, rename, rm } from "node:fs/promises";
 import { constants as constants4 } from "node:fs";
 import { join as join34 } from "node:path";
@@ -92647,7 +92709,7 @@ function indexEntry(note) {
   };
 }
 async function writeAtomic(dir, name, raw) {
-  const temp = join34(dir, `.${name}.${randomUUID13()}.tmp`);
+  const temp = join34(dir, `.${name}.${randomUUID14()}.tmp`);
   try {
     const file2 = await open(temp, "wx", 384);
     try {
@@ -92705,7 +92767,7 @@ var InteractionMemoryStore = class _InteractionMemoryStore {
         await file2.close();
       }
       const { meta: meta3, content } = parseNote(raw, { title: topic2, resource: target.resource });
-      return { ...meta3, topic: topic2, content, revision: createHash11("sha256").update(raw).digest("hex") };
+      return { ...meta3, topic: topic2, content, revision: createHash10("sha256").update(raw).digest("hex") };
     } catch (err) {
       if (missing(err)) return null;
       throw new Error(`Cannot read personal memory ${target.label}/${topic2}: ${err instanceof Error ? err.message : String(err)}`);
@@ -92798,7 +92860,7 @@ var InteractionMemoryStore = class _InteractionMemoryStore {
         saved: true,
         created: !existing,
         ...target.identity,
-        ...summary({ ...meta3, topic: args.topic, content, revision: createHash11("sha256").update(raw).digest("hex") })
+        ...summary({ ...meta3, topic: args.topic, content, revision: createHash10("sha256").update(raw).digest("hex") })
       };
     } finally {
       await rm(lock, { recursive: true, force: true });
@@ -100998,9 +101060,7 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     "session_collab_start",
     {
       description: startDesc.description,
-      inputSchema: {
-        credential: external_exports.string().min(1)
-      }
+      inputSchema: jsonSchemaToZodShape(startDesc.inputSchema)
     },
     async (args) => {
       try {
@@ -101135,7 +101195,7 @@ function headerValue(req, name) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 async function startHostActionMcpServer(opts) {
-  const masterToken = opts.masterToken ?? randomUUID14();
+  const masterToken = opts.masterToken ?? randomUUID15();
   const httpSessions = /* @__PURE__ */ new Map();
   const httpSessionsBySuperone = /* @__PURE__ */ new Map();
   let httpUrl2 = "";
@@ -101203,7 +101263,7 @@ async function startHostActionMcpServer(opts) {
         });
         let sessionRef;
         const transport = new StreamableHTTPServerTransport({
-          sessionIdGenerator: randomUUID14,
+          sessionIdGenerator: randomUUID15,
           onsessioninitialized: (id) => {
             if (sessionRef) httpSessions.set(id, sessionRef);
           },
@@ -101987,7 +102047,7 @@ function computeNextRunAt(schedule) {
 }
 
 // ../../packages/runtime/src/automations/store.ts
-import { randomUUID as randomUUID15 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 function toRecord(row, projectPath) {
   return {
     id: row.id,
@@ -102019,7 +102079,7 @@ function createAutomationStore(db, resolveProjectPath2) {
       return { ...toRecord(row, path), projectId: row.project_id };
     },
     create(projectId, projectPath, data) {
-      const id = randomUUID15();
+      const id = randomUUID16();
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const nextRunAt = computeNextRunAt(data.schedule);
       db.prepare(
@@ -102069,8 +102129,8 @@ function createAutomationStore(db, resolveProjectPath2) {
     delete(id) {
       return db.prepare("DELETE FROM automations WHERE id = ?").run(id).changes > 0;
     },
-    listDue(nowIso) {
-      const reclaimBefore = new Date(Date.parse(nowIso) - 30 * 60 * 1e3).toISOString();
+    listDue(nowIso2) {
+      const reclaimBefore = new Date(Date.parse(nowIso2) - 30 * 60 * 1e3).toISOString();
       const rows = db.prepare(
         `SELECT * FROM automations
            WHERE enabled = 1
@@ -102081,7 +102141,7 @@ function createAutomationStore(db, resolveProjectPath2) {
                OR last_run_status != 'running'
                OR COALESCE(last_run_at, updated_at) < ?
              )`
-      ).all(nowIso, reclaimBefore);
+      ).all(nowIso2, reclaimBefore);
       return rows.map((r) => {
         const path = resolveProjectPath2(r.project_id) ?? "";
         return toRecord(r, path);
@@ -102324,10 +102384,10 @@ init_environment();
 // ../../packages/shared/src/environment/draft-content.ts
 function hasPersistableDraftContent(draft) {
   if (draft.text.trim() || draft.attachments?.length) return true;
-  const pending = [draft.docJson];
+  const pending2 = [draft.docJson];
   const seen = /* @__PURE__ */ new Set();
-  while (pending.length) {
-    const node = pending.pop();
+  while (pending2.length) {
+    const node = pending2.pop();
     if (!node || typeof node !== "object") continue;
     if (seen.has(node)) continue;
     seen.add(node);
@@ -102335,7 +102395,7 @@ function hasPersistableDraftContent(draft) {
     if (type === "text" && typeof text2 === "string" && text2.trim()) return true;
     const value = type === "pasteChip" ? attrs?.text : type === "mention" ? attrs?.value : null;
     if (typeof value === "string" && value.trim()) return true;
-    if (Array.isArray(content)) pending.push(...content);
+    if (Array.isArray(content)) pending2.push(...content);
   }
   return false;
 }
@@ -102540,7 +102600,7 @@ ON CONFLICT(id) DO UPDATE SET
 
 // src/workspace/artifact-zone.ts
 init_environment();
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 import {
   closeSync as closeSync3,
   fstatSync as fstatSync3,
@@ -102862,7 +102922,7 @@ var ArtifactZoneService = class {
       written: 0,
       total: req.total,
       sha256: req.sha256,
-      hash: createHash12("sha256"),
+      hash: createHash11("sha256"),
       lastActivityAt: Date.now()
     };
     this.transfers.set(transferId, transfer);
@@ -102968,7 +103028,6 @@ async function startNodeRuntime(partial2 = {}) {
   }
   const allowSimulatedTurnFallback = partial2.allowSimulatedTurnFallback ?? simulatedHarness;
   const providers = new ProviderStore(db, paths.providerSecretsKey);
-  const collabSecrets = createNodeSecretCrypto(paths.providerSecretsKey);
   let sessionsRef = null;
   let collaborationRef = null;
   const hostActionMcp = await startHostActionMcpServer({
@@ -103003,8 +103062,9 @@ async function startNodeRuntime(partial2 = {}) {
         if (!collaborationRef) throw Object.assign(new Error("collab not ready"), { code: "failed_precondition" });
         const a = args && typeof args === "object" ? args : {};
         return collaborationRef.start({
-          credential: typeof a.credential === "string" ? a.credential : void 0,
-          callerSessionId: sessionId
+          callerSessionId: sessionId,
+          launchId: typeof a.launchId === "string" ? a.launchId : "",
+          task: typeof a.task === "string" ? a.task : void 0
         });
       },
       send: async (sessionId, args) => {
@@ -103012,7 +103072,7 @@ async function startNodeRuntime(partial2 = {}) {
         const a = args && typeof args === "object" ? args : {};
         return collaborationRef.send({
           sessionId,
-          credential: String(a.credential ?? ""),
+          to: typeof a.to === "string" ? a.to : void 0,
           content: String(a.content ?? ""),
           clientMessageId: typeof a.clientMessageId === "string" ? a.clientMessageId : void 0
         });
@@ -103022,8 +103082,7 @@ async function startNodeRuntime(partial2 = {}) {
         const a = args && typeof args === "object" ? args : {};
         return collaborationRef.retrieve({
           sessionId,
-          credentials: Array.isArray(a.credentials) ? a.credentials : void 0,
-          credential: typeof a.credential === "string" ? a.credential : void 0
+          from: Array.isArray(a.from) ? a.from.filter((id) => typeof id === "string") : void 0
         });
       }
     }
@@ -103070,7 +103129,6 @@ async function startNodeRuntime(partial2 = {}) {
     providers,
     projects,
     workspaceGit,
-    secrets: collabSecrets,
     sessionProviders,
     experimentalClaudeOpenAiChatEnabled: () => loadNodeAgentSettings(paths.configJson).experimentalClaudeOpenAiChatEnabled
   });