@staff0rd/assist 0.535.1 → 0.537.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.535.1",
+  version: "0.537.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -16946,20 +16946,38 @@ function registerCodeComment(parent) {
   codeComment.command("confirm").description("Confirm a pin to insert its comment and clear the pin state").argument("<pin>", "Pin issued by 'code-comment set'").action(codeCommentConfirm);
 }
 
+// src/commands/codexHook/codexStatusFor.ts
+function codexStatusFor(event, autoDecided) {
+  if (event === "UserPromptSubmit")
+    return { status: "running", source: "prompt" };
+  if (event === "PreToolUse") return { status: "running", source: "pretool" };
+  if (event === "PostToolUse") return { status: "running", source: "posttool" };
+  if (event === "Stop") return { status: "waiting", source: "stop", ack: true };
+  if (event !== "PermissionRequest") return void 0;
+  return autoDecided ? { status: "running", source: "permission" } : { status: "waiting", source: "permission", ack: true };
+}
+
+// src/commands/codexHook/reportCodexStatus.ts
+async function reportCodexStatus(event, autoDecided) {
+  const report2 = codexStatusFor(event, autoDecided);
+  if (!report2) return;
+  await setSessionStatus(report2.status, {
+    source: report2.source,
+    ack: report2.ack
+  });
+}
+
 // src/commands/codexHook/index.ts
 var SUPPORTED_TOOLS2 = /* @__PURE__ */ new Set(["Bash", "PowerShell"]);
 function parseInput(raw) {
   try {
     const data = JSON.parse(raw);
+    const event = data.hook_event_name ?? "PreToolUse";
     const command = data.tool_input?.command;
-    if (typeof command !== "string" || !command.trim()) return void 0;
+    if (typeof command !== "string" || !command.trim()) return { event };
     if (!data.tool_name || !SUPPORTED_TOOLS2.has(data.tool_name))
-      return void 0;
-    return {
-      event: data.hook_event_name ?? "PreToolUse",
-      toolName: data.tool_name,
-      command: command.trim()
-    };
+      return { event };
+    return { event, toolName: data.tool_name, command: command.trim() };
   } catch {
     return void 0;
   }
@@ -16985,22 +17003,29 @@ function permissionRequestOutput(decision) {
     }
   };
 }
+function decide(input) {
+  if (!input.toolName || !input.command) return void 0;
+  return decideCommand(input.toolName, input.command);
+}
+function outputFor(event, decision) {
+  if (!decision) return void 0;
+  if (event === "PermissionRequest") return permissionRequestOutput(decision);
+  return preToolUseOutput(decision);
+}
 async function codexHook() {
   const input = parseInput(await readStdin());
   if (!input) return;
-  const decision = decideCommand(input.toolName, input.command);
-  if (!decision) return;
-  const output = input.event === "PermissionRequest" ? permissionRequestOutput(decision) : preToolUseOutput(decision);
+  const decision = decide(input);
+  const output = outputFor(input.event, decision);
   if (output) console.log(JSON.stringify(output));
+  await reportCodexStatus(input.event, decision !== void 0);
 }
 
 // src/commands/registerCodexHook.ts
 function registerCodexHook(program2) {
   program2.command("codex-hook").description(
-    "Codex PreToolUse/PermissionRequest hook for auto-approving read-only CLI commands"
-  ).action(() => {
-    codexHook();
-  });
+    "Codex hook: auto-approves read-only CLI commands (PreToolUse/PermissionRequest) and reports session status (running/waiting) to the sessions daemon"
+  ).action(() => codexHook());
 }
 
 // src/commands/complexity/analyze.ts
@@ -22576,7 +22601,8 @@ function requestClaudeSession(prompt, cwd, options2) {
     type: "create",
     prompt,
     cwd,
-    inPlace: options2?.inPlace === true
+    inPlace: options2?.inPlace === true,
+    launchedFrom: options2?.launchedFrom ?? process.env.ASSIST_SESSION_ID
   });
 }
 
@@ -27780,7 +27806,7 @@ function syncCodexHooks(sourcePath) {
   fs39.mkdirSync(path62.dirname(configPath), { recursive: true });
   fs39.writeFileSync(configPath, upsertManagedBlock(existing, body));
   console.log(
-    "Registered assist codex-hook in ~/.codex/config.toml (PreToolUse, PermissionRequest)"
+    "Registered assist codex-hook in ~/.codex/config.toml (UserPromptSubmit, PreToolUse, PostToolUse, PermissionRequest, Stop)"
   );
 }
 
@@ -30403,42 +30429,20 @@ var ClientHub = class extends Set {
 // src/commands/sessions/daemon/createSession.ts
 import { randomUUID as randomUUID9 } from "crypto";
 
-// src/commands/sessions/daemon/resolveRunConfig.ts
-function resolveRunConfig(name, cwd) {
-  try {
-    const { run: run4 } = loadConfigFrom(cwd);
-    const configs = resolveRunConfigs(run4, runConfigBaseDirFrom(cwd));
-    const exact = configs.find((r) => r.name === name);
-    if (exact) return exact;
-    const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name}`));
-    return suffixMatches.length === 1 ? suffixMatches[0] : void 0;
-  } catch {
-    return void 0;
-  }
-}
-
-// src/commands/sessions/daemon/serverRunMeta.ts
-function serverRunMeta(runName, cwd) {
-  const dir = cwd ?? process.cwd();
-  const config = resolveRunConfig(runName, dir);
-  if (!config?.server) return { server: false };
-  return { server: true, port: config.port, origin: getCurrentOrigin(dir) };
-}
-
-// src/commands/sessions/daemon/readDesignSystemPrompt.ts
-import * as fs44 from "fs";
-import * as path69 from "path";
-import { fileURLToPath as fileURLToPath9 } from "url";
-var __filename5 = fileURLToPath9(import.meta.url);
-var __dirname7 = path69.dirname(__filename5);
-function readDesignSystemPrompt() {
-  const promptPath = path69.join(
-    __dirname7,
-    "..",
-    "claude",
-    "design-system-prompt.md"
-  );
-  return fs44.readFileSync(promptPath, "utf8");
+// src/commands/sessions/daemon/sessionBase.ts
+function sessionBase(id, status3) {
+  const startedAt = Date.now();
+  return {
+    id,
+    status: status3,
+    startedAt,
+    runningMs: 0,
+    /* why: runningMs counts only running stretches, so a session that starts
+     * waiting (idle, awaiting first input) has no open stretch to stamp. */
+    runningSince: status3 === "running" ? startedAt : null,
+    waitingSince: status3 === "waiting" ? startedAt : null,
+    scrollback: ""
+  };
 }
 
 // src/commands/sessions/daemon/spawnPty.ts
@@ -30448,14 +30452,14 @@ import * as pty from "node-pty";
 // src/commands/sessions/daemon/ensureSpawnHelperExecutable.ts
 import { chmodSync, existsSync as existsSync68, statSync as statSync11 } from "fs";
 import { createRequire as createRequire3 } from "module";
-import path70 from "path";
+import path69 from "path";
 var require4 = createRequire3(import.meta.url);
 var ensured = false;
 function ensureSpawnHelperExecutable() {
   if (ensured || process.platform !== "darwin") return;
   ensured = true;
-  const ptyRoot = path70.join(path70.dirname(require4.resolve("node-pty")), "..");
-  const helper = path70.join(
+  const ptyRoot = path69.join(path69.dirname(require4.resolve("node-pty")), "..");
+  const helper = path69.join(
     ptyRoot,
     "prebuilds",
     `${process.platform}-${process.arch}`,
@@ -30507,6 +30511,84 @@ function shellEscape(s) {
   return `'${s.replace(/'/g, String.raw`'\''`)}'`;
 }
 
+// src/commands/sessions/daemon/spawnCodex.ts
+function spawnCodex2(opts = {}) {
+  const args = ["codex"];
+  if (opts.prompt) args.push(opts.prompt);
+  return spawnPty(args, opts.cwd, opts.sessionId);
+}
+
+// src/commands/sessions/daemon/spawnPi.ts
+function spawnPi2(opts = {}) {
+  const args = ["pi"];
+  if (opts.prompt) args.push(opts.prompt);
+  return spawnPty(args, opts.cwd, opts.sessionId);
+}
+
+// src/commands/sessions/daemon/startOrHoldPty.ts
+function startOrHoldPty(start3, hold) {
+  if (hold) return { pty: null, pendingStart: start3 };
+  return { pty: start3() };
+}
+
+// src/commands/sessions/daemon/createHarnessSession.ts
+var spawners = {
+  codex: spawnCodex2,
+  pi: spawnPi2
+};
+function createHarnessSession(id, harness, prompt, cwd, holdPty) {
+  return {
+    ...sessionBase(id, prompt ? "running" : "waiting"),
+    name: `Session ${id}`,
+    commandType: "claude",
+    harness,
+    ...startOrHoldPty(
+      () => spawners[harness]({ prompt, cwd, sessionId: id }),
+      holdPty
+    ),
+    cwd,
+    initialPrompt: prompt
+  };
+}
+
+// src/commands/sessions/daemon/resolveRunConfig.ts
+function resolveRunConfig(name, cwd) {
+  try {
+    const { run: run4 } = loadConfigFrom(cwd);
+    const configs = resolveRunConfigs(run4, runConfigBaseDirFrom(cwd));
+    const exact = configs.find((r) => r.name === name);
+    if (exact) return exact;
+    const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name}`));
+    return suffixMatches.length === 1 ? suffixMatches[0] : void 0;
+  } catch {
+    return void 0;
+  }
+}
+
+// src/commands/sessions/daemon/serverRunMeta.ts
+function serverRunMeta(runName, cwd) {
+  const dir = cwd ?? process.cwd();
+  const config = resolveRunConfig(runName, dir);
+  if (!config?.server) return { server: false };
+  return { server: true, port: config.port, origin: getCurrentOrigin(dir) };
+}
+
+// src/commands/sessions/daemon/readDesignSystemPrompt.ts
+import * as fs44 from "fs";
+import * as path70 from "path";
+import { fileURLToPath as fileURLToPath9 } from "url";
+var __filename5 = fileURLToPath9(import.meta.url);
+var __dirname7 = path70.dirname(__filename5);
+function readDesignSystemPrompt() {
+  const promptPath = path70.join(
+    __dirname7,
+    "..",
+    "claude",
+    "design-system-prompt.md"
+  );
+  return fs44.readFileSync(promptPath, "utf8");
+}
+
 // src/commands/sessions/daemon/spawnClaude.ts
 function spawnClaude2(opts = {}) {
   return spawnPty(buildArgs3(opts), opts.cwd, opts.sessionId);
@@ -30527,43 +30609,15 @@ function buildArgs3(opts) {
   return base;
 }
 
-// src/commands/sessions/daemon/spawnPi.ts
-function spawnPi2(opts = {}) {
-  const args = ["pi"];
-  if (opts.prompt) args.push(opts.prompt);
-  return spawnPty(args, opts.cwd, opts.sessionId);
-}
-
 // src/commands/sessions/daemon/spawnRun.ts
 function spawnRun(opts) {
   return spawnPty(["assist", "run", opts.name, ...opts.args ?? []], opts.cwd);
 }
 
-// src/commands/sessions/daemon/startOrHoldPty.ts
-function startOrHoldPty(start3, hold) {
-  if (hold) return { pty: null, pendingStart: start3 };
-  return { pty: start3() };
-}
-
-// src/commands/sessions/daemon/sessionBase.ts
-function sessionBase(id, status3) {
-  const startedAt = Date.now();
-  return {
-    id,
-    status: status3,
-    startedAt,
-    runningMs: 0,
-    /* why: runningMs counts only running stretches, so a session that starts
-     * waiting (idle, awaiting first input) has no open stretch to stamp. */
-    runningSince: status3 === "running" ? startedAt : null,
-    waitingSince: status3 === "waiting" ? startedAt : null,
-    scrollback: ""
-  };
-}
-
 // src/commands/sessions/daemon/createSession.ts
 function createSession(id, prompt, cwd, design, harness, holdPty) {
-  if (harness === "pi") return createPiSession(id, prompt, cwd, holdPty);
+  if (harness && harness !== "claude")
+    return createHarnessSession(id, harness, prompt, cwd, holdPty);
   const claudeSessionId = randomUUID9();
   return {
     ...sessionBase(id, prompt ? "running" : "waiting"),
@@ -30579,18 +30633,7 @@ function createSession(id, prompt, cwd, design, harness, holdPty) {
     design
   };
 }
-function createPiSession(id, prompt, cwd, holdPty) {
-  return {
-    ...sessionBase(id, prompt ? "running" : "waiting"),
-    name: `Session ${id}`,
-    commandType: "claude",
-    harness: "pi",
-    ...startOrHoldPty(() => spawnPi2({ prompt, cwd, sessionId: id }), holdPty),
-    cwd,
-    initialPrompt: prompt
-  };
-}
-function createRunSession(id, { runName, runArgs, cwd, meta, launchedFrom }) {
+function createRunSession(id, { runName, runArgs, cwd, meta }) {
   const serverMeta = meta ?? serverRunMeta(runName, cwd);
   return {
     ...sessionBase(id, "running"),
@@ -30600,7 +30643,6 @@ function createRunSession(id, { runName, runArgs, cwd, meta, launchedFrom }) {
     runName,
     runArgs,
     cwd,
-    launchedFrom,
     server: serverMeta.server || void 0,
     serverPort: serverMeta.port,
     serverOrigin: serverMeta.origin
@@ -31991,7 +32033,8 @@ function wireSessionWatchers(session, notify2, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/registerSpawnedSession.ts
-function registerSpawnedSession(session, sessions, clients, onStatusChange, notify2) {
+function registerSpawnedSession(session, sessions, clients, onStatusChange, notify2, context) {
+  if (context?.launchedFrom) session.launchedFrom = context.launchedFrom;
   sessions.set(session.id, session);
   wirePtyEvents(session, clients, onStatusChange);
   notify2();
@@ -32034,12 +32077,13 @@ var sessionLimits = {
 
 // src/commands/sessions/daemon/makeSessionSpawner.ts
 function makeSessionSpawner(sessions, clients, counter, onStatusChange, notify2) {
-  const register = (allocateId) => (create) => registerSpawnedSession(
+  const register = (allocateId) => (create, context) => registerSpawnedSession(
     create(allocateId()),
     sessions,
     clients,
     onStatusChange(),
-    notify2
+    notify2,
+    context
   );
   return {
     spawn: register(() => sessionLimits.nextId(sessions.size, counter)),
@@ -33199,6 +33243,7 @@ function resetCardForRun(session, assistArgs) {
   session.usageSeeded = false;
   setStatus2(session, "running");
   session.restored = void 0;
+  session.launchedFrom = void 0;
 }
 
 // src/commands/sessions/daemon/startReusedRunPty.ts
@@ -33279,16 +33324,19 @@ function releaseReason(durability, session) {
 }
 
 // src/commands/sessions/daemon/worktree/allocateAndBind.ts
-function allocateAndBind(ctx, cwd, create, options2 = {}) {
+function allocateAndBind(ctx, cwd, create, options2 = {}, context) {
   const alloc = allocateTree(cwd, boundTreeRoots(ctx.sessions), options2);
   const needsSeeding = alloc.kind === "worktree" && alloc.created === true;
-  const id = ctx.spawnWith((sid) => create(sid, alloc.cwd, needsSeeding));
+  const id = ctx.spawnWith(
+    (sid) => create(sid, alloc.cwd, needsSeeding),
+    context
+  );
   bindNewWorktree(ctx.sessions.get(id), alloc, ctx.notify, ctx.startHeld);
   return id;
 }
 
 // src/commands/sessions/daemon/worktree/ensureWatcher.ts
-function ensureWatcher(ctx, cwd) {
+function ensureWatcher(ctx, cwd, launchedFrom) {
   if (!cwd) return void 0;
   const repoRoot2 = findRepoRoot(cwd) ?? cwd;
   const cfg = worktreeConfigFor(repoRoot2);
@@ -33305,7 +33353,8 @@ function ensureWatcher(ctx, cwd) {
     ctx,
     clone,
     (sid, resolvedCwd) => createWatcherSession(sid, resolvedCwd ?? clone),
-    { inPlace: true }
+    { inPlace: true },
+    { launchedFrom }
   );
   daemonLog(
     `spawned watcher session ${id} running /watch in the clone ${clone}`
@@ -33399,7 +33448,7 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
     onStatusChange
   );
   if (!started) return;
-  if (tree) ensureWatcher(tree, originCwd);
+  if (tree) ensureWatcher(tree, originCwd, session.id);
   attachReusedRun(session, alloc, clients, onStatusChange, tree);
   daemonLog(
     `session ${session.id} reused for backlog run ${itemId2}: ${session.name}`
@@ -33722,7 +33771,7 @@ async function forwardWindowsCreate(conn, state, client, data) {
 }
 function stripOutboundSessionId(data) {
   const stripped = { ...data };
-  for (const key of ["sessionId", "joinSessionId"])
+  for (const key of ["sessionId", "joinSessionId", "launchedFrom"])
     if (typeof stripped[key] === "string")
       stripped[key] = stripWindowsSessionId(stripped[key]);
   return stripped;
@@ -34195,7 +34244,8 @@ function joinableStream(sessions, targetId) {
 function spawnIntoStream(ctx, target, prompt, harness) {
   const holdUntilSeeded = target.pendingStart !== void 0;
   const id = ctx.spawnWith(
-    (sid) => createSession(sid, prompt, target.cwd, false, harness, holdUntilSeeded)
+    (sid) => createSession(sid, prompt, target.cwd, false, harness, holdUntilSeeded),
+    { launchedFrom: target.id }
   );
   const joined = ctx.sessions.get(id);
   if (joined && target.worktree) joined.worktree = { ...target.worktree };
@@ -34241,8 +34291,7 @@ function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
     ),
     scrollback: "",
     assistArgs,
-    cwd,
-    launchedFrom: meta?.launchedFrom
+    cwd
   };
 }
 
@@ -34338,15 +34387,16 @@ function cloneForReapedTree(missingCwd) {
 }
 
 // src/commands/sessions/daemon/worktree/spawnInTree.ts
-function spawnInTree(ctx, prompt, cwd, design, harness, inPlace) {
+function spawnInTree(ctx, { prompt, cwd, design, harness, inPlace }, context) {
   return allocateAndBind(
     ctx,
     cwd,
     (sid, resolvedCwd, holdUntilSeeded) => createSession(sid, prompt, resolvedCwd, design, harness, holdUntilSeeded),
-    { inPlace }
+    { inPlace },
+    context
   );
 }
-function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
+function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
   const id = allocateAndBind(
     ctx,
     cwd,
@@ -34356,9 +34406,10 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
       commits: isCommittingArgs(assistArgs),
       draftLike: isDraftCommand(assistArgs[0]),
       inPlace: meta?.inPlace
-    }
+    },
+    context
   );
-  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd);
+  if (isBacklogRunArgs(assistArgs)) ensureWatcher(ctx, cwd, id);
   return id;
 }
 function resumeInTree(ctx, sessionId, cwd, name) {
@@ -34488,20 +34539,20 @@ var SessionManager = class {
       this.onStatusChange
     );
   }
-  spawn(prompt, cwd, design, harness, inPlace) {
-    return spawnInTree(this.treeCtx(), prompt, cwd, design, harness, inPlace);
+  spawn(request = {}, context) {
+    return spawnInTree(this.treeCtx(), request, context);
   }
   addAgent(targetId, prompt, harness) {
     return addAgentToStream(this.treeCtx(), targetId, prompt, harness);
   }
-  spawnRun(request) {
-    return this.spawnWith((id) => createRunSession(id, request));
+  spawnRun(request, context) {
+    return this.spawnWith((id) => createRunSession(id, request), context);
   }
   liveServerRun(origin, excludeId) {
     return liveServerRun(this.sessions, origin, excludeId);
   }
-  spawnAssist(assistArgs, cwd, meta) {
-    return spawnAssistInTree(this.treeCtx(), assistArgs, cwd, meta);
+  spawnAssist(assistArgs, cwd, meta, context) {
+    return spawnAssistInTree(this.treeCtx(), assistArgs, cwd, meta, context);
   }
   resume(sessionId, cwd, name) {
     return resumeInTree(this.treeCtx(), sessionId, cwd, name);
@@ -34602,13 +34653,20 @@ function creator(isNew, spawn13) {
   };
 }
 
+// src/commands/sessions/daemon/spawnContextFrom.ts
+function spawnContextFrom(d) {
+  return {
+    launchedFrom: d.launchedFrom ?? d.joinSessionId
+  };
+}
+
 // src/commands/sessions/daemon/handleCreateRun.ts
 function handleCreateRun(client, m, d) {
   if (m.windowsProxy.route(client, d)) return;
   const runName = d.runName;
   const cwd = d.cwd;
   const runArgs = d.runArgs ?? [];
-  const launchedFrom = d.launchedFrom;
+  const context = spawnContextFrom(d);
   const meta = serverRunMeta(runName, cwd);
   if (meta.server && meta.origin) {
     const existing = m.liveServerRun(meta.origin);
@@ -34620,7 +34678,7 @@ function handleCreateRun(client, m, d) {
         type: "run-conflict",
         runName,
         cwd,
-        launchedFrom,
+        launchedFrom: context.launchedFrom,
         existing: serverConflictInfo(existing)
       });
       return;
@@ -34634,7 +34692,7 @@ function handleCreateRun(client, m, d) {
   }
   sendTo(client, {
     type: "created",
-    sessionId: m.spawnRun({ runName, runArgs, cwd, meta, launchedFrom }),
+    sessionId: m.spawnRun({ runName, runArgs, cwd, meta }, context),
     isNew: true
   });
 }
@@ -34753,11 +34811,14 @@ function spawnCreate(m, d) {
     );
   }
   return m.spawn(
-    prompt,
-    d.cwd,
-    design,
-    harness,
-    d.inPlace === true
+    {
+      prompt,
+      cwd: d.cwd,
+      design,
+      harness,
+      inPlace: d.inPlace === true
+    },
+    spawnContextFrom(d)
   );
 }
 
@@ -34781,9 +34842,9 @@ var messageHandlers = {
       {
         title: d.title,
         subtitle: d.subtitle,
-        inPlace: d.inPlace === true,
-        launchedFrom: d.launchedFrom
-      }
+        inPlace: d.inPlace === true
+      },
+      spawnContextFrom(d)
     )
   ),
   resume: creator(

package/package.json

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