@staff0rd/assist 0.534.0 → 0.535.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.534.0",
+  version: "0.535.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -8146,8 +8146,27 @@ function removeActivity(sessionId) {
   }
 }
 
+// src/shared/harnessLabel.ts
+var HARNESS_LABELS = {
+  claude: "Claude",
+  codex: "Codex",
+  pi: "pi"
+};
+function resolveHarness(harness) {
+  return harness ?? "claude";
+}
+function harnessLabel(harness) {
+  return HARNESS_LABELS[resolveHarness(harness)];
+}
+
+// src/shared/harnessActivityFields.ts
+function harnessActivityFields(harness, claudeSessionId) {
+  const kind = resolveHarness(harness);
+  return kind === "claude" ? { claudeSessionId } : { harness: kind };
+}
+
 // src/commands/backlog/reportPhaseActivity.ts
-function reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId) {
+function reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId, harness) {
   const isReviewPhase = phaseNumber >= totalPhases;
   emitActivity({
     kind: "backlog",
@@ -8156,7 +8175,7 @@ function reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessio
     phase: phaseNumber,
     phaseName: isReviewPhase ? REVIEW_PHASE_NAME : phase.name,
     totalPhases,
-    claudeSessionId
+    ...harnessActivityFields(harness, claudeSessionId)
   });
 }
 
@@ -8405,7 +8424,14 @@ async function preparePhaseSession(item, phase, phaseIndex, phaseNumber, totalPh
   if (resumeSessionId && !await verifyPhaseResume(item.id, resumeSessionId, phaseLabel2)) {
     return void 0;
   }
-  reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId);
+  reportPhaseActivity(
+    item,
+    phaseNumber,
+    totalPhases,
+    phase,
+    claudeSessionId,
+    spawnOptions?.harness
+  );
   if (!resumeSessionId) {
     await persistPhaseSessionId(item.id, phaseIndex, claudeSessionId);
   }
@@ -14192,6 +14218,17 @@ This is usually a transient database/network blip \u2014 the work is saved and t
   }
 }
 
+// src/commands/backlog/reportLaunchActivity.ts
+function reportLaunchActivity(slashCommand, claudeSessionId, harness, item) {
+  emitActivity({
+    kind: "command",
+    name: slashCommand,
+    itemId: item?.itemId,
+    itemName: item?.itemName,
+    ...harnessActivityFields(harness, claudeSessionId)
+  });
+}
+
 // src/commands/backlog/launchMode.ts
 function buildSlashCommand(slashCommand, description) {
   const trimmed = description?.trim();
@@ -14202,15 +14239,10 @@ async function launchMode(slashCommand, options2) {
   if (!resumeSessionId) pullIfConfigured();
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
   const claudeSessionId = resumeSessionId ?? randomUUID4();
-  emitActivity({
-    kind: "command",
-    name: slashCommand,
-    itemId: options2?.itemId,
-    itemName: options2?.itemName,
-    claudeSessionId
-  });
+  const harness = options2?.harness ?? "claude";
+  reportLaunchActivity(slashCommand, claudeSessionId, harness, options2);
   const prompt = resumeSessionId ? resumeNudge() : buildSlashCommand(slashCommand, options2?.description);
-  const { child, done: done2 } = spawnHarness(options2?.harness ?? "claude", prompt, {
+  const { child, done: done2 } = spawnHarness(harness, prompt, {
     sessionId: claudeSessionId,
     resumeSessionId,
     cwd: process.cwd()
@@ -14265,7 +14297,7 @@ async function refine(id, options2) {
 }
 
 // src/commands/backlog/resolveHarness.ts
-function resolveHarness(value) {
+function resolveHarness2(value) {
   if (value === "claude" || value === "codex" || value === "pi") return value;
   return loadConfig().harness.engine;
 }
@@ -14278,7 +14310,7 @@ function registerRefineCommand(cmd) {
   ).action(
     (id, opts) => refine(id, {
       once: opts.once,
-      harness: resolveHarness(opts.harness)
+      harness: resolveHarness2(opts.harness)
     })
   );
 }
@@ -14321,7 +14353,7 @@ function registerRunCommand(cmd) {
       if (!opts.resumeSession) pullIfConfigured();
       await run2(id, {
         allowEdits: opts.write !== false,
-        harness: resolveHarness(opts.harness),
+        harness: resolveHarness2(opts.harness),
         resumeSessionId: opts.resumeSession
       });
     }
@@ -19972,7 +20004,7 @@ function runRefine(id, opts) {
   return refine(id, {
     once: opts.once,
     resumeSessionId: opts.resumeSession,
-    harness: resolveHarness(opts.harness)
+    harness: resolveHarness2(opts.harness)
   });
 }
 function registerRefineLaunch(program2, resumeFlag) {
@@ -31362,6 +31394,14 @@ function handleFailedResume(session, exitCode, onStatusChange) {
 import { existsSync as existsSync74, mkdirSync as mkdirSync31, watch as watch2 } from "fs";
 import { dirname as dirname37 } from "path";
 
+// src/commands/sessions/daemon/applyActivityToSession.ts
+function applyActivityToSession(session, activity2) {
+  session.activity = activity2;
+  if (activity2.harness) session.harness = activity2.harness;
+  if (activity2.claudeSessionId)
+    session.claudeSessionId = activity2.claudeSessionId;
+}
+
 // src/commands/sessions/daemon/applyReviewPause.ts
 function applyReviewPause(session, activity2) {
   const inReview = activity2.kind === "backlog" && activity2.phase !== void 0 && activity2.phase === activity2.totalPhases;
@@ -31426,11 +31466,8 @@ function watchActivity(session, notify2, onClaudeSessionId) {
     timer = null;
     const activity2 = readActivity(path73);
     if (!activity2) return;
-    session.activity = activity2;
-    if (activity2.claudeSessionId) {
-      session.claudeSessionId = activity2.claudeSessionId;
-      onClaudeSessionId?.(session);
-    }
+    applyActivityToSession(session, activity2);
+    if (activity2.claudeSessionId) onClaudeSessionId?.(session);
     applyReviewPause(session, activity2);
     void seedRunningMsFromUsage(session, notify2);
     notify2();
@@ -31446,9 +31483,7 @@ function refreshActivity(session) {
   if (session.commandType !== "assist" || !session.cwd) return;
   const activity2 = readActivity(activityPath(session.id));
   if (!activity2) return;
-  session.activity = activity2;
-  if (activity2.claudeSessionId)
-    session.claudeSessionId = activity2.claudeSessionId;
+  applyActivityToSession(session, activity2);
 }
 
 // src/commands/sessions/daemon/handleStoppedExit.ts
@@ -32353,8 +32388,15 @@ function respawnSession(session, respawn, status3, clients, onStatusChange) {
   wirePtyEvents(session, clients, onStatusChange);
 }
 
-// src/commands/sessions/daemon/respawnPlan.ts
-import { randomUUID as randomUUID10 } from "crypto";
+// src/shared/harnessResumesConversation.ts
+var RESUMES_CONVERSATION = {
+  claude: true,
+  codex: false,
+  pi: false
+};
+function harnessResumesConversation(harness) {
+  return RESUMES_CONVERSATION[resolveHarness(harness)];
+}
 
 // src/commands/sessions/daemon/assistResumeArgs.ts
 function assistResumeArgs(session) {
@@ -32362,36 +32404,22 @@ function assistResumeArgs(session) {
   return session.claudeSessionId ? [...args, "--resume-session", session.claudeSessionId] : args;
 }
 
-// src/commands/sessions/daemon/respawnPlan.ts
-function respawnPlan(session) {
-  const { commandType, claudeSessionId, cwd, assistArgs, initialPrompt } = session;
-  if (commandType === "claude") {
-    if (claudeSessionId)
-      return {
-        spawn: () => spawnClaude2({
-          resumeSessionId: claudeSessionId,
-          cwd,
-          sessionId: session.id
-        }),
-        status: "waiting"
-      };
-    if (initialPrompt) return freshClaudePlan(session, initialPrompt, cwd);
-    if (cwd && session.harness !== "pi")
-      return freshClaudePlan(session, void 0, cwd);
-    return null;
-  }
-  if (commandType === "assist" && assistArgs) {
-    const idle = session.status === "waiting";
+// src/commands/sessions/daemon/interactiveRespawnPlan.ts
+import { randomUUID as randomUUID10 } from "crypto";
+function interactiveRespawnPlan(session, resumes) {
+  const { claudeSessionId, cwd, initialPrompt } = session;
+  if (!resumes) return null;
+  if (claudeSessionId)
     return {
-      spawn: () => spawnPty(
-        assistResumeArgs({ assistArgs, claudeSessionId }),
+      spawn: () => spawnClaude2({
+        resumeSessionId: claudeSessionId,
         cwd,
-        session.id,
-        idle ? { ASSIST_RESUME_IDLE: "1" } : void 0
-      ),
-      status: idle ? "waiting" : "running"
+        sessionId: session.id
+      }),
+      status: "waiting"
     };
-  }
+  if (initialPrompt) return freshClaudePlan(session, initialPrompt, cwd);
+  if (cwd) return freshClaudePlan(session, void 0, cwd);
   return null;
 }
 function freshClaudePlan(session, prompt, cwd) {
@@ -32410,6 +32438,29 @@ function freshClaudePlan(session, prompt, cwd) {
   };
 }
 
+// src/commands/sessions/daemon/respawnPlan.ts
+function respawnPlan(session) {
+  const { commandType, claudeSessionId, cwd, assistArgs } = session;
+  const resumes = harnessResumesConversation(session.harness);
+  if (commandType === "claude") return interactiveRespawnPlan(session, resumes);
+  if (commandType === "assist" && assistArgs) {
+    const idle = session.status === "waiting";
+    return {
+      spawn: () => spawnPty(
+        assistResumeArgs({
+          assistArgs,
+          claudeSessionId: resumes ? claudeSessionId : void 0
+        }),
+        cwd,
+        session.id,
+        idle ? { ASSIST_RESUME_IDLE: "1" } : void 0
+      ),
+      status: idle ? "waiting" : "running"
+    };
+  }
+  return null;
+}
+
 // src/commands/sessions/daemon/restartSession.ts
 function restartSession(session, clients, onStatusChange) {
   const plan2 = respawnPlan(session);
@@ -32619,7 +32670,7 @@ function restoredSession(base, persisted, pty2, status3) {
 
 // src/commands/sessions/daemon/restoreInteractiveSession.ts
 function restoreInteractiveSession(id, persisted, base, idle) {
-  if (persisted.commandType !== "run" && persisted.claudeSessionId) {
+  if (persisted.commandType !== "run" && persisted.claudeSessionId && harnessResumesConversation(persisted.harness)) {
     return resumeViaClaude(id, persisted, base, idle);
   }
   if (persisted.commandType === "claude") {
@@ -32643,11 +32694,10 @@ function resumeViaClaude(id, persisted, base, idle) {
   return idle ? waitingSession(base, persisted, pty2) : runningSession(base, persisted, pty2);
 }
 function unrecoverableClaude(id, persisted) {
-  return errorSession(
-    id,
-    persisted,
-    "no claude session id was recorded before the daemon stopped, so the conversation cannot be resumed"
-  );
+  return errorSession(id, persisted, unresumableReason(persisted.harness));
+}
+function unresumableReason(harness) {
+  return harnessResumesConversation(harness) ? "no claude session id was recorded before the daemon stopped, so the conversation cannot be resumed" : `${harnessLabel(harness)} sessions cannot be resumed yet, so the conversation cannot be restored`;
 }
 function notRestoredStub(base, persisted) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.534.0",
+	"version": "0.535.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {