chatroom-cli 1.58.4 → 1.58.6

package/dist/index.js

@@ -28962,6 +28962,23 @@ var init_commandcode = __esm(() => {
   init_command_code_agent_service();
 });
 
+// src/infrastructure/services/remote-agents/wire-native-stream-adapter.ts
+function wireNativeStreamAdapter(args2) {
+  args2.adapter.setAssistantTextCapture((text) => {
+    for (const cb of args2.assistantTextCallbacks)
+      cb(text);
+  });
+  args2.adapter.onOutput(() => {
+    args2.entry.lastOutputAt = Date.now();
+    for (const cb of args2.outputCallbacks)
+      cb();
+  });
+  args2.adapter.onAgentEnd(() => {
+    for (const cb of args2.agentEndCallbacks)
+      cb();
+  });
+}
+
 // src/infrastructure/services/remote-agents/cursor-sdk/cursor-models.ts
 function resolveCursorSdkModel(model) {
   const prefix = `${CURSOR_PROVIDER2}/`;
@@ -29086,103 +29103,132 @@ function closeCursorAgentOnFailure(agent, session2, exitCode, force = false) {
   } catch {}
 }
 
-// src/infrastructure/services/remote-agents/cursor-sdk/cursor-sdk-stream-adapter.ts
-class CursorSdkStreamAdapter {
+// src/infrastructure/services/remote-agents/assistant-text-capture.ts
+function createAssistantTextCapture() {
+  let onAssistantText;
+  return {
+    setAssistantTextCapture(cb) {
+      onAssistantText = cb;
+    },
+    captureAssistantText(text) {
+      onAssistantText?.(text);
+    }
+  };
+}
+
+// src/infrastructure/services/remote-agents/native-stream-adapter-base.ts
+class NativeStreamAdapterBase {
   logPrefix;
   emitLogLine;
   agentEndCallbacks = [];
   outputCallbacks = [];
   agentEndEmitted = false;
-  textBuffer = "";
+  assistantTextCapture = createAssistantTextCapture();
   constructor(logPrefix, emitLogLine) {
     this.logPrefix = logPrefix;
     this.emitLogLine = emitLogLine;
   }
+  setAssistantTextCapture(cb) {
+    this.assistantTextCapture.setAssistantTextCapture(cb);
+  }
   onAgentEnd(cb) {
     this.agentEndCallbacks.push(cb);
   }
   onOutput(cb) {
     this.outputCallbacks.push(cb);
   }
-  handleMessage(message) {
-    this.notifyOutput();
-    switch (message.type) {
-      case "assistant":
-        this.handleAssistant(message);
-        break;
-      case "tool_call": {
-        this.flushText();
-        const bashCmd = extractBashCommandFromToolInput(message.name, message.args);
-        if (bashCmd !== null) {
-          this.writeLine(formatAgentLogLine(this.logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd)));
+  notifyOutput() {
+    for (const cb of this.outputCallbacks)
+      cb();
+  }
+  writeLine(line) {
+    this.emitLogLine?.(line);
+  }
+}
+var init_native_stream_adapter_base = () => {};
+
+// src/infrastructure/services/remote-agents/cursor-sdk/cursor-sdk-stream-adapter.ts
+var CursorSdkStreamAdapter;
+var init_cursor_sdk_stream_adapter = __esm(() => {
+  init_native_stream_adapter_base();
+  CursorSdkStreamAdapter = class CursorSdkStreamAdapter extends NativeStreamAdapterBase {
+    textBuffer = "";
+    handleMessage(message) {
+      this.notifyOutput();
+      switch (message.type) {
+        case "assistant":
+          this.handleAssistant(message);
+          break;
+        case "tool_call": {
+          this.flushText();
+          const bashCmd = extractBashCommandFromToolInput(message.name, message.args);
+          if (bashCmd !== null) {
+            this.writeLine(formatAgentLogLine(this.logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd)));
+            break;
+          }
+          this.writeLine(formatAgentLogLine(this.logPrefix, `tool: ${message.call_id} ${message.name} ${JSON.stringify({ status: message.status, args: message.args })}`));
           break;
         }
-        this.writeLine(formatAgentLogLine(this.logPrefix, `tool: ${message.call_id} ${message.name} ${JSON.stringify({ status: message.status, args: message.args })}`));
-        break;
+        case "status":
+          this.writeLine(formatAgentLogLine(this.logPrefix, `status: ${message.status}`));
+          break;
+        case "thinking":
+          this.writeLine(formatAgentLogLine(this.logPrefix, "thinking", message.text));
+          break;
+        case "system":
+          if (message.subtype === "init") {
+            this.writeLine(formatAgentLogLine(this.logPrefix, "system: init"));
+          }
+          break;
+        default:
+          break;
       }
-      case "status":
-        this.writeLine(formatAgentLogLine(this.logPrefix, `status: ${message.status}`));
-        break;
-      case "thinking":
-        this.writeLine(formatAgentLogLine(this.logPrefix, "thinking", message.text));
-        break;
-      case "system":
-        if (message.subtype === "init") {
-          this.writeLine(formatAgentLogLine(this.logPrefix, "system: init"));
-        }
-        break;
-      default:
-        break;
     }
-  }
-  flushPendingOutput() {
-    this.flushText();
-  }
-  finish() {
-    this.flushText();
-    this.emitAgentEnd();
-  }
-  handleAssistant(message) {
-    for (const block of message.message.content) {
-      if (block.type === "text") {
-        this.textBuffer += block.text;
-        if (this.textBuffer.includes(`
+    flushPendingOutput() {
+      this.flushText();
+    }
+    finish() {
+      this.flushText();
+      this.emitAgentEnd();
+    }
+    handleAssistant(message) {
+      for (const block of message.message.content) {
+        if (block.type === "text") {
+          this.textBuffer += block.text;
+          this.assistantTextCapture.captureAssistantText(block.text);
+          if (this.textBuffer.includes(`
 `)) {
-          this.flushText();
+            this.flushText();
+          }
         }
       }
     }
-  }
-  flushText() {
-    if (!this.textBuffer)
-      return;
-    for (const line of this.textBuffer.split(`
+    flushText() {
+      if (!this.textBuffer)
+        return;
+      for (const line of this.textBuffer.split(`
 `)) {
-      if (line)
-        this.writeLine(formatAgentLogLine(this.logPrefix, "text", line));
+        if (line)
+          this.writeLine(formatAgentLogLine(this.logPrefix, "text", line));
+      }
+      this.textBuffer = "";
     }
-    this.textBuffer = "";
-  }
-  emitAgentEnd() {
-    if (this.agentEndEmitted)
-      return;
-    this.agentEndEmitted = true;
-    this.flushText();
-    this.writeLine(formatAgentLogLine(this.logPrefix, "agent_end"));
-    for (const cb of this.agentEndCallbacks)
-      cb();
-  }
-  writeLine(formatted) {
-    process.stdout.write(`${formatted}
+    emitAgentEnd() {
+      if (this.agentEndEmitted)
+        return;
+      this.agentEndEmitted = true;
+      this.flushText();
+      this.writeLine(formatAgentLogLine(this.logPrefix, "agent_end"));
+      for (const cb of this.agentEndCallbacks)
+        cb();
+    }
+    writeLine(formatted) {
+      process.stdout.write(`${formatted}
 `);
-    this.emitLogLine?.(formatted);
-  }
-  notifyOutput() {
-    for (const cb of this.outputCallbacks)
-      cb();
-  }
-}
-var init_cursor_sdk_stream_adapter = () => {};
+      this.emitLogLine?.(formatted);
+    }
+  };
+});
 
 // src/infrastructure/services/remote-agents/with-timeout.ts
 async function withTimeout(p, ms, label) {
@@ -29453,6 +29499,7 @@ ${options.prompt}`;
       const outputCallbacks = [];
       const agentEndCallbacks = [];
       const logLineCallbacks = [];
+      const assistantTextCallbacks = [];
       const emitLogLine = (line) => {
         for (const cb of logLineCallbacks)
           cb(line);
@@ -29477,6 +29524,7 @@ ${options.prompt}`;
         finishExit,
         outputCallbacks,
         agentEndCallbacks,
+        assistantTextCallbacks,
         emitLogLine
       });
       return {
@@ -29497,6 +29545,9 @@ ${options.prompt}`;
         },
         onLogLine: (cb) => {
           logLineCallbacks.push(cb);
+        },
+        onAssistantText: (cb) => {
+          assistantTextCallbacks.push(cb);
         }
       };
     }
@@ -29512,6 +29563,7 @@ ${options.prompt}`;
         entry,
         outputCallbacks,
         agentEndCallbacks,
+        assistantTextCallbacks,
         emitLogLine
       } = args2;
       let exited = false;
@@ -29549,14 +29601,12 @@ ${deferredResume}` : deferredResume;
               session2.run = run3;
               isFirstTurn = false;
               const adapter = new CursorSdkStreamAdapter(logPrefix, emitLogLine);
-              adapter.onOutput(() => {
-                entry.lastOutputAt = Date.now();
-                for (const cb of outputCallbacks)
-                  cb();
-              });
-              adapter.onAgentEnd(() => {
-                for (const cb of agentEndCallbacks)
-                  cb();
+              wireNativeStreamAdapter({
+                adapter,
+                assistantTextCallbacks,
+                outputCallbacks,
+                agentEndCallbacks,
+                entry
               });
               try {
                 for await (const message of run3.stream()) {
@@ -31920,8 +31970,10 @@ function startSessionEventForwarder(client4, options) {
   }
   async function handleTextPartUpdate(props, part) {
     const chunk2 = resolvePartContent(props?.delta, part.text);
-    if (chunk2)
+    if (chunk2) {
+      options.onAssistantText?.(chunk2);
       logLine(target, "text", chunk2);
+    }
   }
   async function handleReasoningPartUpdate(props, part) {
     const chunk2 = resolvePartContent(props?.delta, part.text);
@@ -32187,6 +32239,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
   init_terminal_provider_error();
   OpenCodeSdkAgentService = class OpenCodeSdkAgentService extends OpenCodeBinaryAgentService {
     agentEndCallbacksByPid = new Map;
+    assistantTextCallbacksByPid = new Map;
     id = "opencode-sdk";
     displayName = "OpenCode (SDK)";
     listModelsHarnessId = "opencode-sdk";
@@ -32312,6 +32365,9 @@ var init_opencode_sdk_agent_service = __esm(() => {
       const entry = this.registerProcess(pid, context5);
       if (forwarder)
         this.forwarders.set(pid, forwarder);
+      if (args2.assistantTextCallbacks) {
+        this.assistantTextCallbacksByPid.set(pid, args2.assistantTextCallbacks);
+      }
       const outputCallbacks = args2.outputCallbacks ?? [];
       this.wireChildOutput(childProcess, pid, entry, emitLogLine, outputCallbacks);
       return {
@@ -32330,6 +32386,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
             }
             this.sessionStore.remove(sessionId);
             this.agentEndCallbacksByPid.delete(pid);
+            this.assistantTextCallbacksByPid.delete(pid);
             this.deleteProcess(pid);
             cb({ code: code2, signal, context: context5 });
           });
@@ -32345,6 +32402,11 @@ var init_opencode_sdk_agent_service = __esm(() => {
         },
         onLogLine: (cb) => {
           logLineCallbacks.push(cb);
+        },
+        onAssistantText: (cb) => {
+          const callbacks = this.assistantTextCallbacksByPid.get(pid) ?? args2.assistantTextCallbacks ?? [];
+          callbacks.push(cb);
+          this.assistantTextCallbacksByPid.set(pid, callbacks);
         }
       };
     }
@@ -32358,6 +32420,16 @@ var init_opencode_sdk_agent_service = __esm(() => {
         }
       };
     }
+    createAssistantTextEmitter() {
+      const assistantTextCallbacks = [];
+      return {
+        assistantTextCallbacks,
+        emitAssistantText: (text) => {
+          for (const cb of assistantTextCallbacks)
+            cb(text);
+        }
+      };
+    }
     async startServeAndClient(workingDir, resolvedConvexUrl) {
       const childProcess = this.spawnServeProcess(workingDir, resolvedConvexUrl);
       const pid = childProcess.pid;
@@ -32406,7 +32478,12 @@ var init_opencode_sdk_agent_service = __esm(() => {
       const newSessionId2 = sessionCreateResult.data.id;
       const forwarder = startSessionEventForwarder(client4, {
         sessionId: newSessionId2,
-        role: args2.context.role
+        role: args2.context.role,
+        onAssistantText: (text) => {
+          const callbacks2 = this.assistantTextCallbacksByPid.get(args2.pid) ?? [];
+          for (const cb of callbacks2)
+            cb(text);
+        }
       });
       const callbacks = this.agentEndCallbacksByPid.get(args2.pid) ?? [];
       for (const cb of callbacks) {
@@ -32442,6 +32519,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
       const { childProcess, pid, baseUrl, client: client4 } = await this.startServeAndClient(workingDir, options.resolvedConvexUrl);
       let forwarder;
       const { logLineCallbacks, emitLogLine } = this.createLogLineEmitter();
+      const { assistantTextCallbacks, emitAssistantText } = this.createAssistantTextEmitter();
       const outputCallbacks = [];
       try {
         const sessionInfo = await withTimeout(client4.session.get({ path: { id: sessionId } }), SESSION_GET_TIMEOUT_MS, "session.get");
@@ -32452,6 +32530,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
           sessionId,
           role: context5.role,
           onLogLine: emitLogLine,
+          onAssistantText: emitAssistantText,
           onActivity: () => {
             for (const cb of outputCallbacks)
               cb();
@@ -32483,6 +32562,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
         model: modelForSession,
         workingDir,
         logLineCallbacks,
+        assistantTextCallbacks,
         outputCallbacks
       });
     }
@@ -32495,6 +32575,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
       let agentName;
       let deferredSystemPrompt;
       const { logLineCallbacks, emitLogLine } = this.createLogLineEmitter();
+      const { assistantTextCallbacks, emitAssistantText } = this.createAssistantTextEmitter();
       const outputCallbacks = [];
       try {
         const sessionCreateResult = await withTimeout(client4.session.create({ body: {} }), SESSION_CREATE_TIMEOUT_MS, "session.create");
@@ -32506,6 +32587,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
           sessionId,
           role: context5.role,
           onLogLine: emitLogLine,
+          onAssistantText: emitAssistantText,
           onActivity: () => {
             for (const cb of outputCallbacks)
               cb();
@@ -32545,6 +32627,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
         model,
         workingDir: options.workingDir,
         logLineCallbacks,
+        assistantTextCallbacks,
         deferredSystemPrompt,
         outputCallbacks
       });
@@ -32704,126 +32787,111 @@ var init_pi_sdk_package = __esm(() => {
 });
 
 // src/infrastructure/services/remote-agents/pi-sdk/pi-sdk-stream-adapter.ts
-class PiSdkStreamAdapter {
-  logPrefix;
-  emitLogLine;
-  agentEndCallbacks = [];
-  outputCallbacks = [];
-  agentEndEmitted = false;
-  textBuffer = "";
-  thinkingBuffer = "";
-  constructor(logPrefix, emitLogLine) {
-    this.logPrefix = logPrefix;
-    this.emitLogLine = emitLogLine;
-  }
-  onAgentEnd(cb) {
-    this.agentEndCallbacks.push(cb);
-  }
-  onOutput(cb) {
-    this.outputCallbacks.push(cb);
-  }
-  handleEvent(event) {
-    this.notifyOutput();
-    switch (event.type) {
-      case "message_update": {
-        const assistantEvent = event.assistantMessageEvent;
-        if (assistantEvent.type === "text_delta") {
-          this.appendText(assistantEvent.delta);
-        } else if (assistantEvent.type === "thinking_delta") {
-          this.appendThinking(assistantEvent.delta);
+var PiSdkStreamAdapter;
+var init_pi_sdk_stream_adapter = __esm(() => {
+  init_native_stream_adapter_base();
+  PiSdkStreamAdapter = class PiSdkStreamAdapter extends NativeStreamAdapterBase {
+    textBuffer = "";
+    thinkingBuffer = "";
+    handleEvent(event) {
+      this.notifyOutput();
+      switch (event.type) {
+        case "message_update": {
+          const assistantEvent = event.assistantMessageEvent;
+          if (assistantEvent.type === "text_delta") {
+            this.appendText(assistantEvent.delta);
+          } else if (assistantEvent.type === "thinking_delta") {
+            this.appendThinking(assistantEvent.delta);
+          }
+          break;
         }
-        break;
-      }
-      case "tool_execution_start": {
-        this.flushText();
-        this.flushThinking();
-        const bashCmd = resolveBashCommandForLog(event.toolName, event.args);
-        if (bashCmd !== null) {
-          this.writeLine(formatAgentLogLine(this.logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd)));
+        case "tool_execution_start": {
+          this.flushText();
+          this.flushThinking();
+          const bashCmd = resolveBashCommandForLog(event.toolName, event.args);
+          if (bashCmd !== null) {
+            this.writeLine(formatAgentLogLine(this.logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd)));
+            break;
+          }
+          const argsStr = event.args != null ? ` args: ${JSON.stringify(event.args)}` : "";
+          this.writeLine(formatAgentLogLine(this.logPrefix, "tool", `${event.toolName}${argsStr}`));
           break;
         }
-        const argsStr = event.args != null ? ` args: ${JSON.stringify(event.args)}` : "";
-        this.writeLine(formatAgentLogLine(this.logPrefix, "tool", `${event.toolName}${argsStr}`));
-        break;
-      }
-      case "tool_execution_end": {
-        const resultStr = typeof event.result === "string" ? event.result : JSON.stringify(event.result);
-        this.writeLine(formatAgentLogLine(this.logPrefix, "tool_result", `${event.toolName} result: ${resultStr}`));
-        break;
+        case "tool_execution_end": {
+          const resultStr = typeof event.result === "string" ? event.result : JSON.stringify(event.result);
+          this.writeLine(formatAgentLogLine(this.logPrefix, "tool_result", `${event.toolName} result: ${resultStr}`));
+          break;
+        }
+        case "agent_end":
+          this.emitAgentEnd();
+          break;
+        default:
+          break;
       }
-      case "agent_end":
-        this.emitAgentEnd();
-        break;
-      default:
-        break;
     }
-  }
-  finish() {
-    this.flushText();
-    this.flushThinking();
-    this.emitAgentEnd();
-  }
-  emitAgentEnd() {
-    if (this.agentEndEmitted)
-      return;
-    this.agentEndEmitted = true;
-    this.writeLine(formatAgentLogLine(this.logPrefix, "agent_end"));
-    for (const cb of this.agentEndCallbacks)
-      cb();
-  }
-  appendText(delta) {
-    this.flushThinking();
-    this.textBuffer += delta;
-    if (this.textBuffer.includes(`
+    finish() {
+      this.flushText();
+      this.flushThinking();
+      this.emitAgentEnd();
+    }
+    emitAgentEnd() {
+      if (this.agentEndEmitted)
+        return;
+      this.agentEndEmitted = true;
+      this.writeLine(formatAgentLogLine(this.logPrefix, "agent_end"));
+      for (const cb of this.agentEndCallbacks)
+        cb();
+    }
+    appendText(delta) {
+      this.flushThinking();
+      this.textBuffer += delta;
+      this.assistantTextCapture.captureAssistantText(delta);
+      if (this.textBuffer.includes(`
 `))
+        this.flushText();
+    }
+    appendThinking(delta) {
       this.flushText();
-  }
-  appendThinking(delta) {
-    this.flushText();
-    this.thinkingBuffer += delta;
-    if (this.thinkingBuffer.includes(`
+      this.thinkingBuffer += delta;
+      if (this.thinkingBuffer.includes(`
 `))
-      this.flushThinking();
-  }
-  flushText() {
-    if (!this.textBuffer)
-      return;
-    const lines = this.textBuffer.split(`
+        this.flushThinking();
+    }
+    flushText() {
+      if (!this.textBuffer)
+        return;
+      const lines = this.textBuffer.split(`
 `);
-    const remaining = this.textBuffer.endsWith(`
+      const remaining = this.textBuffer.endsWith(`
 `) ? "" : lines.pop() ?? "";
-    for (const line of lines) {
-      if (line.length > 0) {
-        this.writeLine(formatAgentLogLine(this.logPrefix, "text", line));
+      for (const line of lines) {
+        if (line.length > 0) {
+          this.writeLine(formatAgentLogLine(this.logPrefix, "text", line));
+        }
       }
+      this.textBuffer = remaining;
     }
-    this.textBuffer = remaining;
-  }
-  flushThinking() {
-    if (!this.thinkingBuffer)
-      return;
-    const lines = this.thinkingBuffer.split(`
+    flushThinking() {
+      if (!this.thinkingBuffer)
+        return;
+      const lines = this.thinkingBuffer.split(`
 `);
-    const remaining = this.thinkingBuffer.endsWith(`
+      const remaining = this.thinkingBuffer.endsWith(`
 `) ? "" : lines.pop() ?? "";
-    for (const line of lines) {
-      if (line.length > 0) {
-        this.writeLine(formatAgentLogLine(this.logPrefix, "thinking", line));
+      for (const line of lines) {
+        if (line.length > 0) {
+          this.writeLine(formatAgentLogLine(this.logPrefix, "thinking", line));
+        }
       }
+      this.thinkingBuffer = remaining;
     }
-    this.thinkingBuffer = remaining;
-  }
-  notifyOutput() {
-    for (const cb of this.outputCallbacks)
-      cb();
-  }
-  writeLine(line) {
-    process.stderr.write(`${line}
+    writeLine(line) {
+      process.stderr.write(`${line}
 `);
-    this.emitLogLine?.(line);
-  }
-}
-var init_pi_sdk_stream_adapter = () => {};
+      this.emitLogLine?.(line);
+    }
+  };
+});
 
 // src/infrastructure/services/remote-agents/pi-sdk/pi-sdk-agent-service.ts
 async function loadSdk2() {
@@ -33045,6 +33113,7 @@ var init_pi_sdk_agent_service = __esm(() => {
       const outputCallbacks = [];
       const agentEndCallbacks = [];
       const logLineCallbacks = [];
+      const assistantTextCallbacks = [];
       const emitLogLine = (line) => {
         for (const cb of logLineCallbacks)
           cb(line);
@@ -33066,6 +33135,7 @@ var init_pi_sdk_agent_service = __esm(() => {
         finishExit,
         outputCallbacks,
         agentEndCallbacks,
+        assistantTextCallbacks,
         emitLogLine
       });
       return {
@@ -33082,6 +33152,9 @@ var init_pi_sdk_agent_service = __esm(() => {
         },
         onLogLine: (cb) => {
           logLineCallbacks.push(cb);
+        },
+        onAssistantText: (cb) => {
+          assistantTextCallbacks.push(cb);
         }
       };
     }
@@ -33095,6 +33168,7 @@ var init_pi_sdk_agent_service = __esm(() => {
         entry,
         outputCallbacks,
         agentEndCallbacks,
+        assistantTextCallbacks,
         emitLogLine
       } = args2;
       let exited = false;
@@ -33122,14 +33196,12 @@ ${deferredResume}` : deferredResume;
                 prependSystemOnNextResume = false;
               }
               const adapter = new PiSdkStreamAdapter(logPrefix, emitLogLine);
-              adapter.onOutput(() => {
-                entry.lastOutputAt = Date.now();
-                for (const cb of outputCallbacks)
-                  cb();
-              });
-              adapter.onAgentEnd(() => {
-                for (const cb of agentEndCallbacks)
-                  cb();
+              wireNativeStreamAdapter({
+                adapter,
+                assistantTextCallbacks,
+                outputCallbacks,
+                agentEndCallbacks,
+                entry
               });
               const onSessionEvent = (event) => {
                 if (sdkSession.aborted)
@@ -75581,10 +75653,7 @@ Put your **complete** deliverable in the handoff message — not in session text
 }
 
 // ../../services/backend/prompts/utils/code-change-verification.ts
-var CODE_CHANGE_VERIFICATION_COMMAND = "pnpm typecheck && pnpm test", CODE_CHANGE_VERIFICATION_CONFIRMATION;
-var init_code_change_verification = __esm(() => {
-  CODE_CHANGE_VERIFICATION_CONFIRMATION = `- [ ] I confirm that I have run \`${CODE_CHANGE_VERIFICATION_COMMAND}\` (only required if code changes were made)`;
-});
+var CODE_CHANGE_VERIFICATION_CONFIRMATION = "- [ ] I confirm that I have run typecheck and tests for the project (only required if code changes were made)";
 
 // ../../services/backend/prompts/cli/context/read.ts
 function contextReadCommand(params = {}) {
@@ -75663,7 +75732,6 @@ ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 \`\`\``;
 }
 var init_builder_to_planner = __esm(() => {
-  init_code_change_verification();
   init_context_disclosure();
   init_role_guidance_disclosure();
 });
@@ -75820,7 +75888,6 @@ ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 \`\`\``;
 }
 var init_planner_to_user = __esm(() => {
-  init_code_change_verification();
   init_context_disclosure();
   init_role_guidance_disclosure();
 });
@@ -75919,7 +75986,6 @@ ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 \`\`\``;
 }
 var init_solo_to_user = __esm(() => {
-  init_code_change_verification();
   init_context_disclosure();
   init_role_guidance_disclosure();
 });
@@ -76155,8 +76221,6 @@ var init_commands_reference = __esm(() => {
   init_command2();
   init_utils3();
 });
-// ../../services/backend/src/domain/usecase/skills/modules/attachments/index.ts
-var init_attachments = () => {};
 
 // ../../services/backend/prompts/cli/backlog/command.ts
 var init_command3 = __esm(() => {
@@ -76173,7 +76237,6 @@ var init_code_review = () => {};
 
 // ../../services/backend/src/domain/usecase/skills/registry.ts
 var init_registry3 = __esm(() => {
-  init_attachments();
   init_backlog();
   init_code_review();
 });
@@ -76203,8 +76266,7 @@ var init_glossary = __esm(() => {
     },
     {
       term: "attachments",
-      definition: "Message attachment types (task, backlog, message, snippet) and their compose, delivery, and task-read paths. " + "Use when adding or changing attachment UI, delivery XML, or agent-facing attachment formats.",
-      linkedSkillId: "attachments"
+      definition: "Message attachment types (task, backlog, message, snippet) delivered in agent prompts as XML when users attach context to messages."
     },
     {
       term: "code-review",
@@ -76599,15 +76661,6 @@ function handleHandoffError(err) {
     } else if (err._tag === "InvalidChatroomId") {
       formatChatroomIdError(err.id);
       process.exit(1);
-    } else if (err._tag === "ArtifactsInvalid") {
-      formatError("One or more artifacts not found", [
-        "Please create artifacts first:",
-        `chatroom artifact create <chatroom-id> --from-file=... --filename=...`
-      ]);
-      process.exit(1);
-    } else if (err._tag === "ArtifactValidationFailed") {
-      formatError("Failed to validate artifacts", [String(err.cause)]);
-      process.exit(1);
     } else if (err._tag === "HandoffFailed") {
       console.error(`
 ❌ ERROR: Handoff failed`);
@@ -76670,7 +76723,7 @@ async function handoff(chatroomId, options, deps) {
 var handoffEffect = (chatroomId, options) => exports_Effect.gen(function* () {
   const session2 = yield* SessionService;
   const backend2 = yield* BackendService;
-  const { role, message, nextRole, attachedArtifactIds = [] } = options;
+  const { role, message, nextRole } = options;
   const sessionId = yield* requireSessionIdEffect((a) => ({
     _tag: "NotAuthenticated",
     convexUrl: a.convexUrl,
@@ -76680,24 +76733,12 @@ var handoffEffect = (chatroomId, options) => exports_Effect.gen(function* () {
     _tag: "InvalidChatroomId",
     id: id3
   }));
-  if (attachedArtifactIds.length > 0) {
-    const areValid = yield* backend2.query(api.artifacts.validateArtifactIds, {
-      sessionId,
-      artifactIds: attachedArtifactIds
-    }).pipe(exports_Effect.mapError((cause3) => ({ _tag: "ArtifactValidationFailed", cause: cause3 })));
-    if (!areValid) {
-      return yield* exports_Effect.fail({ _tag: "ArtifactsInvalid" });
-    }
-  }
   const result = yield* backend2.mutation(api.messages.handoff, {
     sessionId,
     chatroomId,
     senderRole: role,
     content: message,
-    targetRole: nextRole,
-    ...attachedArtifactIds.length > 0 && {
-      attachedArtifactIds
-    }
+    targetRole: nextRole
   }).pipe(exports_Effect.mapError((cause3) => {
     let errorData;
     if (cause3 instanceof ConvexError) {
@@ -76720,12 +76761,6 @@ var handoffEffect = (chatroomId, options) => exports_Effect.gen(function* () {
       convexUrl,
       supportsNativeIntegration: result.supportsNativeIntegration
     }));
-    if (attachedArtifactIds.length > 0) {
-      console.log(`\uD83D\uDCCE Attached artifacts: ${attachedArtifactIds.length}`);
-      attachedArtifactIds.forEach((id3) => {
-        console.log(`   • ${id3}`);
-      });
-    }
   });
 });
 var init_handoff = __esm(() => {
@@ -77541,13 +77576,28 @@ var init_backlog2 = __esm(() => {
   STALENESS_THRESHOLD_MS = 7 * 24 * 60 * 60 * 1000;
 });
 
+// ../../services/backend/prompts/attachments/xml.ts
+function escapeXmlText(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function escapeXmlAttribute(value) {
+  return escapeXmlText(value).replace(/"/g, "&quot;");
+}
+function xmlTextElement(tag, content, indent = "    ") {
+  if (!content.includes(`
+`)) {
+    return [`${indent}<${tag}>${escapeXmlText(content)}</${tag}>`];
+  }
+  return [`${indent}<${tag}>`, escapeXmlText(content), `${indent}</${tag}>`];
+}
+
 // ../../services/backend/prompts/attachments/render-delivery-attachments.ts
 function renderSnippetAttachment(snippet) {
   return [
-    `  <attachment reference="${snippet.reference}">`,
-    `  <snippet file-source="${snippet.fileSource}">`,
+    `  <attachment type="snippet" reference="${escapeXmlAttribute(snippet.reference)}">`,
+    `  <snippet file-source="${escapeXmlAttribute(snippet.fileSource)}">`,
     `    <user-selected-content>`,
-    snippet.selectedContent,
+    escapeXmlText(snippet.selectedContent),
     `    </user-selected-content>`,
     `  </snippet>`,
     `  </attachment>`
@@ -77556,10 +77606,9 @@ function renderSnippetAttachment(snippet) {
 function renderBacklogAttachments(items, ctx) {
   const lines = [];
   for (const item of items) {
-    lines.push(`  <attachment type="backlog-item">`);
-    lines.push(`    - [${item.status.toUpperCase()}] ${item.content}`);
-    lines.push(`      ID: ${item._id}`);
-    lines.push(`    <hint>Work on this item. When done: chatroom backlog mark-for-review --chatroom-id="${ctx.chatroomId}" --role="${ctx.role}" --backlog-item-id=${item._id}</hint>`);
+    lines.push(`  <attachment type="backlog" backlog-item-id="${escapeXmlAttribute(item._id)}">`);
+    lines.push(...xmlTextElement("content", item.content, "    "));
+    lines.push(`    <hint>Work on this item. When done: chatroom backlog mark-for-review --chatroom-id="${escapeXmlAttribute(ctx.chatroomId)}" --role="${escapeXmlAttribute(ctx.role)}" --backlog-item-id=${item._id}</hint>`);
     lines.push(`  </attachment>`);
   }
   return lines;
@@ -77571,19 +77620,51 @@ function renderSnippetAttachments(snippets) {
   }
   return lines;
 }
+function renderTaskAttachments(items, _ctx) {
+  const lines = [];
+  for (const item of items) {
+    lines.push(`  <attachment type="task" task-id="${escapeXmlAttribute(item._id)}">`);
+    lines.push(...xmlTextElement("content", item.content, "    "));
+    lines.push(`    <hint>Referenced task attached by user.</hint>`);
+    lines.push(`  </attachment>`);
+  }
+  return lines;
+}
+function renderMessageAttachments(items) {
+  const lines = [];
+  for (const item of items) {
+    lines.push(`  <attachment type="message" message-id="${escapeXmlAttribute(item._id)}">`);
+    lines.push(...xmlTextElement("sender-role", item.senderRole, "    "));
+    lines.push(...xmlTextElement("content", item.content, "    "));
+    lines.push(`  </attachment>`);
+  }
+  return lines;
+}
 function renderDeliveryAttachmentsBlock(input, ctx) {
   const backlogLines = input.attachedBacklogItems?.length ? DELIVERY_ATTACHMENT_RENDERERS.backlog(input.attachedBacklogItems, ctx) : [];
+  const taskLines = input.attachedTasks?.length ? DELIVERY_ATTACHMENT_RENDERERS.task(input.attachedTasks, ctx) : [];
+  const messageLines = input.attachedMessages?.length ? DELIVERY_ATTACHMENT_RENDERERS.message(input.attachedMessages, ctx) : [];
   const snippetLines = input.attachedSnippets?.length ? DELIVERY_ATTACHMENT_RENDERERS.snippet(input.attachedSnippets, ctx) : [];
-  if (backlogLines.length === 0 && snippetLines.length === 0)
+  if (backlogLines.length === 0 && taskLines.length === 0 && messageLines.length === 0 && snippetLines.length === 0) {
     return [];
-  return ["", "<attachments>", ...backlogLines, ...snippetLines, "</attachments>"];
+  }
+  return [
+    "",
+    "<attachments>",
+    ...backlogLines,
+    ...taskLines,
+    ...messageLines,
+    ...snippetLines,
+    "</attachments>"
+  ];
 }
 var DELIVERY_ATTACHMENT_RENDERERS;
 var init_render_delivery_attachments = __esm(() => {
   DELIVERY_ATTACHMENT_RENDERERS = {
     backlog: renderBacklogAttachments,
     snippet: renderSnippetAttachments,
-    message: () => []
+    message: renderMessageAttachments,
+    task: renderTaskAttachments
   };
 });
 
@@ -77597,7 +77678,9 @@ function detectBacklogDivergence(contextContent, attachedIds) {
 function renderAttachments(input, chatroomId, role) {
   return renderDeliveryAttachmentsBlock({
     attachedBacklogItems: input.attachedBacklogItems,
-    attachedSnippets: input.attachedSnippets
+    attachedSnippets: input.attachedSnippets,
+    attachedTasks: input.attachedTasks,
+    attachedMessages: input.attachedMessages
   }, { chatroomId, role, mode: "task-read" });
 }
 function renderDivergenceWarnings(input) {
@@ -77692,7 +77775,9 @@ function buildTaskPromptFromReadResult(result, chatroomId, role) {
     role,
     context: result.context && typeof result.context === "object" ? result.context : undefined,
     attachedBacklogItems: Array.isArray(result.attachedBacklogItems) ? result.attachedBacklogItems : undefined,
-    attachedSnippets: Array.isArray(result.attachedSnippets) ? result.attachedSnippets : undefined
+    attachedSnippets: Array.isArray(result.attachedSnippets) ? result.attachedSnippets : undefined,
+    attachedTasks: Array.isArray(result.attachedTasks) ? result.attachedTasks : undefined,
+    attachedMessages: Array.isArray(result.attachedMessages) ? result.attachedMessages : undefined
   });
 }
 function handleTaskReadError(err) {
@@ -85862,7 +85947,7 @@ var init_crash_loop_tracker = __esm(() => {
 });
 
 // ../../services/backend/src/domain/entities/participant.ts
-var NATIVE_WAITING_ACTION = "native:waiting", NATIVE_TASK_INJECTED_ACTION = "native:task-injected", ONLINE_OR_STARTING_STATUSES;
+var NATIVE_WAITING_ACTION = "native:waiting", NATIVE_TASK_INJECTED_ACTION = "native:task-injected", NATIVE_HANDOFF_REMINDER = "Reminder: Use the handoff command to send your response to the team.", ONLINE_OR_STARTING_STATUSES;
 var init_participant = __esm(() => {
   ONLINE_OR_STARTING_STATUSES = new Set([
     "agent.waiting",
@@ -85967,9 +86052,6 @@ function isInjectableNativeAction(action) {
     return true;
   return action === NATIVE_WAITING_ACTION;
 }
-function shouldEmitNativeWaitingOnTurnEnd(lastStatus) {
-  return lastStatus !== "task.acknowledged" && lastStatus !== "task.inProgress";
-}
 function isNativeIdleAfterTaskComplete(participant) {
   return participant.lastSeenAction === NATIVE_TASK_INJECTED_ACTION && participant.lastStatus === "task.completed";
 }
@@ -87087,6 +87169,16 @@ class AgentProcessManager {
     }
     await service3.resumeTurn(slot.pid, args2.prompt);
   }
+  async injectHarnessReminder(chatroomId, role, prompt) {
+    const key = agentKey3(chatroomId, role);
+    const slot = this.slots.get(key);
+    if (!slot?.pid || !slot.harness)
+      return;
+    const service3 = this.deps.agentServices.get(slot.harness);
+    if (!service3?.resumeTurn)
+      return;
+    await service3.resumeTurn(slot.pid, prompt);
+  }
   async stop(opts) {
     const key = agentKey3(opts.chatroomId, opts.role);
     const slot = this.slots.get(key);
@@ -87217,9 +87309,20 @@ class AgentProcessManager {
       console.log(`[AgentProcessManager] ⛔ Terminal provider error for ${opts.role} — emitted agent.startFailed`);
       return;
     }
-    const emitted = await this.emitNativeWaiting(opts.chatroomId, opts.role, opts.harness, "turn-end");
-    if (emitted) {
-      console.log(`[AgentProcessManager] ✅ Native harness idle for ${opts.role} (native:waiting)`);
+    try {
+      const result = await this.deps.backend.mutation(api.participants.handleNativeAgentEnd, {
+        sessionId: this.deps.sessionId,
+        chatroomId: opts.chatroomId,
+        role: opts.role
+      });
+      if (result?.needsHandoffReminder) {
+        await this.injectHarnessReminder(opts.chatroomId, opts.role, NATIVE_HANDOFF_REMINDER);
+        console.log(`[AgentProcessManager] ⏩ Handoff reminder injected for ${opts.role}`);
+        return;
+      }
+      console.log(`[AgentProcessManager] ✅ Native agent_end handled for ${opts.role}`);
+    } catch (err) {
+      console.log(`   ⚠️  Failed native agent_end for ${opts.role}: ${err.message}`);
     }
   }
   async handleExit(opts) {
@@ -87985,25 +88088,9 @@ class AgentProcessManager {
     this.registerSpawnCallbacks(slot, opts, spawnResult, pid);
     await this.emitNativeWaiting(opts.chatroomId, opts.role, opts.agentHarness);
   }
-  async emitNativeWaiting(chatroomId, role, harness, reason = "spawn") {
+  async emitNativeWaiting(chatroomId, role, harness) {
     if (!getHarnessCapabilities(harness).supportsNativeIntegration)
       return false;
-    if (reason === "turn-end") {
-      try {
-        const participant = await this.deps.backend.query(api.participants.getByRole, {
-          sessionId: this.deps.sessionId,
-          chatroomId,
-          role
-        });
-        if (!shouldEmitNativeWaitingOnTurnEnd(participant?.lastStatus)) {
-          console.log(`[AgentProcessManager] Skipping native:waiting for ${role} — active work (${participant?.lastStatus})`);
-          return false;
-        }
-      } catch (err) {
-        console.log(`   ⚠️  Failed to check status before native:waiting for ${role}: ${err.message}`);
-        return false;
-      }
-    }
     try {
       await this.deps.backend.mutation(api.participants.join, {
         sessionId: this.deps.sessionId,
@@ -88174,7 +88261,6 @@ var init_agent_process_manager = __esm(() => {
   init_classify_resume_storm_reason();
   init_terminal_provider_error();
   init_handle_turn_completed();
-  init_predicates();
   init_spawn_policy();
   init_agent_lifecycle_runtime();
   init_agent_lifecycle_types();
@@ -105809,7 +105895,7 @@ handoffCommandGroup.command("view-template").description("Print the handoff mess
     process.exit(1);
   }
 });
-handoffCommandGroup.requiredOption("--chatroom-id <id>", "Chatroom identifier").requiredOption("--role <role>", "Your role").requiredOption("--next-role <nextRole>", "Role to hand off to").option("--attach-artifact <artifactId>", "Attach artifact to handoff (can be used multiple times)", collectMultiValueOption, []).action(async (options) => {
+handoffCommandGroup.requiredOption("--chatroom-id <id>", "Chatroom identifier").requiredOption("--role <role>", "Your role").requiredOption("--next-role <nextRole>", "Role to hand off to").action(async (options) => {
   await maybeRequireAuth();
   const { decode: decode5 } = await Promise.resolve().then(() => exports_decode);
   const stdinContent = await readStdin();
@@ -105831,8 +105917,7 @@ handoffCommandGroup.requiredOption("--chatroom-id <id>", "Chatroom identifier").
   await handoff2(options.chatroomId, {
     role: options.role,
     message,
-    nextRole: options.nextRole,
-    attachedArtifactIds: options.attachArtifact || []
+    nextRole: options.nextRole
   });
 });
 var backlogCommand = program2.command("backlog").description("Manage task queue and backlog");
@@ -106119,4 +106204,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=0080C69D49B8FE3164756E2164756E21
+//# debugId=2E6B4710975E536E64756E2164756E21