@shipers-dev/multi 0.6.6 → 0.6.8

package/dist/index.js

@@ -5199,6 +5199,7 @@ async function runAcp(opts) {
   const stream2 = ndJsonStream(output, input);
   let activeSessionId = opts.sessionId || null;
   let recording = false;
+  let chunkCount = 0;
   const alwaysAllow = new Set;
   const client = {
     async sessionUpdate(params) {
@@ -5263,12 +5264,33 @@ async function runAcp(opts) {
       }
     }
     recording = true;
-    const res = await conn.prompt({
-      sessionId: activeSessionId,
-      prompt: [{ type: "text", text: opts.prompt }]
-    });
-    await opts.onEvent({ event_type: "result", payload: { stopReason: res.stopReason } });
-    return { stopReason: res.stopReason, sessionId: activeSessionId };
+    const runPrompt = async () => {
+      chunkCount = 0;
+      return await conn.prompt({
+        sessionId: activeSessionId,
+        prompt: [{ type: "text", text: opts.prompt }]
+      });
+    };
+    let res = await runPrompt();
+    let stopReason = res.stopReason;
+    if (chunkCount === 0 && opts.sessionId) {
+      await opts.onEvent({ event_type: "progress", payload: { message: `resumed session produced no output (stopReason=${stopReason}); retrying with fresh session` } });
+      try {
+        const fresh = await conn.newSession({ cwd: opts.cwd || process.cwd(), mcpServers: [] });
+        activeSessionId = fresh.sessionId;
+        if (opts.onSession)
+          await opts.onSession(fresh.sessionId);
+        res = await runPrompt();
+        stopReason = res.stopReason;
+      } catch (e) {
+        await opts.onEvent({ event_type: "error", payload: { message: `retry with fresh session failed: ${String(e)}` } });
+      }
+    }
+    if (chunkCount === 0) {
+      await opts.onEvent({ event_type: "error", payload: { message: `agent produced no output (stopReason=${stopReason})` } });
+    }
+    await opts.onEvent({ event_type: "result", payload: { stopReason } });
+    return { stopReason, sessionId: activeSessionId };
   } finally {
     try {
       child.kill();
@@ -5281,12 +5303,15 @@ async function runAcp(opts) {
       case "agent_message_chunk":
       case "agent_thought_chunk": {
         const text = extractText(u.content);
-        if (text)
+        if (text) {
+          chunkCount++;
           await o.onEvent({ event_type: "assistant_text", payload: { text } });
+        }
         break;
       }
       case "tool_call":
       case "tool_call_update": {
+        chunkCount++;
         await o.onEvent({ event_type: "tool_call", payload: {
           id: u.toolCallId || u.id,
           tool: u.title || u.toolName || "tool",
@@ -5574,7 +5599,7 @@ var LOG_PATH2 = join2(MULTI_DIR, "logs", "agent.log");
 var SKILLS_DIR = join2(MULTI_DIR, "skills");
 var STOP_PATH = join2(MULTI_DIR, "stop.flag");
 var TASKS_DB_PATH = join2(MULTI_DIR, "tasks.db");
-var VERSION = "0.6.6";
+var VERSION = "0.6.7";
 var COMMANDS = {
   setup: "Register this device with a workspace",
   connect: "Connect device to realtime hub and execute assigned tasks",
@@ -6225,11 +6250,18 @@ _${bits.join(" \xB7 ")}_`);
       const base = `${task.title}
 
 ${task.description || ""}`.trim();
-      let userPart = task.followup ? `${task.followup}
+      let userPart;
+      if (task.followup) {
+        const cleanFollowup = stripSelfMention(task.followup, preferType);
+        userPart = `# New user message \u2014 THIS is the current request
+
+${cleanFollowup}
 
 ---
-Context (original task ${task.key}): ${task.title}` : base || task.title;
-      userPart = stripSelfMention(userPart, preferType);
+*Earlier thread (${task.key} "${task.title}") is only background context. Do not re-address the original task unless the new message explicitly refers back to it.*`;
+      } else {
+        userPart = stripSelfMention(base || task.title, preferType);
+      }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map((a) => `- ${a.filename}: ${a.path}`).join(`
 `);
@@ -6338,11 +6370,18 @@ ${body}
       const base = `${task.title}
 
 ${task.description || ""}`.trim();
-      let userPart = task.followup ? `${task.followup}
+      let userPart;
+      if (task.followup) {
+        const cleanFollowup = stripSelfMention(task.followup, preferType);
+        userPart = `# New user message \u2014 THIS is the current request
+
+${cleanFollowup}
 
 ---
-Context (${task.key}): ${task.title}` : base || task.title;
-      userPart = stripSelfMention(userPart, preferType);
+*Earlier thread (${task.key} "${task.title}") is only background context. Do not re-address the original task unless the new message explicitly refers back to it.*`;
+      } else {
+        userPart = stripSelfMention(base || task.title, preferType);
+      }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map((a) => `- ${a.filename}: ${a.path}`).join(`
 `);
@@ -6381,6 +6420,11 @@ ${userPart}` : userPart;
       if (n > 0)
         log(`  \uD83D\uDCCE uploaded ${n} output file(s)`);
     }
+    if (!hasAssistantText && !hadError) {
+      const stopReason = turn.result?.stopReason || "unknown";
+      await postComment(`\u26A0\uFE0F Agent returned no output (stopReason=${stopReason}). Adapter may be stuck on a stale session \u2014 try starting a new issue or clearing session_id.`);
+      log(`  \u26A0 ${task.key} produced no assistant output (stopReason=${stopReason})`);
+    }
     if (hadError) {
       await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
       log(`  \u2717 ${task.key} failed`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"

package/src/acp-runner.ts

@@ -57,6 +57,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
 
   let activeSessionId: string | null = opts.sessionId || null;
   let recording = false; // only forward events after prompt() starts
+  let chunkCount = 0; // assistant_text + tool_call chunks seen during prompt()
   const alwaysAllow = new Set<string>(); // keys: toolName|kind that user said "always allow"
 
   const client: Client = {
@@ -122,13 +123,38 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
     }
 
     recording = true;
-    const res = await conn.prompt({
-      sessionId: activeSessionId!,
-      prompt: [{ type: 'text', text: opts.prompt }],
-    } as any);
+    const runPrompt = async () => {
+      chunkCount = 0;
+      return await conn.prompt({
+        sessionId: activeSessionId!,
+        prompt: [{ type: 'text', text: opts.prompt }],
+      } as any);
+    };
+
+    let res = await runPrompt();
+    let stopReason = (res as any).stopReason;
+
+    // Resumed session that returned zero chunks → session is likely stale in the adapter.
+    // Retry once with a fresh session so user gets an actual response.
+    if (chunkCount === 0 && opts.sessionId) {
+      await opts.onEvent({ event_type: 'progress', payload: { message: `resumed session produced no output (stopReason=${stopReason}); retrying with fresh session` } });
+      try {
+        const fresh = await conn.newSession({ cwd: opts.cwd || process.cwd(), mcpServers: [] } as any);
+        activeSessionId = fresh.sessionId;
+        if (opts.onSession) await opts.onSession(fresh.sessionId);
+        res = await runPrompt();
+        stopReason = (res as any).stopReason;
+      } catch (e) {
+        await opts.onEvent({ event_type: 'error', payload: { message: `retry with fresh session failed: ${String(e)}` } });
+      }
+    }
+
+    if (chunkCount === 0) {
+      await opts.onEvent({ event_type: 'error', payload: { message: `agent produced no output (stopReason=${stopReason})` } });
+    }
 
-    await opts.onEvent({ event_type: 'result', payload: { stopReason: (res as any).stopReason } });
-    return { stopReason: (res as any).stopReason, sessionId: activeSessionId! };
+    await opts.onEvent({ event_type: 'result', payload: { stopReason } });
+    return { stopReason, sessionId: activeSessionId! };
   } finally {
     try { child.kill(); } catch {}
   }
@@ -140,11 +166,12 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
       case 'agent_message_chunk':
       case 'agent_thought_chunk': {
         const text = extractText(u.content);
-        if (text) await o.onEvent({ event_type: 'assistant_text', payload: { text } });
+        if (text) { chunkCount++; await o.onEvent({ event_type: 'assistant_text', payload: { text } }); }
         break;
       }
       case 'tool_call':
       case 'tool_call_update': {
+        chunkCount++;
         await o.onEvent({ event_type: 'tool_call', payload: {
           id: u.toolCallId || u.id, tool: u.title || u.toolName || 'tool', kind: u.kind, status: u.status, input: u.rawInput, locations: u.locations,
         }});

package/src/index.ts

@@ -17,7 +17,7 @@ const LOG_PATH = join(MULTI_DIR, 'logs', 'agent.log');
 const SKILLS_DIR = join(MULTI_DIR, 'skills');
 const STOP_PATH = join(MULTI_DIR, 'stop.flag');
 const TASKS_DB_PATH = join(MULTI_DIR, 'tasks.db');
-const VERSION = '0.6.6';
+const VERSION = '0.6.7';
 
 const COMMANDS = {
   setup: 'Register this device with a workspace',
@@ -623,10 +623,13 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
   try {
     if (useAcp) {
       const base = `${task.title}\n\n${task.description || ''}`.trim();
-      let userPart = task.followup
-        ? `${task.followup}\n\n---\nContext (original task ${task.key}): ${task.title}`
-        : (base || task.title);
-      userPart = stripSelfMention(userPart, preferType);
+      let userPart: string;
+      if (task.followup) {
+        const cleanFollowup = stripSelfMention(task.followup, preferType);
+        userPart = `# New user message — THIS is the current request\n\n${cleanFollowup}\n\n---\n*Earlier thread (${task.key} "${task.title}") is only background context. Do not re-address the original task unless the new message explicitly refers back to it.*`;
+      } else {
+        userPart = stripSelfMention(base || task.title, preferType);
+      }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map(a => `- ${a.filename}: ${a.path}`).join('\n');
         userPart += `\n\n---\nAttached input files (read them with your tools if useful):\n${lines}\n\nNote: if (and only if) you produce binary or large artifact outputs (screenshots, data exports, generated source files), write them under ${outDir}. Always put your human-facing reply in the chat response itself — do NOT write your answer as a file.`;
@@ -697,8 +700,13 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
         }
       } catch {}
       const base = `${task.title}\n\n${task.description || ''}`.trim();
-      let userPart = task.followup ? `${task.followup}\n\n---\nContext (${task.key}): ${task.title}` : (base || task.title);
-      userPart = stripSelfMention(userPart, preferType);
+      let userPart: string;
+      if (task.followup) {
+        const cleanFollowup = stripSelfMention(task.followup, preferType);
+        userPart = `# New user message — THIS is the current request\n\n${cleanFollowup}\n\n---\n*Earlier thread (${task.key} "${task.title}") is only background context. Do not re-address the original task unless the new message explicitly refers back to it.*`;
+      } else {
+        userPart = stripSelfMention(base || task.title, preferType);
+      }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map(a => `- ${a.filename}: ${a.path}`).join('\n');
         userPart += `\n\n---\nAttached files:\n${lines}\n\nWrite generated files to: ${outDir}`;
@@ -725,6 +733,13 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       if (n > 0) log(`  📎 uploaded ${n} output file(s)`);
     }
 
+    // Visible fallback: agent ran but emitted nothing user-facing
+    if (!hasAssistantText && !hadError) {
+      const stopReason = turn.result?.stopReason || 'unknown';
+      await postComment(`⚠️ Agent returned no output (stopReason=${stopReason}). Adapter may be stuck on a stale session — try starting a new issue or clearing session_id.`);
+      log(`  ⚠ ${task.key} produced no assistant output (stopReason=${stopReason})`);
+    }
+
     if (hadError) { await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {}); log(`  ✗ ${task.key} failed`); }
     else { await apiClient.post(`${apiUrl}/api/issues/${issueId}/complete`, {}); log(`  ✓ ${task.key} complete`); }
   } catch (e) {