@staff0rd/assist 0.535.1 → 0.536.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.536.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
@@ -27780,7 +27805,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 +30428,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 +30451,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 +30510,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 +30608,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,17 +30632,6 @@ 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 }) {
   const serverMeta = meta ?? serverRunMeta(runName, cwd);
   return {

package/package.json

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