@layorixinc/axterm 0.7.0 → 0.8.0

package/dist/cli.js

@@ -50,6 +50,11 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 function descriptor(surfaceClass, lane, required, defaultEnabled, sizePolicy) {
   return { class: surfaceClass, lane, required, defaultEnabled, sizePolicy };
 }
+function progressGlyph(status) {
+  if (status === undefined)
+    return "\uD83D\uDCCC";
+  return PROGRESS_GLYPHS[status] ?? "\uD83D\uDCCC";
+}
 
 class SurfaceCommitter {
   options;
@@ -125,7 +130,7 @@ function remember(entries, key, limit) {
   if (oldest !== undefined)
     entries.delete(oldest);
 }
-var SURFACE_KINDS, SURFACE_DESCRIPTORS, OPTIONAL_SURFACE_KINDS;
+var SURFACE_KINDS, SURFACE_DESCRIPTORS, OPTIONAL_SURFACE_KINDS, PROGRESS_GLYPHS, CONVERSATION_CHANGE_CAUSES;
 var init_agent_surface = __esm(() => {
   SURFACE_KINDS = [
     "state.agent",
@@ -200,10 +205,10 @@ var init_agent_surface = __esm(() => {
     "notice.auth": descriptor("notice", "immediate", true, true, "telemetry"),
     "notice.warning": descriptor("notice", "digest", false, true, "telemetry"),
     "notice.info": descriptor("notice", "digest", false, false, "telemetry"),
-    "context.session": descriptor("context", "snapshot", false, true, "telemetry"),
+    "context.session": descriptor("context", "immediate", true, true, "telemetry"),
     "context.compaction": descriptor("context", "snapshot", false, true, "telemetry"),
     "context.handoff": descriptor("context", "snapshot", false, true, "telemetry"),
-    "context.branch": descriptor("context", "digest", false, false, "telemetry"),
+    "context.branch": descriptor("context", "immediate", true, true, "telemetry"),
     "context.tree": descriptor("context", "digest", false, false, "telemetry"),
     "artifact.image": descriptor("artifact", "artifact", false, false, "channelArtifact"),
     "artifact.file": descriptor("artifact", "artifact", false, false, "channelArtifact"),
@@ -212,6 +217,15 @@ var init_agent_surface = __esm(() => {
     "artifact.link": descriptor("artifact", "digest", false, false, "telemetry")
   };
   OPTIONAL_SURFACE_KINDS = SURFACE_KINDS.filter((kind) => !SURFACE_DESCRIPTORS[kind].required);
+  PROGRESS_GLYPHS = {
+    pending: "\u23F3",
+    active: "\uD83D\uDD04",
+    blocked: "\u26D4",
+    done: "\u2705",
+    failed: "\u274C",
+    skipped: "\u23E9"
+  };
+  CONVERSATION_CHANGE_CAUSES = ["new", "resume", "fork", "handoff"];
 });
 
 // packages/core/src/menu-keys.ts
@@ -1816,6 +1830,7 @@ locale: set AXTERM_LANG=en|ko, or \`axterm config set locale ko\`
     "sl.command.unknownKey": 'Unknown key "{name}" \u2014 nothing was sent. Accepted: {keys}',
     "sl.command.keysSent": "\u2328\uFE0F sent: {keys}",
     "sl.command.typed": "\u2328\uFE0F typed without Enter:\n```text\n{screen}\n```",
+    "sl.passthrough.sent": "\u2328\uFE0F typed `/{command}` for the agent. Nothing was submitted \u2014 use the `key` control command with `keys:enter` if it needs Enter:\n```text\n{screen}\n```",
     "sl.command.failed": "Failed: {error}",
     "sl.state.working": "working",
     "sl.state.blocked": "waiting for approval",
@@ -1863,6 +1878,8 @@ locale: set AXTERM_LANG=en|ko, or \`axterm config set locale ko\`
     "tg.agent.retry": "\u23F3 The agent is rate limited and will retry in {wait}: {error}",
     "tg.raw.keysSent": "\u2328\uFE0F sent: {keys}",
     "tg.raw.unknownKey": 'unknown key "{name}" \u2014 nothing was sent. Accepted: {keys}',
+    "tg.passthrough.sent": `sent <code>/{command}</code> to the agent. Nothing was submitted \u2014 use the key buttons or <code>/key enter</code> if it needs Enter:
+{screen}`,
     "tg.raw.typed": `\u2328\uFE0F typed (not submitted \u2014 /key enter to send):
 <pre>{screen}</pre>`,
     "tg.raw.needText": "usage: /type <text> \u2014 written verbatim, without Enter. Then /key enter.",
@@ -1910,6 +1927,7 @@ locale: set AXTERM_LANG=en|ko, or \`axterm config set locale ko\`
     "dc.secret.submitted": "\uD83D\uDD10 The secret was submitted and the source message was removed if permissions allowed.",
     "dc.ask.tooMany": "This question has too many options for Discord; answer it in the attached terminal.",
     "dc.ask.resolvedElsewhere": "\u231B This question was answered elsewhere.",
+    "dc.ask.conversationChanged": "\u231B The conversation changed, so this question no longer exists.",
     "dc.command.noProjects": "No projects configured.",
     "dc.command.noSessions": "No sessions.",
     "dc.command.unknownProject": "Unknown project: {project}",
@@ -1947,6 +1965,7 @@ locale: set AXTERM_LANG=en|ko, or \`axterm config set locale ko\`
     "dc.command.unknownKey": 'Unknown key "{name}" \u2014 nothing was sent. Accepted: {keys}',
     "dc.command.keysSent": "\u2328\uFE0F sent: {keys}",
     "dc.command.typed": "\u2328\uFE0F typed without Enter:\n```text\n{screen}\n```",
+    "dc.passthrough.sent": "\u2328\uFE0F typed `/{command}` for the agent. Nothing was submitted \u2014 use `/ax-key` with `enter` if it needs Enter:\n```text\n{screen}\n```",
     "dc.command.tooLong": "Raw input is limited to {limit} characters; send a normal prompt instead.",
     "dc.inbound.empty": "\u26A0\uFE0F The attachment is empty.",
     "err.discord.noThread": "Discord has no thread for session {session}",
@@ -2064,6 +2083,12 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "err.claude.conversationBusy": "session {session} is already in conversation {id} \u2014 two sessions writing one transcript would corrupt it; kill that one first",
     "err.claude.noConversation": "claude has no conversation {id} in its store on this machine \u2014 a conversation lives on the machine it ran on, so this one cannot be resumed here",
     "agent.approval.denied": "Denied from the axterm channel",
+    "agent.conversation.switch.new": "\uD83D\uDD00 A new conversation was started under this topic \u2014 your next prompt goes to it, not the previous one.",
+    "agent.conversation.switch.resume": "\uD83D\uDD00 This topic resumed a different conversation \u2014 your next prompt goes to the resumed one, not the previous one.",
+    "agent.conversation.switch.fork": "\uD83D\uDD00 The conversation was forked \u2014 this topic now follows the fork, and your next prompt goes to it.",
+    "agent.conversation.switch.handoff": "\uD83D\uDD00 The conversation was handed off \u2014 this topic now follows the new conversation, and your next prompt goes to it.",
+    "agent.conversation.switch.unknown": "\uD83D\uDD00 The conversation under this topic changed \u2014 your next prompt goes to the new conversation, not the previous one.",
+    "agent.conversation.branch": "\uD83C\uDF31 The conversation branched \u2014 this topic now follows the branch, and your next prompt goes to it.",
     "err.codex.noAuth": "codex is not logged in ({authFile} not found) \u2014 run `codex login` once, then start the session again",
     "err.codex.authLink": "could not link codex credentials into axterm's CODEX_HOME ({reason}) \u2014 refusing to start a logged-out agent",
     "health.config.invalid": "the configuration file could not be understood",
@@ -2104,6 +2129,8 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "wizard.review.header": "Review",
     "wizard.cancelled": "nothing was saved",
     "wizard.saved": "configuration saved",
+    "wizard.telegramDiscovering": "looking up the group and user ids this bot can see\u2026",
+    "wizard.telegramDiscoverFailed": "automatic Telegram discovery failed: {error} \u2014 enter the ids manually below or retry setup after stopping the active Telegram channel",
     "wizard.checking": "checking the Telegram setup\u2026",
     "wizard.telegramOk": "Telegram is ready",
     "wizard.needed": "axterm is not configured yet.",
@@ -2310,6 +2337,7 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "sl.command.unknownKey": '\uC54C \uC218 \uC5C6\uB294 \uD0A4 "{name}" \u2014 \uC544\uBB34\uAC83\uB3C4 \uBCF4\uB0B4\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAC00\uB2A5\uD55C \uD0A4: {keys}',
     "sl.command.keysSent": "\u2328\uFE0F \uC804\uC1A1: {keys}",
     "sl.command.typed": "\u2328\uFE0F Enter \uC5C6\uC774 \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4:\n```text\n{screen}\n```",
+    "sl.passthrough.sent": "\u2328\uFE0F \uC5D0\uC774\uC804\uD2B8\uC5D0 `/{command}` \uB97C \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4. \uC81C\uCD9C\uC740 \uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 Enter\uAC00 \uD544\uC694\uD558\uBA74 `key` \uC81C\uC5B4 \uBA85\uB839\uC5D0 `keys:enter` \uB97C \uC4F0\uC138\uC694:\n```text\n{screen}\n```",
     "sl.command.failed": "\uC2E4\uD328: {error}",
     "sl.state.working": "\uC791\uC5C5 \uC911",
     "sl.state.blocked": "\uC2B9\uC778 \uB300\uAE30 \uC911",
@@ -2371,6 +2399,8 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "tg.agent.retry": "\u23F3 \uC5D0\uC774\uC804\uD2B8\uAC00 \uC694\uCCAD \uD55C\uB3C4\uC5D0 \uAC78\uB824 {wait} \uD6C4 \uC7AC\uC2DC\uB3C4\uD569\uB2C8\uB2E4: {error}",
     "tg.raw.keysSent": "\u2328\uFE0F \uC804\uC1A1: {keys}",
     "tg.raw.unknownKey": '\uC54C \uC218 \uC5C6\uB294 \uD0A4 "{name}" \u2014 \uC544\uBB34\uAC83\uB3C4 \uBCF4\uB0B4\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAC00\uB2A5\uD55C \uD0A4: {keys}',
+    "tg.passthrough.sent": `<code>/{command}</code> \uB97C \uC5D0\uC774\uC804\uD2B8\uC5D0 \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4. \uC81C\uCD9C\uC740 \uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 Enter\uAC00 \uD544\uC694\uD558\uBA74 \uD0A4 \uBC84\uD2BC\uC774\uB098 <code>/key enter</code> \uB97C \uC4F0\uC138\uC694:
+{screen}`,
     "tg.raw.typed": `\u2328\uFE0F \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4 (\uC544\uC9C1 \uC81C\uCD9C \uC548 \uD568 \u2014 \uBCF4\uB0B4\uB824\uBA74 /key enter):
 <pre>{screen}</pre>`,
     "tg.raw.needText": "\uC0AC\uC6A9\uBC95: /type <\uD14D\uC2A4\uD2B8> \u2014 Enter \uC5C6\uC774 \uADF8\uB300\uB85C \uC785\uB825\uB429\uB2C8\uB2E4. \uC774\uD6C4 /key enter.",
@@ -2418,6 +2448,7 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "dc.secret.submitted": "\uD83D\uDD10 \uBE44\uBC00\uC744 \uC804\uB2EC\uD588\uC73C\uBA70 \uAD8C\uD55C\uC774 \uD5C8\uC6A9\uD55C \uACBD\uC6B0 \uC6D0\uBCF8 \uBA54\uC2DC\uC9C0\uB97C \uC0AD\uC81C\uD588\uC2B5\uB2C8\uB2E4.",
     "dc.ask.tooMany": "Discord\uC5D0 \uD45C\uC2DC\uD558\uAE30\uC5D0\uB294 \uC120\uD0DD\uC9C0\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uC5F0\uACB0\uB41C \uD130\uBBF8\uB110\uC5D0\uC11C \uB2F5\uD558\uC138\uC694.",
     "dc.ask.resolvedElsewhere": "\u231B \uC774 \uC9C8\uBB38\uC740 \uB2E4\uB978 \uACF3\uC5D0\uC11C \uB2F5\uBCC0\uB418\uC5C8\uC2B5\uB2C8\uB2E4.",
+    "dc.ask.conversationChanged": "\u231B \uB300\uD654\uAC00 \uBC14\uB00C\uC5B4 \uC774 \uC9C8\uBB38\uC740 \uB354 \uC774\uC0C1 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.",
     "dc.command.noProjects": "\uC124\uC815\uB41C \uD504\uB85C\uC81D\uD2B8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.",
     "dc.command.noSessions": "\uC138\uC158\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.",
     "dc.command.unknownProject": "\uC54C \uC218 \uC5C6\uB294 \uD504\uB85C\uC81D\uD2B8: {project}",
@@ -2462,6 +2493,7 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "dc.command.unknownKey": '\uC54C \uC218 \uC5C6\uB294 \uD0A4 "{name}" \u2014 \uC544\uBB34\uAC83\uB3C4 \uBCF4\uB0B4\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uAC00\uB2A5\uD55C \uD0A4: {keys}',
     "dc.command.keysSent": "\u2328\uFE0F \uC804\uC1A1: {keys}",
     "dc.command.typed": "\u2328\uFE0F Enter \uC5C6\uC774 \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4:\n```text\n{screen}\n```",
+    "dc.passthrough.sent": "\u2328\uFE0F \uC5D0\uC774\uC804\uD2B8\uC5D0 `/{command}` \uB97C \uC785\uB825\uD588\uC2B5\uB2C8\uB2E4. \uC81C\uCD9C\uC740 \uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 Enter\uAC00 \uD544\uC694\uD558\uBA74 `/ax-key` \uC5D0 `enter` \uB97C \uC4F0\uC138\uC694:\n```text\n{screen}\n```",
     "dc.command.tooLong": "\uC6D0\uC2DC \uC785\uB825\uC740 \uCD5C\uB300 {limit}\uC790\uC785\uB2C8\uB2E4. \uC77C\uBC18 \uD504\uB86C\uD504\uD2B8\uB85C \uBCF4\uB0B4\uC138\uC694.",
     "dc.state.shell": "\uC178",
     "dc.state.exited": "\uC885\uB8CC\uB428",
@@ -2572,6 +2604,12 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "err.claude.conversationBusy": "\uC138\uC158 {session} \uC774(\uAC00) \uC774\uBBF8 \uB300\uD654 {id} \uC5D0 \uB4E4\uC5B4\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uD55C transcript\uC5D0 \uB450 \uC138\uC158\uC774 \uC4F0\uBA74 \uC190\uC0C1\uB418\uBBC0\uB85C \uBA3C\uC800 \uADF8 \uC138\uC158\uC744 \uC885\uB8CC\uD558\uC138\uC694",
     "err.claude.noConversation": "\uC774 \uBA38\uC2E0\uC758 claude \uC800\uC7A5\uC18C\uC5D0 \uB300\uD654 {id} \uC774(\uAC00) \uC5C6\uC2B5\uB2C8\uB2E4. \uB300\uD654\uB294 \uC2E4\uD589\uB41C \uBA38\uC2E0\uC5D0 \uB0A8\uC73C\uBBC0\uB85C \uC5EC\uAE30\uC11C\uB294 \uC774\uC5B4\uAC08 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4",
     "agent.approval.denied": "axterm \uCC44\uB110\uC5D0\uC11C \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4",
+    "agent.conversation.switch.new": "\uD83D\uDD00 \uC774 \uD1A0\uD53D \uC544\uB798\uC5D0 \uC0C8 \uB300\uD654\uAC00 \uC2DC\uC791\uB418\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uC774\uC804 \uB300\uD654\uAC00 \uC544\uB2C8\uB77C \uC0C8 \uB300\uD654\uB85C \uAC11\uB2C8\uB2E4.",
+    "agent.conversation.switch.resume": "\uD83D\uDD00 \uC774 \uD1A0\uD53D\uC774 \uB2E4\uB978 \uB300\uD654\uB97C \uC774\uC5B4\uBC1B\uC558\uC2B5\uB2C8\uB2E4 \u2014 \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uC774\uC804 \uB300\uD654\uAC00 \uC544\uB2C8\uB77C \uC774\uC5B4\uC9C4 \uB300\uD654\uB85C \uAC11\uB2C8\uB2E4.",
+    "agent.conversation.switch.fork": "\uD83D\uDD00 \uB300\uD654\uAC00 \uD3EC\uD06C\uB418\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uC774 \uD1A0\uD53D\uC740 \uC774\uC81C \uD3EC\uD06C\uB41C \uB300\uD654\uB97C \uB530\uB974\uBA70, \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uADF8\uCABD\uC73C\uB85C \uAC11\uB2C8\uB2E4.",
+    "agent.conversation.switch.handoff": "\uD83D\uDD00 \uB300\uD654\uAC00 \uC778\uACC4\uB418\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uC774 \uD1A0\uD53D\uC740 \uC774\uC81C \uC0C8 \uB300\uD654\uB97C \uB530\uB974\uBA70, \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uADF8\uCABD\uC73C\uB85C \uAC11\uB2C8\uB2E4.",
+    "agent.conversation.switch.unknown": "\uD83D\uDD00 \uC774 \uD1A0\uD53D\uC758 \uB300\uD654\uAC00 \uBC14\uB00C\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uC774\uC804 \uB300\uD654\uAC00 \uC544\uB2C8\uB77C \uC0C8 \uB300\uD654\uB85C \uAC11\uB2C8\uB2E4.",
+    "agent.conversation.branch": "\uD83C\uDF31 \uB300\uD654\uAC00 \uBD84\uAE30\uB418\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uC774 \uD1A0\uD53D\uC740 \uC774\uC81C \uBD84\uAE30\uB41C \uB300\uD654\uB97C \uB530\uB974\uBA70, \uB2E4\uC74C \uD504\uB86C\uD504\uD2B8\uB294 \uADF8\uCABD\uC73C\uB85C \uAC11\uB2C8\uB2E4.",
     "err.codex.noAuth": "codex\uC5D0 \uB85C\uADF8\uC778\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 ({authFile} \uC5C6\uC74C). `codex login` \uC744 \uD55C \uBC88 \uC2E4\uD589\uD55C \uB4A4 \uC138\uC158\uC744 \uB2E4\uC2DC \uC2DC\uC791\uD558\uC138\uC694",
     "err.codex.authLink": "codex \uC790\uACA9 \uC99D\uBA85\uC744 axterm\uC758 CODEX_HOME\uC5D0 \uC5F0\uACB0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4 ({reason}). \uB85C\uADF8\uC544\uC6C3 \uC0C1\uD0DC\uC758 \uC5D0\uC774\uC804\uD2B8\uB294 \uC2DC\uC791\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4",
     "health.config.invalid": "\uC124\uC815 \uD30C\uC77C\uC744 \uC774\uD574\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4",
@@ -2612,6 +2650,8 @@ usage: /fanout <project> <count|branches> <prompt>`,
     "wizard.review.header": "\uD655\uC778",
     "wizard.cancelled": "\uC800\uC7A5\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4",
     "wizard.saved": "\uC124\uC815\uC744 \uC800\uC7A5\uD588\uC2B5\uB2C8\uB2E4",
+    "wizard.telegramDiscovering": "\uC774 \uBD07\uC774 \uBCFC \uC218 \uC788\uB294 \uADF8\uB8F9 id\uC640 \uC0AC\uC6A9\uC790 id\uB97C \uC870\uD68C\uD558\uB294 \uC911\u2026",
+    "wizard.telegramDiscoverFailed": "Telegram \uC790\uB3D9 \uC870\uD68C \uC2E4\uD328: {error} \u2014 \uC544\uB798\uC5D0\uC11C id\uB97C \uC9C1\uC811 \uC785\uB825\uD558\uAC70\uB098, \uC2E4\uD589 \uC911\uC778 Telegram \uCC44\uB110\uC744 \uC911\uC9C0\uD55C \uB4A4 setup\uC744 \uB2E4\uC2DC \uC2E4\uD589\uD558\uC138\uC694",
     "wizard.checking": "Telegram \uC124\uC815\uC744 \uC810\uAC80\uD558\uB294 \uC911\u2026",
     "wizard.telegramOk": "Telegram \uC900\uBE44 \uC644\uB8CC",
     "wizard.needed": "axterm\uC774 \uC544\uC9C1 \uC124\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.",
@@ -2780,6 +2820,25 @@ var init_setup_wizard = __esm(() => {
 });
 
 // packages/core/src/agent-resume.ts
+function repairPersistedResumeSource(profile, source) {
+  if (profile.id !== "omp" || source.agentSessionFile === undefined)
+    return source;
+  const file = source.agentSessionFile;
+  const lastSeparator = Math.max(file.lastIndexOf("/"), file.lastIndexOf("\\"));
+  if (lastSeparator < 0 || !file.slice(lastSeparator + 1).toLowerCase().endsWith(".jsonl"))
+    return source;
+  const parent = file.slice(0, lastSeparator);
+  const parentSeparator = Math.max(parent.lastIndexOf("/"), parent.lastIndexOf("\\"));
+  const parentName = parent.slice(parentSeparator + 1);
+  const match2 = OMP_SESSION_ID_SUFFIX.exec(parentName);
+  if (match2 === null)
+    return source;
+  return {
+    ...source,
+    agentSessionFile: `${parent}.jsonl`,
+    agentSessionId: match2[1]
+  };
+}
 function resumeReference(profile, source) {
   const reported = profile.resume?.ref === "sessionId" ? source.agentSessionId : source.agentSessionFile;
   if (reported !== undefined && reported.length > 0)
@@ -2831,9 +2890,10 @@ function buildResumeCommand(command, profile, reference) {
   const fragment = template.map((token) => token.replaceAll(REF, reference));
   return resume.form === "subcommand" ? [base[0], ...fragment, ...base.slice(1)] : [...base, ...fragment];
 }
-var REF = "{ref}", COMMAND_ALIASES;
+var REF = "{ref}", OMP_SESSION_ID_SUFFIX, COMMAND_ALIASES;
 var init_agent_resume = __esm(() => {
   init_agent_registry();
+  OMP_SESSION_ID_SUFFIX = /_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i;
   COMMAND_ALIASES = new Map(REGISTERED_AGENTS.flatMap((id) => {
     const profile = agentProfile(id);
     return profile.command === undefined ? [] : [[profile.command, id]];
@@ -3698,15 +3758,45 @@ function next(prev, state, now) {
     stateStartedAt: prev?.state === state ? prev.stateStartedAt : now
   };
 }
+function delegationSurface(event, subagentId) {
+  const done = event.event === "agent_end" || event.event === "agent_settled";
+  const prompt = event.prompt?.split(`
+`, 1)[0]?.trim().slice(0, MAX_DELEGATION_TITLE);
+  return {
+    event: "surface",
+    surface: {
+      class: "progress",
+      kind: "progress.delegation",
+      key: subagentId,
+      sourceEvent: event.event,
+      payload: {
+        scope: "delegation",
+        title: event.tool_name ?? (prompt !== undefined && prompt !== "" ? prompt : subagentId),
+        status: done ? "done" : "active"
+      }
+    }
+  };
+}
+function withoutConversationIdentity(event) {
+  if (event.session_id === undefined && event.session_file === undefined && event.session_name === undefined) {
+    return event;
+  }
+  const { session_id: _id, session_file: _file, session_name: _name, ...rest } = event;
+  return rest;
+}
 function withConversationId(events, identity) {
   const id = identity.sessionId;
   const subagent = identity.subagentId;
-  if (typeof id !== "string" || id === "" || typeof subagent === "string" && subagent !== "") {
-    return [...events];
+  if (typeof subagent === "string" && subagent !== "") {
+    return events.map((event) => LEAD_ONLY_EVENTS.has(event.event) ? delegationSurface(event, subagent) : withoutConversationIdentity(event));
   }
+  if (typeof id !== "string" || id === "")
+    return [...events];
   return events.map((event) => ({ session_id: id, ...event }));
 }
-function mayReplaceConversationIdentity(agentId, current, reported, event) {
+function mayReplaceConversationIdentity(agentId, current, reported, event, fromSubagent = false) {
+  if (fromSubagent)
+    return false;
   if (reported === current)
     return false;
   if (current === undefined)
@@ -3802,8 +3892,15 @@ function isAgentSendable(probe, now) {
     return probe.occupied;
   return now - probe.spawnedAt < BOOT_GRACE_MS;
 }
-var AGENT_ACTIVITY, WORKING_HOOK_STALE_MS = 30000, OUTPUT_QUIET_MS = 1e4, BOOT_GRACE_MS = 60000;
+var LEAD_ONLY_EVENTS, MAX_DELEGATION_TITLE = 80, AGENT_ACTIVITY, WORKING_HOOK_STALE_MS = 30000, OUTPUT_QUIET_MS = 1e4, BOOT_GRACE_MS = 60000;
 var init_agent_status = __esm(() => {
+  LEAD_ONLY_EVENTS = new Set([
+    "before_agent_start",
+    "agent_start",
+    "agent_settled",
+    "agent_end",
+    "message_end"
+  ]);
   AGENT_ACTIVITY = new Set([
     "agent_start",
     "before_agent_start",
@@ -3824,6 +3921,42 @@ var init_agent_status = __esm(() => {
   ]);
 });
 
+// packages/core/src/agent-passthrough.ts
+function parseAgentPassthrough(text) {
+  if (text.includes(`
+`) || text.includes("\r"))
+    return;
+  if (!text.startsWith("."))
+    return;
+  const rest = text.slice(1);
+  const match2 = /^([A-Za-z][A-Za-z0-9_.-]*)(\s.*)?$/.exec(rest);
+  if (!match2)
+    return;
+  const name = match2[1];
+  if (name.length > MAX_NAME)
+    return;
+  if (match2[2] === undefined && DOTFILE_NAMES.has(name.toLowerCase()))
+    return;
+  return { keystrokes: `/${rest}`, name };
+}
+var MAX_NAME = 32, DOTFILE_NAMES;
+var init_agent_passthrough = __esm(() => {
+  DOTFILE_NAMES = new Set([
+    "env",
+    "gitignore",
+    "gitattributes",
+    "npmrc",
+    "nvmrc",
+    "editorconfig",
+    "dockerignore",
+    "gitmodules",
+    "bashrc",
+    "zshrc",
+    "profile",
+    "tool-versions"
+  ]);
+});
+
 // packages/core/src/surface-policy.ts
 function resolveSurfacePolicy(agentId, kind, config) {
   const descriptor2 = SURFACE_DESCRIPTORS[kind];
@@ -4003,15 +4136,15 @@ function planMaterialisedPath(stagingDir, sessionId, remotePath) {
   let name = base.replace(/[\u0000-\u001f<>:"|?*]/g, "_").replace(/^\.+$/, "");
   if (name.length === 0)
     name = "file";
-  if (name.length > MAX_NAME) {
+  if (name.length > MAX_NAME2) {
     const dot = name.lastIndexOf(".");
     const ext = dot > 0 && name.length - dot <= 16 ? name.slice(dot) : "";
-    name = name.slice(0, MAX_NAME - ext.length) + ext;
+    name = name.slice(0, MAX_NAME2 - ext.length) + ext;
   }
   return `${stagingDir}/${sessionId}/${name}`;
 }
 var SCRATCH_DIR_NAME = ".axterm", SCRATCH_IGNORE_NAME = ".gitignore", SCRATCH_IGNORE_BODY = `*
-`, MAX_NAME = 120;
+`, MAX_NAME2 = 120;
 
 // packages/core/src/claude-hooks.ts
 function resultText(response) {
@@ -6654,6 +6787,7 @@ var init_src = __esm(() => {
   init_choice();
   init_agent_status();
   init_activity();
+  init_agent_passthrough();
   init_agent_surface();
   init_surface_policy();
   init_pty_protocol();
@@ -6747,14 +6881,20 @@ function renderSlackSurface(surface) {
       const progress = surface.payload.current !== undefined && surface.payload.total !== undefined ? ` (${surface.payload.current}/${surface.payload.total})` : "";
       const items = surface.payload.items?.map((item) => `${item.status === "done" ? "\u2611" : item.status === "active" ? "\u25B6" : "\u2022"} ${item.label}`).join(`
 `);
-      return `\uD83D\uDCCB **${surface.payload.title}**${progress}${items ? `
+      const glyph = surface.payload.status === undefined ? "\uD83D\uDCCB" : progressGlyph(surface.payload.status);
+      return `${glyph} **${surface.payload.title}**${progress}${items ? `
 ${items}` : ""}`;
     }
     case "activity":
       return `${surface.payload.isError ? "\u26A0\uFE0F" : "\uD83D\uDD27"} **${surface.payload.label}**${surface.payload.summary ? `
 ${surface.payload.summary}` : ""}`;
-    case "context":
+    case "context": {
+      if (surface.kind === "context.session" || surface.kind === "context.branch") {
+        const key2 = surface.payload.action === "branch" ? "agent.conversation.branch" : `agent.conversation.switch.${surface.payload.cause ?? "unknown"}`;
+        return `${t(key2)}${surface.payload.reason ? ` (${surface.payload.reason})` : ""}`;
+      }
       return `\uD83E\uDDED ${surface.payload.action}${surface.payload.reason ? ` \xB7 ${surface.payload.reason}` : ""}`;
+    }
     case "artifact":
       return `\uD83D\uDCCE ${surface.payload.name ?? surface.payload.path ?? surface.payload.url ?? "artifact"}${surface.payload.caption ? `
 ${surface.payload.caption}` : ""}${surface.payload.text ? `
@@ -7242,7 +7382,7 @@ ${screen}
         if (this.#secretPrompts.get(surface.sessionId) === surface.payload.seq) {
           this.#secretPrompts.delete(surface.sessionId);
         }
-        await this.#resolveFlow(surface.sessionId, surface.payload.seq);
+        await this.#resolveFlow(surface.sessionId, surface.payload.seq, surface.source.event === "conversation_change");
       } else {
         await this.#openFlow(surface);
       }
@@ -7401,15 +7541,19 @@ ${screen}
     if (ts)
       await this.api.updateMessage(this.config.channelId, ts, { text, blocks: [] });
   }
-  async#resolveFlow(sessionId, seq) {
+  async#resolveFlow(sessionId, seq, retracted) {
     const flow = this.#flows.get(sessionId);
     if (flow !== undefined && flow.seq !== seq)
       return;
     this.#flows.delete(sessionId);
-    if (flow?.messageTs)
-      await this.api.updateMessage(this.config.channelId, flow.messageTs, { text: t("dc.ask.resolvedElsewhere"), blocks: [] }).catch(() => {
+    if (flow?.messageTs) {
+      await this.api.updateMessage(this.config.channelId, flow.messageTs, {
+        text: t(retracted ? "dc.ask.conversationChanged" : "dc.ask.resolvedElsewhere"),
+        blocks: []
+      }).catch(() => {
         return;
       });
+    }
   }
   async#handleMessage(message) {
     if (message.channel !== this.config.channelId || message.bot_id || message.subtype || !message.user || !this.#allowedUsers.has(message.user) || !message.thread_ts)
@@ -7430,6 +7574,16 @@ ${screen}
       await this.#renderFlow(binding.sessionId);
       return;
     }
+    const passthrough = parseAgentPassthrough(message.text ?? "");
+    if (passthrough) {
+      this.host.write(binding.sessionId, passthrough.keystrokes);
+      this.#log(`session ${binding.sessionId} passthrough .${passthrough.name}`);
+      await this.#sendToSession(binding.sessionId, t("sl.passthrough.sent", {
+        command: passthrough.name,
+        screen: this.host.screen(binding.sessionId, RAW_SCREEN_LINES)
+      }));
+      return;
+    }
     const staged = [];
     if (this.config.inbound?.enabled) {
       for (const file of message.files ?? []) {
@@ -9012,14 +9166,20 @@ function renderDiscordSurface(surface) {
       const progress = surface.payload.current !== undefined && surface.payload.total !== undefined ? ` (${surface.payload.current}/${surface.payload.total})` : "";
       const items = surface.payload.items?.map((item) => `${item.status === "done" ? "\u2611" : item.status === "active" ? "\u25B6" : "\u2022"} ${item.label}`).join(`
 `);
-      return `\uD83D\uDCCB **${surface.payload.title}**${progress}${items ? `
+      const glyph = surface.payload.status === undefined ? "\uD83D\uDCCB" : progressGlyph(surface.payload.status);
+      return `${glyph} **${surface.payload.title}**${progress}${items ? `
 ${items}` : ""}`;
     }
     case "activity":
       return `${surface.payload.isError ? "\u26A0\uFE0F" : "\uD83D\uDD27"} **${surface.payload.label}**${surface.payload.summary ? `
 ${surface.payload.summary}` : ""}`;
-    case "context":
+    case "context": {
+      if (surface.kind === "context.session" || surface.kind === "context.branch") {
+        const key2 = surface.payload.action === "branch" ? "agent.conversation.branch" : `agent.conversation.switch.${surface.payload.cause ?? "unknown"}`;
+        return `${t(key2)}${surface.payload.reason ? ` (${surface.payload.reason})` : ""}`;
+      }
       return `\uD83E\uDDED ${surface.payload.action}${surface.payload.reason ? ` \xB7 ${surface.payload.reason}` : ""}`;
+    }
     case "artifact":
       return `\uD83D\uDCCE ${surface.payload.name ?? surface.payload.path ?? surface.payload.url ?? "artifact"}${surface.payload.caption ? `
 ${surface.payload.caption}` : ""}${surface.payload.text ? `
@@ -9243,9 +9403,9 @@ ${screen}
   }
   async onSurface(surface) {
     if (surface.class === "decision") {
-      if (surface.payload.state === "resolved")
-        await this.resolveFlow(surface.sessionId, surface.payload.seq);
-      else
+      if (surface.payload.state === "resolved") {
+        await this.resolveFlow(surface.sessionId, surface.payload.seq, surface.source.event === "conversation_change");
+      } else
         await this.openFlow(surface);
       return;
     }
@@ -9413,7 +9573,7 @@ ${screen}
       });
     }
   }
-  async resolveFlow(sessionId, seq) {
+  async resolveFlow(sessionId, seq, retracted) {
     const flow = this.flows.get(sessionId);
     const matchingFlow = flow?.seq === seq ? flow : undefined;
     if (matchingFlow !== undefined)
@@ -9423,7 +9583,7 @@ ${screen}
     const binding = this.host.findBindingBySession("discord", sessionId);
     if (matchingFlow?.messageId && binding) {
       await this.api.editMessage(binding.containerId, matchingFlow.messageId, {
-        content: t("dc.ask.resolvedElsewhere"),
+        content: t(retracted ? "dc.ask.conversationChanged" : "dc.ask.resolvedElsewhere"),
         components: []
       }).catch(() => {
         return;
@@ -9683,6 +9843,16 @@ ${screen}
       await this.handleAttachments(binding.sessionId, attachments, text);
       return;
     }
+    const passthrough = parseAgentPassthrough(message.content);
+    if (passthrough) {
+      this.host.write(binding.sessionId, passthrough.keystrokes);
+      this.log(`session ${binding.sessionId} passthrough .${passthrough.name}`);
+      await this.sendToSession(binding.sessionId, t("dc.passthrough.sent", {
+        command: passthrough.name,
+        screen: this.host.screen(binding.sessionId, RAW_SCREEN_LINES)
+      }));
+      return;
+    }
     if (text)
       await this.host.prompt(binding.sessionId, text);
   }
@@ -10915,6 +11085,10 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
   // how omp instantiates the module, which is why the PID guard above uses it\r
   // too.\r
   const LEAD_KEY = "AXTERM_LEAD_SESSION";\r
+  // Counts \`session_start\`s, not ids. The gate must distinguish "this build\r
+  // exposes no session ids" from "this event happens to have no id" \u2014 the\r
+  // count is what tells those apart (see isLeadSession).\r
+  const STARTS_KEY = "AXTERM_LEAD_STARTS";\r
 \r
   function sessionIdOf(ctx: unknown): string | undefined {\r
     const manager = (ctx as { sessionManager?: { getSessionId?: () => string } } | undefined)?.sessionManager;\r
@@ -10953,24 +11127,39 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
    * cannot begin before its parent, so first is the lead \u2014 and recording it\r
    * here rather than lazily on the first judgement matters: a subagent's\r
    * completion would otherwise be the first caller and crown itself.\r
+   *\r
+   * Only the FIRST start may crown. "First id-bearing start wins" let a\r
+   * subagent crown itself one step removed \u2014 the lead's start exposed no id,\r
+   * the subagent's did, and its settled then passed the gate as the lead.\r
+   * That is the operator's report (omp x telegram): the done message and the\r
+   * topic rename arrived while the lead was still working.\r
    */\r
   function rememberLead(ctx: unknown): void {\r
+    const starts = Number(process.env[STARTS_KEY] ?? "0") + 1;\r
+    process.env[STARTS_KEY] = String(starts);\r
     const id = sessionIdOf(ctx);\r
-    if (id === undefined) return;\r
-    if (!process.env[LEAD_KEY]) process.env[LEAD_KEY] = id;\r
+    if (starts === 1 && id !== undefined) process.env[LEAD_KEY] = id;\r
   }\r
 \r
   /**\r
-   * Fails OPEN twice over \u2014 no lead recorded, or no id on this event. A build\r
-   * that exposes neither must not lose its turn-end entirely, which would leave\r
-   * the session at \`working\` forever; the shutdown path makes the same choice\r
-   * (\xA74.42).\r
+   * Whether this event may claim the SESSION's lifecycle (turn start/end,\r
+   * prompt, reply). Two different unknowns meet here and must not be\r
+   * conflated \u2014 conflating them was the reported bug:\r
+   *\r
+   * - Lead id known: exact match only. An event with no id is not "probably\r
+   *   the lead", it is unidentified \u2014 a false \`done\` sends the message and\r
+   *   renames the topic, and nothing repairs that; a LATE turn end is what\r
+   *   stall forwarding (\xA74.75) exists for.\r
+   * - No lead id and ONE session started: this build exposes no ids and there\r
+   *   is nothing to confuse \u2014 fail open, or the session sits at \`working\`\r
+   *   forever; the shutdown path makes the same choice (\xA74.42).\r
+   * - No lead id and SEVERAL sessions started: any of them could be the one\r
+   *   finishing, so nobody may claim the turn end.\r
    */\r
   function isLeadSession(ctx: unknown): boolean {\r
     const lead = process.env[LEAD_KEY];\r
-    if (!lead) return true;\r
-    const id = sessionIdOf(ctx);\r
-    return id === undefined || id === lead;\r
+    if (lead) return sessionIdOf(ctx) === lead;\r
+    return Number(process.env[STARTS_KEY] ?? "0") <= 1;\r
   }\r
 \r
   /**\r
@@ -11069,12 +11258,8 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
   const activityQueue: Array<{ event: string; extra: Record<string, unknown> }> = [];\r
   let activityDropped = 0;\r
 \r
-  function postActivity(extra: Record<string, unknown>): void {\r
-    if (activityDropped > 0) {\r
-      extra["dropped"] = activityDropped;\r
-      activityDropped = 0;\r
-    }\r
-    activityQueue.push({ event: "activity", extra });\r
+  function enqueue(event: string, extra: Record<string, unknown>): void {\r
+    activityQueue.push({ event, extra });\r
     if (activityQueue.length > MAX_ACTIVITY_QUEUE) {\r
       activityQueue.shift();\r
       // Counted so the next item can admit the gap rather than hide it.\r
@@ -11082,18 +11267,42 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
     }\r
     drain();\r
   }\r
+\r
+  function postActivity(extra: Record<string, unknown>): void {\r
+    if (activityDropped > 0) {\r
+      extra["dropped"] = activityDropped;\r
+      activityDropped = 0;\r
+    }\r
+    enqueue("activity", extra);\r
+  }\r
 \r
   function postSurface(surface: Record<string, unknown>, immediate = false): void {\r
     if (immediate) {\r
       post("surface", { surface });\r
       return;\r
     }\r
-    activityQueue.push({ event: "surface", extra: { surface } });\r
-    if (activityQueue.length > MAX_ACTIVITY_QUEUE) {\r
-      activityQueue.shift();\r
-      activityDropped += 1;\r
-    }\r
-    drain();\r
+    enqueue("surface", { surface });\r
+  }\r
+\r
+  /**\r
+   * A subagent's lifecycle, labelled instead of dropped. Suppressing it was\r
+   * the first fix, and it traded one failure for another: a silent subagent\r
+   * looks like a hang (\xA74.51). So the event still goes out, but carrying the\r
+   * subagent's id under \`agent_id\` \u2014 the field claude already marks its\r
+   * subagents with and the daemon's delivery point keys on \u2014 so downstream it\r
+   * renders as delegation telemetry, never as the session's turn.\r
+   *\r
+   * Queued, not \`post()\`: the status slot is latest-only, so a subagent's end\r
+   * racing the lead's real turn-end would overwrite one or the other \u2014 either\r
+   * the delegation vanishes or the session never leaves \`working\`.\r
+   *\r
+   * No id means unidentified, not "subagent": an unlabelled \`agent_end\` IS\r
+   * the reported bug, so nothing is posted rather than something wrong.\r
+   */\r
+  function postDelegation(event: string, ctx: unknown, extra: Record<string, unknown> = {}): void {\r
+    const id = sessionIdOf(ctx);\r
+    if (id === undefined) return;\r
+    enqueue(event, { ...extra, agent_id: id });\r
   }\r
 \r
   async function postOnce(event: string, extra: Record<string, unknown>): Promise<void> {\r
@@ -11310,8 +11519,19 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
 \r
   /* ------------------------------ handlers ------------------------------ */\r
   pi.on("session_start", (_event, ctx) => {\r
-    // First one wins, and it decides who may end a turn from here on.\r
+    // \`rememberLead\` first: first-wins, and a subagent cannot begin before its\r
+    // parent, so the lead is decided here for every later judgement.\r
     rememberLead(ctx);\r
+    // Then the same rule as every other lead-only event (\xA74.114). This one was\r
+    // missed, and it is the one that carries identity: every AgentSession\r
+    // announced its own session_id and session_file, so a subagent's start\r
+    // could become the session's conversation and \`axterm resume\` reopened it.\r
+    // Labelled rather than dropped \u2014 the daemon strips a marked payload's\r
+    // identity and still renders the subagent as delegation.\r
+    if (!isLeadSession(ctx)) {\r
+      postDelegation("session_start", ctx);\r
+      return;\r
+    }\r
     post("session_start", sessionIdentityOf(ctx));\r
   });\r
 \r
@@ -11331,10 +11551,15 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
   });\r
 \r
   // Lead only: this sets the run's starting prompt, which the channel shows in\r
-  // the topic title. A subagent's own prompt is not what the operator asked.\r
+  // the topic title. A subagent's prompt is labelled instead \u2014 downstream it\r
+  // becomes the delegation surface's title, not the topic's.\r
   pi.on("before_agent_start", (event, ctx) => {\r
-    if (!isLeadSession(ctx)) return;\r
-    post("before_agent_start", { prompt: (event as { prompt?: string } | undefined)?.prompt ?? "" });\r
+    const prompt = (event as { prompt?: string } | undefined)?.prompt ?? "";\r
+    if (!isLeadSession(ctx)) {\r
+      postDelegation("before_agent_start", ctx, { prompt });\r
+      return;\r
+    }\r
+    post("before_agent_start", { prompt });\r
   });\r
 \r
   /* -------- completion: agent_settled preferred, isIdle fallback -------- */\r
@@ -11380,8 +11605,12 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
 \r
   // Lead only: a subagent starting is not the session's turn restarting, and\r
   // resetting \`endReported\` here on its behalf would arm a second completion.\r
+  // But it IS news (\xA74.51) \u2014 labelled, it marks the delegation active.\r
   pi.on("agent_start", (_event, ctx) => {\r
-    if (!isLeadSession(ctx)) return;\r
+    if (!isLeadSession(ctx)) {\r
+      postDelegation("agent_start", ctx);\r
+      return;\r
+    }\r
     clearPendingCheck();\r
     endReported = false;\r
     post("agent_start");\r
@@ -11625,9 +11854,16 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
 \r
   // Lead only, and this is the one the report was about: a finishing subagent\r
   // announced the turn as done and renamed the topic while the lead worked on.\r
+  // Labelled with its id, a subagent's end is delegation telemetry instead.\r
   pi.on("agent_settled", (_event, ctx) => {\r
-    if (!isLeadSession(ctx)) return;\r
+    // A build that emits agent_settled emits it for every AgentSession, so\r
+    // this is a build property: record it before the gate, or a subagent's\r
+    // settled would leave the isIdle fallback armed for a second end.\r
     settledSupported = true;\r
+    if (!isLeadSession(ctx)) {\r
+      postDelegation("agent_end", ctx);\r
+      return;\r
+    }\r
     clearPendingCheck();\r
     postEndOnce();\r
   });\r
@@ -11635,8 +11871,14 @@ export default function axtermAgentStatus(pi: PiLike): void {\r
   // The other route to a turn end, for builds without \`agent_settled\`. Gated the\r
   // same way, or a subagent whose own work is idle ends the session's turn.\r
   pi.on("agent_end", (_event, ctx) => {\r
-    if (!isLeadSession(ctx)) return;\r
     if (settledSupported) return;\r
+    if (!isLeadSession(ctx)) {\r
+      // No isIdle wait for a delegation: the single pending-check slot\r
+      // belongs to the lead's real turn, and a slightly early "done" on a\r
+      // delegation surface is cosmetic where a stolen slot is not.\r
+      postDelegation("agent_end", ctx);\r
+      return;\r
+    }\r
     const c = ctx as { isIdle?: () => boolean } | undefined;\r
     if (!c || typeof c.isIdle !== "function") {\r
       postEndOnce();\r
@@ -12308,10 +12550,12 @@ AXTERM_HOOK_TOKEN=${this.token}
       return;
     }
     res.writeHead(200).end();
-    try {
-      session.onEvent(payload);
-    } catch (err) {
-      log(`hook handler failed: ${String(err)}`);
+    for (const delivered of withConversationId([payload], { subagentId: payload.agent_id })) {
+      try {
+        session.onEvent(delivered);
+      } catch (err) {
+        log(`hook handler failed: ${String(err)}`);
+      }
     }
   }
   handleAsk(sessionId, askId, questions, _req, res) {
@@ -20532,6 +20776,60 @@ ${result.stderr}`);
       }
     });
   }
+  applyConversationChange(id, runtime, info, change) {
+    const previousId = runtime.mainAgentSessionId;
+    if (change.nextId !== undefined) {
+      runtime.mainAgentSessionId = change.nextId;
+      info.agentSessionId = change.nextId;
+      this.store.setAgentSessionId(id, change.nextId);
+    }
+    if (runtime.dialogOpen) {
+      this.publishSurface({
+        v: 1,
+        sessionId: id,
+        agentId: change.agentId,
+        class: "decision",
+        kind: `decision.${runtime.decisionKind ?? "ask"}`,
+        source: { transport: "extension", event: "conversation_change", authoritative: true },
+        payload: { state: "resolved", choiceKind: runtime.decisionKind ?? "ask", seq: runtime.choiceSeq }
+      });
+    }
+    runtime.choiceSeq += 1;
+    runtime.dialogOpen = false;
+    runtime.decisionKind = undefined;
+    this.pendingPrompt.delete(id);
+    runtime.entry = undefined;
+    runtime.stallReported = undefined;
+    runtime.telemetryReported = undefined;
+    runtime.antigravitySubagentActive = undefined;
+    clearTimeout(runtime.exitTimer);
+    runtime.exitTimer = undefined;
+    runtime.agentExited = false;
+    const action = change.event === "session_branch" ? "branch" : "switch";
+    log(`session ${info.shortId} conversation ${action}: ${previousId ?? "(none)"} -> ${change.nextId ?? "(unknown)"}`);
+    if (previousId === undefined)
+      return;
+    const cause = CONVERSATION_CHANGE_CAUSES.includes(change.reason ?? "") ? change.reason : undefined;
+    const detail2 = cause === undefined ? change.reason ?? change.nextId ?? change.nextFile : undefined;
+    this.publishSurface({
+      v: 1,
+      sessionId: id,
+      agentId: change.agentId,
+      class: "context",
+      kind: change.event === "session_branch" ? "context.branch" : "context.session",
+      key: "session",
+      source: {
+        transport: change.agentId === "omp" ? "extension" : "hook",
+        event: change.event,
+        authoritative: true
+      },
+      payload: {
+        action,
+        ...cause === undefined ? {} : { cause },
+        ...detail2 === undefined ? {} : { reason: detail2 }
+      }
+    });
+  }
   resolvePendingScreenDecision(id) {
     const session = this.live.get(id);
     const runtime = this.agentRuntime.get(id);
@@ -21425,37 +21723,20 @@ ${result.stderr}`);
     }
     const reportedId = fromAntigravitySubagent ? undefined : result.meta?.agentSessionId;
     const previousId = runtime.mainAgentSessionId;
-    const replacesId = reportedId !== undefined && mayReplaceConversationIdentity(agentId, previousId, reportedId, payload.event);
+    const replacesId = reportedId !== undefined && mayReplaceConversationIdentity(agentId, previousId, reportedId, payload.event, fromAntigravitySubagent);
     const explicitOmpChange = agentId === "omp" && (payload.event === "session_switch" || payload.event === "session_branch");
-    const acceptsFile = previousId === undefined || reportedId === previousId || replacesId || explicitOmpChange;
+    const acceptsFile = !fromAntigravitySubagent && (previousId === undefined || reportedId === previousId || replacesId || explicitOmpChange);
     if (result.meta?.agentSessionFile !== undefined && acceptsFile) {
       info.agentSessionFile = result.meta.agentSessionFile;
       this.store.setAgentSessionFile(id, result.meta.agentSessionFile);
     }
-    if (reportedId !== undefined && replacesId) {
-      runtime.mainAgentSessionId = reportedId;
-      info.agentSessionId = reportedId;
-      this.store.setAgentSessionId(id, reportedId);
-    }
-    if (previousId !== undefined && (reportedId !== undefined && replacesId || explicitOmpChange)) {
-      const action = payload.event === "session_branch" ? "branch" : "switch";
-      log(`session ${info.shortId} conversation ${action}: ${previousId} -> ${reportedId ?? "(unknown)"}`);
-      this.publishSurface({
-        v: 1,
-        sessionId: id,
+    if (reportedId !== undefined && replacesId || explicitOmpChange) {
+      this.applyConversationChange(id, runtime, info, {
         agentId,
-        class: "context",
-        kind: payload.event === "session_branch" ? "context.branch" : "context.session",
-        key: "session",
-        source: {
-          transport: agentId === "omp" ? "extension" : "hook",
-          event: payload.event,
-          authoritative: true
-        },
-        payload: {
-          action,
-          reason: payload.switch_reason ?? reportedId ?? result.meta?.agentSessionFile
-        }
+        event: payload.event,
+        ...reportedId !== undefined && replacesId ? { nextId: reportedId } : {},
+        ...payload.switch_reason === undefined ? {} : { reason: payload.switch_reason },
+        ...result.meta?.agentSessionFile === undefined ? {} : { nextFile: result.meta.agentSessionFile }
       });
     }
     if (agentId === "codex" && runtime.mainAgentSessionId !== undefined && payload.event !== "activity") {
@@ -21553,7 +21834,8 @@ ${result.stderr}`);
     if (this.live.has(stored.id))
       throw new AxtermError("err.session.running", { id: stored.shortId });
     const profile = agentProfile(agentIdFromCommand(stored.agentCommand));
-    const reference = resumeReference(profile, { ...stored, ownSessionId: stored.id });
+    const resumeSource = repairPersistedResumeSource(profile, { ...stored, ownSessionId: stored.id });
+    const reference = resumeReference(profile, resumeSource);
     if (reference === undefined) {
       throw new AxtermError("err.session.noConversation", {
         id: stored.shortId,
@@ -21566,7 +21848,20 @@ ${result.stderr}`);
     }
     if (!fs26.existsSync(stored.cwd))
       throw new AxtermError("err.session.cwdGone", { cwd: stored.cwd });
-    const info = { ...stored, agentCommand, state: "running" };
+    if (resumeSource.agentSessionFile !== undefined && resumeSource.agentSessionFile !== stored.agentSessionFile) {
+      this.store.setAgentSessionFile(stored.id, resumeSource.agentSessionFile);
+      log(`session ${stored.shortId} repaired OMP resume transcript to its parent conversation`);
+    }
+    if (resumeSource.agentSessionId !== undefined && resumeSource.agentSessionId !== stored.agentSessionId) {
+      this.store.setAgentSessionId(stored.id, resumeSource.agentSessionId);
+    }
+    const info = {
+      ...stored,
+      ...resumeSource.agentSessionFile === undefined ? {} : { agentSessionFile: resumeSource.agentSessionFile },
+      ...resumeSource.agentSessionId === undefined ? {} : { agentSessionId: resumeSource.agentSessionId },
+      agentCommand,
+      state: "running"
+    };
     delete info.exitCode;
     delete info.exitedAt;
     delete info.agentState;
@@ -22740,7 +23035,7 @@ class TelegramChannel {
       case "immediate":
         if (surface.class === "decision") {
           if (surface.payload.state === "resolved") {
-            await this.onChoiceResolved(surface.sessionId, surface.payload.seq);
+            await this.onChoiceResolved(surface.sessionId, surface.payload.seq, surface.source.event === "conversation_change");
           } else if (surface.payload.choiceKind === "shellPrompt") {
             await this.onShellPrompt(surface.sessionId, surface.payload.seq, surface.payload.shellPrompt);
           } else {
@@ -22748,6 +23043,8 @@ class TelegramChannel {
           }
         } else if (surface.class === "notice") {
           await this.onNotice(surface);
+        } else if (surface.class === "context") {
+          await this.onConversationChange(surface);
         }
         return;
       case "snapshot":
@@ -22777,6 +23074,11 @@ class TelegramChannel {
     const retryMs = surface.payload.retryAt === undefined ? surface.payload.durationMs : Math.max(0, surface.payload.retryAt - Date.now());
     await this.onAgentError(surface.sessionId, kind, surface.payload.detail, retryMs, surface.id);
   }
+  async onConversationChange(surface) {
+    const key2 = surface.payload.action === "branch" ? "agent.conversation.branch" : `agent.conversation.switch.${surface.payload.cause ?? "unknown"}`;
+    const detail2 = surface.payload.reason;
+    await this.sendToSession(surface.sessionId, tHtml(key2) + (detail2 === undefined ? "" : ` (${code(detail2)})`));
+  }
   bufferDigest(surface) {
     const settings = this.deliverySettings;
     let digest = this.digests.get(surface.sessionId);
@@ -22842,7 +23144,8 @@ class TelegramChannel {
         return;
       const lines = [...snapshot2.items.values()].map((surface) => {
         const text = surface.class === "progress" ? surface.payload.title : surface.class === "state" ? `${surface.payload.name}: ${String(surface.payload.value)}` : surface.class === "context" ? `${surface.payload.action}${surface.payload.reason ? `: ${surface.payload.reason}` : ""}` : surface.kind;
-        return `\uD83D\uDCCC ${clipText(text, settings.maxChars)}`;
+        const glyph = progressGlyph(surface.class === "progress" ? surface.payload.status : undefined);
+        return `${glyph} ${clipText(text, settings.maxChars)}`;
       });
       this.snapshots.delete(sessionId);
       const body = clipText(lines.join(`
@@ -23028,7 +23331,7 @@ ${t("tg.status.inferred")}` : "");
 ${code(prompt.line)}`);
       return;
     }
-    await this.api.call("sendMessage", {
+    const sent = await this.api.call("sendMessage", {
       chat_id: binding.chatId,
       message_thread_id: binding.topicId,
       parse_mode: "HTML",
@@ -23043,7 +23346,9 @@ ${code(prompt.line)}`,
         ]
       }
     });
+    this.promptKeyboards.set(sessionId, { seq, messageId: sent.message_id });
   }
+  promptKeyboards = new Map;
   awaitingSecret = new Map;
   async captureSecret(sessionId, msg, text) {
     const seq = this.awaitingSecret.get(sessionId);
@@ -23108,12 +23413,13 @@ ${code(prompt.line)}`,
     }
     if (extras.length > 0)
       rows2.push(extras);
-    await this.api.call("sendMessage", {
+    const sent = await this.api.call("sendMessage", {
       chat_id: binding.chatId,
       message_thread_id: binding.topicId,
       text: t("tg.ask.question", { question: question.question, progress }) + (question.multi ? t("tg.ask.multiHint") : ""),
       reply_markup: { inline_keyboard: rows2 }
     });
+    flow.messageId = sent.message_id;
   }
   async finishFlow(sessionId, flow, binding) {
     const summary = flow.questions.map((q, i) => {
@@ -23133,7 +23439,7 @@ ${code(prompt.line)}`,
       return;
     }
     if (flow.questions.length > 1) {
-      await this.api.call("sendMessage", {
+      const sent = await this.api.call("sendMessage", {
         chat_id: binding.chatId,
         message_thread_id: binding.topicId,
         text: t("tg.ask.review", { summary }),
@@ -23141,11 +23447,29 @@ ${code(prompt.line)}`,
           inline_keyboard: [[{ text: t("tg.ask.submit"), callback_data: encodeSubmitCallback(flow.shortId, flow.seq) }]]
         }
       });
+      flow.messageId = sent.message_id;
     }
   }
-  async onChoiceResolved(sessionId, seq) {
-    if (this.flows.get(sessionId)?.seq === seq)
+  async onChoiceResolved(sessionId, seq, retracted) {
+    const messageIds = [];
+    const flow = this.flows.get(sessionId);
+    if (flow?.seq === seq) {
       this.flows.delete(sessionId);
+      if (flow.messageId !== undefined)
+        messageIds.push(flow.messageId);
+    }
+    const prompt = this.promptKeyboards.get(sessionId);
+    if (prompt?.seq === seq) {
+      this.promptKeyboards.delete(sessionId);
+      messageIds.push(prompt.messageId);
+    }
+    const binding = this.control.findBindingBySession(sessionId);
+    if (!binding)
+      return;
+    for (const messageId of messageIds) {
+      const edit = retracted ? this.api.call("editMessageText", { chat_id: binding.chatId, message_id: messageId, text: t("dc.ask.conversationChanged") }) : this.api.call("editMessageReplyMarkup", { chat_id: binding.chatId, message_id: messageId, reply_markup: { inline_keyboard: [] } });
+      await edit.catch(() => {});
+    }
   }
   async onAgentError(sessionId, kind, error, retryMs, surfaceId) {
     const reason = clipText(error, AGENT_ERROR_CHARS);
@@ -23299,6 +23623,16 @@ ${code(prompt.line)}`,
       return;
     if (await this.captureFreeText(binding.sessionId, text))
       return;
+    const passthrough = parseAgentPassthrough(msg.text ?? "");
+    if (passthrough) {
+      this.control.write(binding.sessionId, passthrough.keystrokes);
+      this.log(`session ${binding.sessionId} passthrough .${passthrough.name}`);
+      await this.sendToSession(binding.sessionId, tHtml("tg.passthrough.sent", {
+        command: passthrough.name,
+        screen: this.control.screen(binding.sessionId, RAW_SCREEN_LINES)
+      }));
+      return;
+    }
     const chatId = msg.chat.id;
     await this.react(chatId, msg.message_id, "received");
     try {
@@ -25622,19 +25956,19 @@ function readLine(secret) {
     stdin.on("data", onData);
   });
 }
-function renderPrompt(state) {
-  stdout.write(`
+function renderPrompt(state, write) {
+  write(`
 ${bold(t(state.promptKey))}
 `);
   if (state.choices) {
     for (const [index, choice2] of state.choices.entries()) {
       const marker = choice2 === state.default ? green("\u25CF") : "\u25CB";
-      stdout.write(`  ${marker} ${index + 1}) ${choice2}
+      write(`  ${marker} ${index + 1}) ${choice2}
 `);
     }
   }
   const hint = state.default.length > 0 ? dim(` [${state.default}]`) : "";
-  stdout.write(`${dim("\u203A")}${hint} `);
+  write(`${dim("\u203A")}${hint} `);
 }
 function interpret(state, input) {
   if (!state.choices)
@@ -25645,44 +25979,85 @@ function interpret(state, input) {
   }
   return input;
 }
-function renderReview(state) {
-  stdout.write(`
+function renderReview(state, write) {
+  write(`
 ${bold(t("wizard.review.header"))}
 `);
   for (const [key, value] of Object.entries(state.answers)) {
     const shown = key === "telegramToken" ? `${value.slice(0, 4)}\u2026` : value;
-    stdout.write(`  ${key.padEnd(16)} ${shown}
+    write(`  ${key.padEnd(16)} ${shown}
 `);
   }
 }
-async function runSetup(client, current = DEFAULT_CONFIG) {
-  stdout.write(`${bold("axterm setup")}
+function telegramDiscoveryLines(found) {
+  const lines = [];
+  if (found.chats.length > 0) {
+    lines.push(t("cli.telegram.discoverChats"));
+    for (const chat of found.chats) {
+      const marks = [chat.type, chat.isForum ? undefined : t("cli.telegram.topicsOff")].filter((mark) => mark !== undefined).join(" \u2014 ");
+      lines.push(`  ${String(chat.id).padEnd(16)} ${(chat.title ?? "").padEnd(24)} ${marks}`);
+    }
+  } else {
+    lines.push(t("cli.telegram.discoverNone"), t("cli.telegram.discoverHint"));
+  }
+  if (found.users.length > 0) {
+    lines.push(t("cli.telegram.discoverUsers"));
+    for (const user of found.users) {
+      const label = [user.username !== undefined ? `@${user.username}` : undefined, user.name].filter((part) => part !== undefined).join(" ");
+      lines.push(`  ${String(user.id).padEnd(16)} ${label}`);
+    }
+  }
+  return lines;
+}
+async function runSetup(client, current = DEFAULT_CONFIG, injectedIO) {
+  const io = injectedIO ?? {
+    hostname: os2.hostname().split(".")[0] ?? "",
+    readLine,
+    write: (text) => stdout.write(text)
+  };
+  io.write(`${bold("axterm setup")}
 ${dim(t("wizard.intro"))}
 `);
-  let state = startWizard(current, os2.hostname().split(".")[0] ?? "");
+  let state = startWizard(current, io.hostname);
   for (;; ) {
     if (state.kind === "review") {
-      renderReview(state);
-      stdout.write(`
+      renderReview(state, io.write);
+      io.write(`
 ${bold(t(state.promptKey))} ${dim("[yes]")} `);
-      const confirm = (await readLine(false)).trim().toLowerCase();
+      const confirm = (await io.readLine(false)).trim().toLowerCase();
       if (confirm.length > 0 && !["y", "yes"].includes(confirm)) {
-        stdout.write(`${dim(t("wizard.cancelled"))}
+        io.write(`${dim(t("wizard.cancelled"))}
 `);
         return { saved: false };
       }
       break;
     }
-    renderPrompt(state);
-    const answer = interpret(state, await readLine(state.secret));
+    renderPrompt(state, io.write);
+    const answer = interpret(state, await io.readLine(state.secret));
     const result = advance(state, answer);
     if ("error" in result) {
-      stdout.write(`  ${red("\u2717")} ${t(result.error)}
+      io.write(`  ${red("\u2717")} ${t(result.error)}
 `);
       continue;
     }
     if ("done" in result)
       break;
+    if (state.step === "telegramToken" && result.state.step === "telegramGroup") {
+      io.write(`${dim(t("wizard.telegramDiscovering"))}
+`);
+      try {
+        const found = await client.call("telegram.discover", {
+          botToken: result.state.answers["telegramToken"]
+        });
+        for (const line of telegramDiscoveryLines(found))
+          io.write(`${line}
+`);
+      } catch (error) {
+        const detail2 = error instanceof Error ? error.message : String(error);
+        io.write(`${red("\u2717")} ${t("wizard.telegramDiscoverFailed", { error: detail2 })}
+`);
+      }
+    }
     state = result.state;
     if (state.answers["locale"] !== undefined)
       setLocale(state.answers["locale"]);
@@ -25696,19 +26071,19 @@ ${bold(t(state.promptKey))} ${dim("[yes]")} `);
   for (const [path4, value] of finished.done.secrets) {
     await client.call("config.set", { path: path4, value });
   }
-  stdout.write(`
+  io.write(`
 ${green("\u2713")} ${t("wizard.saved")}
 `);
   if (finished.done.settings.some(([k, v]) => k === "channels.telegram.enabled" && v === "true")) {
-    stdout.write(`${dim(t("wizard.checking"))}
+    io.write(`${dim(t("wizard.checking"))}
 `);
     const report = await client.call("telegram.doctor");
     if (report.ok)
-      stdout.write(`${green("\u2713")} ${t("wizard.telegramOk")}
+      io.write(`${green("\u2713")} ${t("wizard.telegramOk")}
 `);
     else
       for (const problem of report.problems)
-        stdout.write(`${red("\u2717")} ${problem}
+        io.write(`${red("\u2717")} ${problem}
 `);
   }
   return { saved: true };
@@ -26452,7 +26827,7 @@ import { stdin as stdin2, stdout as stdout2 } from "process";
 // packages/cli/package.json
 var package_default = {
   name: "@layorixinc/axterm",
-  version: "0.7.0",
+  version: "0.8.0",
   type: "module",
   bin: {
     axterm: "dist/cli.js"
@@ -28978,23 +29353,8 @@ async function main2() {
           const found = await client.call("telegram.discover", {
             ...token !== undefined ? { botToken: token } : {}
           });
-          if (found.chats.length > 0) {
-            console.log(t("cli.telegram.discoverChats"));
-            for (const chat of found.chats) {
-              const marks = [chat.type, chat.isForum ? undefined : t("cli.telegram.topicsOff")].filter((m) => m !== undefined).join(" \u2014 ");
-              console.log(`  ${String(chat.id).padEnd(16)} ${(chat.title ?? "").padEnd(24)} ${marks}`);
-            }
-          } else {
-            console.log(t("cli.telegram.discoverNone"));
-            console.log(t("cli.telegram.discoverHint"));
-          }
-          if (found.users.length > 0) {
-            console.log(t("cli.telegram.discoverUsers"));
-            for (const user of found.users) {
-              const label = [user.username !== undefined ? `@${user.username}` : undefined, user.name].filter((part) => part !== undefined).join(" ");
-              console.log(`  ${String(user.id).padEnd(16)} ${label}`);
-            }
-          }
+          for (const line of telegramDiscoveryLines(found))
+            console.log(line);
         } else {
           throw new Error(t("cli.usage.telegram"));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layorixinc/axterm",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "bin": {
     "axterm": "dist/cli.js"