@staff0rd/assist 0.318.4 → 0.318.5

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.318.4",
+  version: "0.318.5",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3897,7 +3897,12 @@ var hooksSettings = {
     UserPromptSubmit: on(RUNNING),
     PreToolUse: on(RUNNING),
     Stop: on(WAITING),
-    Notification: on(WAITING)
+    Notification: on(WAITING),
+    /* why: a tool/plan approval prompt appears mid-turn, after PreToolUse has
+     * already set running; PermissionRequest fires when the agent blocks on
+     * that decision, so the card shows waiting rather than staying running while
+     * it is genuinely awaiting the user (#449). */
+    PermissionRequest: on(WAITING)
   }
 };
 function ensureHooksSettings() {
@@ -4604,51 +4609,43 @@ Failed to launch Claude for ${context}: ${message}`)
   }
 }
 
-// src/shared/emitActivity.ts
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync14, rmSync, writeFileSync as writeFileSync17 } from "fs";
-import { homedir as homedir7 } from "os";
-import { dirname as dirname14, join as join18 } from "path";
-import { z as z4 } from "zod";
-var activitySchema = z4.object({
-  kind: z4.enum(["command", "backlog"]),
-  name: z4.string().optional(),
-  itemId: z4.number().optional(),
-  itemName: z4.string().optional(),
-  phase: z4.number().optional(),
-  phaseName: z4.string().optional(),
-  totalPhases: z4.number().optional(),
-  claudeSessionId: z4.string().optional(),
-  startedAt: z4.number()
-});
-function activityPath(sessionId) {
-  return join18(homedir7(), ".assist", "activity", `activity-${sessionId}.json`);
-}
-function emitActivity(activity2) {
-  const sessionId = process.env.ASSIST_ACTIVITY_ID;
-  if (!sessionId) return;
-  const path57 = activityPath(sessionId);
-  mkdirSync7(dirname14(path57), { recursive: true });
-  writeFileSync17(path57, JSON.stringify({ ...activity2, startedAt: Date.now() }));
+// src/commands/sessions/daemon/connectToDaemon.ts
+import * as net from "net";
+function connectToDaemon() {
+  return new Promise((resolve17, reject) => {
+    const socket = net.connect(daemonPaths.socket);
+    socket.once("connect", () => resolve17(socket));
+    socket.once("error", reject);
+  });
 }
-function readActivity(path57) {
+async function isDaemonRunning() {
   try {
-    return JSON.parse(readFileSync14(path57, "utf8"));
+    (await connectToDaemon()).destroy();
+    return true;
   } catch {
-    return void 0;
+    return false;
   }
 }
-function reconcileActivity(sessionId, activity2) {
-  if (!activity2) {
-    removeActivity(sessionId);
-    return;
-  }
-  const path57 = activityPath(sessionId);
-  mkdirSync7(dirname14(path57), { recursive: true });
-  writeFileSync17(path57, JSON.stringify(activity2));
+
+// src/commands/sessions/daemon/sendToDaemon.ts
+async function sendToDaemon(message) {
+  const socket = await connectToDaemon();
+  const timer = setTimeout(() => socket.destroy(), 500);
+  socket.on("error", () => {
+  });
+  socket.write(`${JSON.stringify(message)}
+`, () => {
+    clearTimeout(timer);
+    socket.end();
+  });
 }
-function removeActivity(sessionId) {
+
+// src/commands/sessions/setSessionStatus.ts
+async function setSessionStatus(status2) {
+  const sessionId = process.env.ASSIST_SESSION_ID;
+  if (!sessionId) return;
   try {
-    rmSync(activityPath(sessionId));
+    await sendToDaemon({ type: "set-status", sessionId, status: status2 });
   } catch {
   }
 }
@@ -4762,6 +4759,69 @@ function buildResumePrompt() {
   return "A restart interrupted this conversation. Continue from where you left off.";
 }
 
+// src/shared/emitActivity.ts
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync14, rmSync, writeFileSync as writeFileSync17 } from "fs";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname14, join as join18 } from "path";
+import { z as z4 } from "zod";
+var activitySchema = z4.object({
+  kind: z4.enum(["command", "backlog"]),
+  name: z4.string().optional(),
+  itemId: z4.number().optional(),
+  itemName: z4.string().optional(),
+  phase: z4.number().optional(),
+  phaseName: z4.string().optional(),
+  totalPhases: z4.number().optional(),
+  claudeSessionId: z4.string().optional(),
+  startedAt: z4.number()
+});
+function activityPath(sessionId) {
+  return join18(homedir7(), ".assist", "activity", `activity-${sessionId}.json`);
+}
+function emitActivity(activity2) {
+  const sessionId = process.env.ASSIST_ACTIVITY_ID;
+  if (!sessionId) return;
+  const path57 = activityPath(sessionId);
+  mkdirSync7(dirname14(path57), { recursive: true });
+  writeFileSync17(path57, JSON.stringify({ ...activity2, startedAt: Date.now() }));
+}
+function readActivity(path57) {
+  try {
+    return JSON.parse(readFileSync14(path57, "utf8"));
+  } catch {
+    return void 0;
+  }
+}
+function reconcileActivity(sessionId, activity2) {
+  if (!activity2) {
+    removeActivity(sessionId);
+    return;
+  }
+  const path57 = activityPath(sessionId);
+  mkdirSync7(dirname14(path57), { recursive: true });
+  writeFileSync17(path57, JSON.stringify(activity2));
+}
+function removeActivity(sessionId) {
+  try {
+    rmSync(activityPath(sessionId));
+  } catch {
+  }
+}
+
+// src/commands/backlog/reportPhaseActivity.ts
+function reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId) {
+  const isReviewPhase = phaseNumber >= totalPhases;
+  emitActivity({
+    kind: "backlog",
+    itemId: item.id,
+    itemName: item.name,
+    phase: phaseNumber,
+    phaseName: isReviewPhase ? REVIEW_PHASE_NAME : phase.name,
+    totalPhases,
+    claudeSessionId
+  });
+}
+
 // src/commands/backlog/resolvePhaseResult.ts
 import { existsSync as existsSync22, unlinkSync as unlinkSync4 } from "fs";
 import chalk40 from "chalk";
@@ -4875,16 +4935,7 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
   const resumeSessionId = spawnOptions?.resumeSessionId;
   const claudeSessionId = resumeSessionId ?? randomUUID();
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
-  const isReviewPhase = phaseNumber >= totalPhases;
-  emitActivity({
-    kind: "backlog",
-    itemId: item.id,
-    itemName: item.name,
-    phase: phaseNumber,
-    phaseName: isReviewPhase ? REVIEW_PHASE_NAME : phase.name,
-    totalPhases,
-    claudeSessionId
-  });
+  reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId);
   const { child, done: done2 } = spawnClaude(
     resumeSessionId ? buildResumePrompt() : buildPhasePrompt(item, phaseNumber, phase),
     resumeSessionId ? spawnOptions : { ...spawnOptions, sessionId: claudeSessionId }
@@ -4896,6 +4947,7 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
   );
   stopWatching();
   if (!launched) return -1;
+  void setSessionStatus("running");
   return await resolvePhaseResult(phaseIndex, item.id);
 }
 
@@ -5418,26 +5470,6 @@ import {
   unlinkSync as unlinkSync5,
   writeSync
 } from "fs";
-
-// src/commands/sessions/daemon/connectToDaemon.ts
-import * as net from "net";
-function connectToDaemon() {
-  return new Promise((resolve17, reject) => {
-    const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve17(socket));
-    socket.once("error", reject);
-  });
-}
-async function isDaemonRunning() {
-  try {
-    (await connectToDaemon()).destroy();
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-// src/commands/sessions/daemon/ensureDaemonRunning.ts
 var SPAWN_TIMEOUT_MS = 1e4;
 var RETRY_DELAY_MS = 200;
 var STALE_LOCK_MS = SPAWN_TIMEOUT_MS + 5e3;
@@ -20193,21 +20225,23 @@ function spawnRun(opts) {
 }
 
 // src/commands/sessions/daemon/createSession.ts
-function runningBase(id2) {
+function sessionBase(id2, status2) {
   const startedAt = Date.now();
   return {
     id: id2,
-    status: "running",
+    status: status2,
     startedAt,
     runningMs: 0,
-    runningSince: startedAt,
+    /* why: runningMs counts only running stretches, so a session that starts
+     * waiting (idle, awaiting first input) has no open stretch to stamp. */
+    runningSince: status2 === "running" ? startedAt : null,
     scrollback: ""
   };
 }
 function createSession(id2, prompt, cwd) {
   const claudeSessionId = randomUUID4();
   return {
-    ...runningBase(id2),
+    ...sessionBase(id2, prompt ? "running" : "waiting"),
     name: prompt?.slice(0, 40) || `Session ${id2}`,
     commandType: "claude",
     pty: spawnClaude2({ prompt, cwd, sessionId: id2, claudeSessionId }),
@@ -20217,7 +20251,7 @@ function createSession(id2, prompt, cwd) {
 }
 function createRunSession(id2, runName, runArgs, cwd) {
   return {
-    ...runningBase(id2),
+    ...sessionBase(id2, "running"),
     name: `run: ${runName}`,
     commandType: "run",
     pty: spawnRun({ name: runName, args: runArgs, cwd }),
@@ -20536,26 +20570,6 @@ function refreshActivity(session) {
     session.claudeSessionId = activity2.claudeSessionId;
 }
 
-// src/commands/sessions/daemon/noteOutputForThinking.ts
-var ACTIVATE_MS = 500;
-var GAP_MS = 1e3;
-function noteOutputForThinking(session, onStatusChange) {
-  if (session.status !== "waiting") {
-    session.thinkingStreakStart = void 0;
-    session.thinkingLastOutput = void 0;
-    return;
-  }
-  const now = Date.now();
-  const stale = session.thinkingStreakStart == null || session.thinkingLastOutput == null || now - session.thinkingLastOutput > GAP_MS;
-  if (stale) session.thinkingStreakStart = now;
-  session.thinkingLastOutput = now;
-  if (now - (session.thinkingStreakStart ?? now) < ACTIVATE_MS) return;
-  session.thinkingStreakStart = void 0;
-  session.thinkingLastOutput = void 0;
-  daemonLog(`session ${session.id} sustained output while waiting -> running`);
-  onStatusChange(session, "running");
-}
-
 // src/commands/sessions/daemon/wirePtyEvents.ts
 var MAX_SCROLLBACK = 256 * 1024;
 function appendScrollback(session, data) {
@@ -20569,7 +20583,6 @@ function wirePtyEvents(session, clients, onStatusChange) {
   session.pty.onData((data) => {
     appendScrollback(session, data);
     noteOutputForEscInterrupt(session, onStatusChange);
-    noteOutputForThinking(session, onStatusChange);
     broadcast(clients, { type: "output", sessionId: session.id, data });
   });
   session.pty.onExit(({ exitCode }) => {
@@ -21832,29 +21845,6 @@ function registerDaemon(program2) {
   ).action(restartDaemon);
 }
 
-// src/commands/sessions/daemon/sendToDaemon.ts
-async function sendToDaemon(message) {
-  const socket = await connectToDaemon();
-  const timer = setTimeout(() => socket.destroy(), 500);
-  socket.on("error", () => {
-  });
-  socket.write(`${JSON.stringify(message)}
-`, () => {
-    clearTimeout(timer);
-    socket.end();
-  });
-}
-
-// src/commands/sessions/setSessionStatus.ts
-async function setSessionStatus(status2) {
-  const sessionId = process.env.ASSIST_SESSION_ID;
-  if (!sessionId) return;
-  try {
-    await sendToDaemon({ type: "set-status", sessionId, status: status2 });
-  } catch {
-  }
-}
-
 // src/commands/sessions/summarise/index.ts
 import * as fs34 from "fs";
 import chalk175 from "chalk";

package/package.json

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