@hivefloor/cli 0.1.5 → 0.1.8

package/dist/{hook-AYJNRGIY.js → hook-TPSHBCWU.js}

@@ -1,48 +1,73 @@
 #!/usr/bin/env node
+import { createRequire as __hfCreateRequire } from 'node:module';
+const require = __hfCreateRequire(import.meta.url);
 import {
-  HARD_EXIT_MS
-} from "./chunk-JCLWCMEM.js";
+  HARD_EXIT_MS,
+  PERMISSION_HARD_STOP_MS,
+  PERMISSION_WAIT_MS
+} from "./chunk-4G362W6G.js";
 import {
   detectRepo
-} from "./chunk-RYGL6XU4.js";
+} from "./chunk-BLLPDPTL.js";
 import {
   envTokenForHost
-} from "./chunk-H6NYMF2D.js";
+} from "./chunk-NMUH5NXN.js";
 import {
   defaultHost,
   loadToken
-} from "./chunk-6MDJB3BV.js";
-import "./chunk-TKMIV7BG.js";
+} from "./chunk-QLMLB7RB.js";
+import "./chunk-QPAFN47B.js";
 import {
+  agentPidOf,
   appendToSpool,
+  clientIdleSec,
   contextEventName,
   contextOutput,
+  findPane,
   nudgesOf,
+  readSessions,
+  realProc,
   releaseSpool,
+  senderName,
   stashNudges,
+  takeDecision,
+  takeInbox,
   takeSpool,
-  takeStashed
-} from "./chunk-X6B6R32A.js";
+  takeStashed,
+  updateSession,
+  validCwd,
+  validTranscript
+} from "./chunk-5OJUJCE3.js";
+import "./chunk-SBOEAOHD.js";
+import {
+  controlOn,
+  readControl
+} from "./chunk-KQMPCV57.js";
 import {
   readMachine,
   serviceAlive
-} from "./chunk-IJRHCDIG.js";
+} from "./chunk-LX5A25O6.js";
+import {
+  runFile
+} from "./chunk-XAXKZ572.js";
 import {
   configDir,
   machineSpoolFile
-} from "./chunk-TPMFQUAW.js";
+} from "./chunk-XPGL7VYE.js";
 import {
   DEFAULT_HOST,
   assertTokenTransport,
   hostFromEnv
-} from "./chunk-SOXRITAW.js";
+} from "./chunk-QGULSOQ2.js";
 import {
+  CONTROL_REPLY_MAX,
   HOOK_BATCH_MAX,
   PROFILE_KEY_RE,
   SESSION_ACCOUNT_RE,
+  machinePromptResponse,
   redact
-} from "./chunk-4DRHR7LR.js";
-import "./chunk-K3NQKI34.js";
+} from "./chunk-HWBUESB4.js";
+import "./chunk-2ERPDCOT.js";
 
 // src/hook.ts
 import fs from "fs";
@@ -61,7 +86,13 @@ var NAMES = {
   pretooluse: "tool_agent_pre",
   posttooluse: "tool_agent_post"
 };
-var WAITING_TYPES = /* @__PURE__ */ new Set(["permission_prompt", "idle_prompt"]);
+var WAITING_TYPES = /* @__PURE__ */ new Set(["permission_prompt"]);
+function endsWithQuestion(text) {
+  const t = str(text);
+  if (!t) return false;
+  const last = t.split(/\r?\n/).map((l) => l.trim()).filter((l) => l !== "" && !/^```/.test(l)).pop() ?? "";
+  return /\?[\s*_)"'`]*$/.test(last);
+}
 var LINE_MAX = 140;
 var str = (v) => typeof v === "string" && v.trim() !== "" ? v : void 0;
 var rec = (v) => typeof v === "object" && v !== null && !Array.isArray(v) ? v : {};
@@ -118,6 +149,7 @@ function mapHookEvent(tool, native, input) {
     case "stop": {
       const s = statusLine(input.last_assistant_message) ?? statusLine(input.prompt_response);
       if (s) out.status_line = s;
+      if (endsWithQuestion(input.last_assistant_message ?? input.prompt_response)) out.asks = true;
       break;
     }
     default:
@@ -132,6 +164,170 @@ function cwdOf(input) {
 
 // src/hook.ts
 import path from "path";
+
+// src/service/control/hookside.ts
+import { randomBytes } from "crypto";
+var EVENTS = {
+  sessionstart: "SessionStart",
+  sessionend: "SessionEnd",
+  userpromptsubmit: "UserPromptSubmit",
+  pretooluse: "PreToolUse",
+  posttooluse: "PostToolUse",
+  stop: "Stop",
+  notification: "Notification",
+  permissionrequest: "PermissionRequest"
+};
+var INBOX_EVENTS = /* @__PURE__ */ new Set(["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse"]);
+var REPLY_WINDOW_MS = 30 * 6e4;
+var POLL_MS = 250;
+var TERMINAL_ACTIVE_SEC = 60;
+var str2 = (v) => typeof v === "string" && v !== "" ? v : void 0;
+var frameMessage = (from, text) => `Message from ${from} through HiveFloor: ${JSON.stringify(text)}`;
+async function controlHookStep(tool, native, input, deps) {
+  const out = { texts: [] };
+  try {
+    const ctl = (deps.readControl ?? readControl)();
+    const on = controlOn(ctl);
+    const sid = str2(input.session_id);
+    const ev = EVENTS[native.toLowerCase()];
+    if (!sid || !ev || ev === "PermissionRequest" || tool !== "claude" && tool !== "codex") return out;
+    const now = deps.now();
+    if (ev === "SessionEnd") {
+      updateSession(sid, now, () => void 0);
+      return out;
+    }
+    const before = readSessions(now)[sid];
+    const proc = deps.proc ?? realProc(deps.run ?? runFile);
+    const agent = !before?.pid || before.ended || ev === "SessionStart" ? await agentPidOf(proc, deps.pid, deps.ppid) : void 0;
+    const cwdRaw = cwdOf(input);
+    const cwd = validCwd(cwdRaw) ? cwdRaw : void 0;
+    const transcript = tool === "claude" && validTranscript(input.transcript_path) ? input.transcript_path : void 0;
+    const idleNote = ev === "Notification" && input.notification_type !== "permission_prompt";
+    let closed;
+    updateSession(sid, now, (e) => {
+      const next = { ...e ?? { tool, event: idleNote ? "Stop" : ev, at: deps.startedAt }, tool };
+      if (next.ended && !agent) {
+        delete next.pid;
+        delete next.start;
+      }
+      delete next.ended;
+      if (cwd) next.cwd = cwd;
+      if (transcript) next.transcript = transcript;
+      if (agent) {
+        next.pid = agent.pid;
+        next.start = agent.start;
+      }
+      if (!idleNote && deps.startedAt >= next.at) {
+        next.event = ev;
+        next.at = deps.startedAt;
+      }
+      if (on && next.prompt_id && ev !== "Notification") {
+        closed = next.prompt_id;
+        delete next.prompt_id;
+        delete next.prompt_at;
+      }
+      return next;
+    });
+    if (!on) return out;
+    if (closed) await deps.post(`/api/v1/machine/prompts/${encodeURIComponent(closed)}/close`, {}, 1500);
+    if (tool !== "claude") return out;
+    if (INBOX_EVENTS.has(ev)) out.texts = takeInbox(sid, now).map((m) => frameMessage(senderName(m.from), m.text));
+    if (ev === "Stop") {
+      const text = str2(input.last_assistant_message);
+      const after = readSessions(now)[sid]?.msg_at;
+      const allowed = ctl.config.replies === "always" || ctl.config.replies === "after_message" && after !== void 0 && now - after <= REPLY_WINDOW_MS;
+      if (text && allowed) out.reply = redact(text).text.slice(0, CONTROL_REPLY_MAX);
+    }
+  } catch {
+  }
+  return out;
+}
+var allow = JSON.stringify({ hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "allow" } } });
+var deny = (message) => JSON.stringify({ hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny", ...message ? { message } : {} } } });
+function promptSummary(toolName, toolInput) {
+  let text = "";
+  try {
+    text = typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput) ?? "";
+  } catch {
+    text = "";
+  }
+  return `${toolName}: ${redact(text).text.slice(0, 300)}`.slice(0, 600);
+}
+async function permissionHook(input, deps) {
+  let timer;
+  const hard = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(void 0), PERMISSION_HARD_STOP_MS);
+    timer.unref?.();
+  });
+  try {
+    return await Promise.race([permissionInner(input, deps), hard]);
+  } catch {
+    return void 0;
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+async function permissionInner(input, deps) {
+  const ctl = (deps.readControl ?? readControl)();
+  const v = ctl.state === "ok" && ctl.config.enabled ? ctl.config.verbs : void 0;
+  if (!v || !v.approve && !v.deny) return void 0;
+  const sid = str2(input.session_id);
+  const toolName = str2(input.tool_name);
+  if (!sid || !toolName) return void 0;
+  const start = deps.now();
+  const run = deps.run ?? runFile;
+  const proc = deps.proc ?? realProc(run);
+  const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const promptId = randomBytes(16).toString("hex");
+  const agent = await agentPidOf(proc, deps.pid, deps.ppid);
+  updateSession(sid, start, (e) => ({
+    ...e ?? { tool: "claude", event: "PermissionRequest", at: deps.startedAt },
+    tool: "claude",
+    ...agent ? { pid: agent.pid, start: agent.start } : {},
+    event: "PermissionRequest",
+    at: Math.max(e?.at ?? 0, deps.startedAt),
+    prompt_id: promptId,
+    prompt_at: start
+  }));
+  const forget = () => updateSession(sid, deps.now(), (e) => {
+    if (!e || e.prompt_id !== promptId) return e;
+    const { prompt_id: _p, prompt_at: _a, ...rest } = e;
+    return rest;
+  });
+  const res = await deps.post("/api/v1/machine/prompts", { session_id: sid, prompt_id: promptId, tool_name: toolName, summary: promptSummary(toolName, input.tool_input) }, 3e3);
+  const hold = res && res.status >= 200 && res.status < 300 ? machinePromptResponse.safeParse(res.json) : void 0;
+  if (!hold?.success || !hold.data.hold) {
+    forget();
+    return void 0;
+  }
+  const pid = agent?.pid ?? readSessions(start)[sid]?.pid;
+  const pane = pid !== void 0 ? await findPane(run, proc, pid) : void 0;
+  const idle = pane ? await clientIdleSec(run, pane, deps.now()) : void 0;
+  if (idle !== void 0 && idle < TERMINAL_ACTIVE_SEC) {
+    await deps.post(`/api/v1/machine/prompts/${promptId}/close`, {}, 1500);
+    forget();
+    return void 0;
+  }
+  while (deps.now() - start < PERMISSION_WAIT_MS) {
+    const d = takeDecision(promptId);
+    if (d) {
+      forget();
+      return d.behavior === "allow" ? allow : deny(d.message);
+    }
+    await sleep(POLL_MS);
+  }
+  const last = takeDecision(promptId);
+  if (last) {
+    forget();
+    return last.behavior === "allow" ? allow : deny(last.message);
+  }
+  await deps.post(`/api/v1/machine/prompts/${promptId}/close`, {}, 1500);
+  forget();
+  return void 0;
+}
+
+// src/hook.ts
+var CONTROL_STEP_MS = 1500;
 var POST_TIMEOUT_MS = 2e3;
 var EXIT_MARGIN_MS = 400;
 var MIN_POST_MS = 250;
@@ -189,6 +385,52 @@ async function post(deps, host, token, events, timeoutMs, route = "/api/v1/hooks
     return "retry";
   }
 }
+function controlPost(deps, host, token) {
+  return async (route, body, timeoutMs) => {
+    try {
+      assertTokenTransport(host);
+      const res = await deps.fetch(`${host}${route}`, {
+        method: "POST",
+        headers: { authorization: `Bearer ${token}`, "content-type": "application/json" },
+        body: JSON.stringify(body),
+        redirect: "error",
+        signal: AbortSignal.timeout(timeoutMs)
+      });
+      const text = await res.text().catch(() => "");
+      let json;
+      try {
+        json = text ? JSON.parse(text) : void 0;
+      } catch {
+        json = void 0;
+      }
+      return { status: res.status, json };
+    } catch {
+      return void 0;
+    }
+  };
+}
+function controlDeps(deps, host, token, startedAt) {
+  return { now: deps.now, startedAt, pid: deps.pid ?? process.pid, ppid: deps.ppid ?? process.ppid, post: controlPost(deps, host, token), ...deps.control };
+}
+async function writeOut(deps, text) {
+  if (deps.write) {
+    deps.write(text);
+    return;
+  }
+  await new Promise((resolve) => {
+    const t = setTimeout(resolve, 500);
+    try {
+      process.stdout.write(`${text}
+`, () => {
+        clearTimeout(t);
+        resolve();
+      });
+    } catch {
+      clearTimeout(t);
+      resolve();
+    }
+  });
+}
 async function runHook(args, deps) {
   try {
     await runHookInner(args, deps, deps.now());
@@ -226,16 +468,34 @@ async function runHookInner(args, deps, startedAt) {
     return;
   }
   if (grokId && !input.session_id && !input.conversation_id) input = { ...input, session_id: grokId };
+  const controlled = machine !== void 0 && profile !== void 0 && !grokId && (toolArg === "claude" || toolArg === "codex");
+  let ctl = { texts: [] };
+  if (controlled) {
+    const cd = controlDeps(deps, host, token, startedAt);
+    if (toolArg === "claude" && native.toLowerCase() === "permissionrequest") {
+      const out = await permissionHook(input, cd);
+      if (out) await writeOut(deps, out);
+      return;
+    }
+    ctl = await Promise.race([controlHookStep(toolArg, native, input, cd), new Promise((r) => setTimeout(() => r({ texts: [] }), CONTROL_STEP_MS).unref())]);
+  }
   const mapped = mapHookEvent(toolArg === "grok" ? "claude" : toolArg, native, input);
-  if (!mapped) return;
+  if (!mapped) {
+    const name = contextEventName(toolArg, native);
+    if (name && ctl.texts.length > 0) await writeOut(deps, contextOutput(name, ctl.texts));
+    return;
+  }
   const nowMs = deps.now();
   const event = { ...mapped, tool, client_at: new Date(nowMs).toISOString() };
   const contextName = grokId ? null : contextEventName(toolArg, native);
   if (contextName) event.deliver = true;
-  const nudges = [];
+  if (ctl.reply && mapped.event === "stop") event.reply = ctl.reply;
+  const nudges = ctl.texts.map((text) => ({ session_id: event.session_id, text }));
   const show = () => printNudges(deps, contextName, event.session_id, nudges, nowMs);
   if (grokId && isDuplicate(`${tool}|${event.session_id}|${event.event}|${event.subagent_id ?? ""}`, nowMs)) return;
-  const repo = await detectRepo(cwdOf(input) ?? deps.cwd);
+  const reportedCwd = cwdOf(input);
+  if (validCwd(reportedCwd)) event.cwd = reportedCwd;
+  const repo = await detectRepo(reportedCwd ?? deps.cwd);
   if (repo) event.repo = { remote: repo.remote, ...repo.branch ? { branch: repo.branch } : {}, ...repo.path ? { path: repo.path } : {} };
   if (machine && profile !== void 0) {
     const account = deps.env.FLEET_PROFILE?.trim();

package/dist/index.js

@@ -1,22 +1,25 @@
 #!/usr/bin/env node
+import { createRequire as __hfCreateRequire } from 'node:module';
+const require = __hfCreateRequire(import.meta.url);
 import {
-  HARD_EXIT_MS
-} from "./chunk-JCLWCMEM.js";
-import "./chunk-K3NQKI34.js";
+  hardExitFor
+} from "./chunk-4G362W6G.js";
+import "./chunk-2ERPDCOT.js";
 
 // src/index.ts
 var argv = process.argv.slice(2);
 if (argv[0] === "hook") {
   process.on("uncaughtException", () => process.exit(0));
   process.on("unhandledRejection", () => process.exit(0));
-  setTimeout(() => process.exit(0), HARD_EXIT_MS).unref();
+  setTimeout(() => process.exit(0), hardExitFor(argv[2])).unref();
   try {
-    const { runHookCli } = await import("./hook-AYJNRGIY.js");
+    const { runHookCli } = await import("./hook-TPSHBCWU.js");
     await runHookCli(argv.slice(1));
   } catch {
   }
   process.exit(0);
 } else {
-  const { run } = await import("./cli-JCBZICR3.js");
+  const { run } = await import("./cli-BFOJWJNG.js");
   process.exitCode = await run(argv);
+  if (argv[0] === "service") process.exit(process.exitCode);
 }

package/dist/{link-ORT4LID6.js → link-EAS5F5PC.js}

@@ -1,37 +1,40 @@
 #!/usr/bin/env node
+import { createRequire as __hfCreateRequire } from 'node:module';
+const require = __hfCreateRequire(import.meta.url);
 import {
   deviceLogin
-} from "./chunk-3N5JYP5O.js";
+} from "./chunk-FPJNGKT5.js";
 import {
   detectRepo
-} from "./chunk-RYGL6XU4.js";
+} from "./chunk-BLLPDPTL.js";
 import {
   resolveSession
-} from "./chunk-H6NYMF2D.js";
+} from "./chunk-NMUH5NXN.js";
 import {
   saveToken
-} from "./chunk-6MDJB3BV.js";
+} from "./chunk-QLMLB7RB.js";
 import {
   checkUnknownFlags,
   flagStr
-} from "./chunk-TKMIV7BG.js";
+} from "./chunk-QPAFN47B.js";
 import {
   VERSION
-} from "./chunk-C627OKTW.js";
+} from "./chunk-K2IRTZH5.js";
 import {
   apiRequest,
   errorOf
-} from "./chunk-VX7SCIF2.js";
+} from "./chunk-NRJONTFT.js";
+import "./chunk-XAXKZ572.js";
 import {
   isTool
-} from "./chunk-TPMFQUAW.js";
+} from "./chunk-XPGL7VYE.js";
 import {
   machineName
-} from "./chunk-SOXRITAW.js";
+} from "./chunk-QGULSOQ2.js";
 import {
   cliNpxCommand
-} from "./chunk-4DRHR7LR.js";
-import "./chunk-K3NQKI34.js";
+} from "./chunk-HWBUESB4.js";
+import "./chunk-2ERPDCOT.js";
 
 // src/link.ts
 var LINK_FLAGS = /* @__PURE__ */ new Set(["project", "new", "path", "tool", "host", "no-open", "help", "h"]);

package/dist/{machine-connect-N52CKQEW.js → machine-connect-KEI4BRWF.js}

@@ -1,54 +1,60 @@
 #!/usr/bin/env node
+import { createRequire as __hfCreateRequire } from 'node:module';
+const require = __hfCreateRequire(import.meta.url);
 import {
   resolveHost
-} from "./chunk-IWIDKNWC.js";
+} from "./chunk-TIR4CV3P.js";
 import {
   deviceLogin
-} from "./chunk-3N5JYP5O.js";
+} from "./chunk-FPJNGKT5.js";
 import {
   installCliCopy,
   installMachineHooks
-} from "./chunk-U6RRUAC2.js";
-import "./chunk-6XVIEX75.js";
-import "./chunk-RYGL6XU4.js";
+} from "./chunk-5XXYQQG6.js";
+import "./chunk-4G362W6G.js";
+import "./chunk-QBBKGORP.js";
+import "./chunk-X2KH6AR4.js";
+import "./chunk-BLLPDPTL.js";
 import {
   installService,
   windowsUser
-} from "./chunk-6MDJB3BV.js";
+} from "./chunk-QLMLB7RB.js";
 import {
   flagStr
-} from "./chunk-TKMIV7BG.js";
+} from "./chunk-QPAFN47B.js";
 import {
   claudeDirsOfScan,
   cliVersionOs,
   scanProcesses
-} from "./chunk-MZGGJ6ZS.js";
+} from "./chunk-MYJCU5JL.js";
 import {
   VERSION
-} from "./chunk-C627OKTW.js";
+} from "./chunk-K2IRTZH5.js";
+import "./chunk-KQMPCV57.js";
 import {
   codexConfigDir
-} from "./chunk-J36OIJBM.js";
+} from "./chunk-L6EFW2SJ.js";
 import {
   readMachine,
   secureWindowsMachine,
   writeMachine
-} from "./chunk-IJRHCDIG.js";
-import "./chunk-VX7SCIF2.js";
+} from "./chunk-LX5A25O6.js";
+import "./chunk-NRJONTFT.js";
+import "./chunk-XAXKZ572.js";
 import {
   cliEntry,
   findBin
-} from "./chunk-TPMFQUAW.js";
+} from "./chunk-XPGL7VYE.js";
 import {
   machineName,
   normalizeHost,
   runCmd
-} from "./chunk-SOXRITAW.js";
+} from "./chunk-QGULSOQ2.js";
 import {
   cliNpxCommand,
   machineTokenSuccessSchema
-} from "./chunk-4DRHR7LR.js";
-import "./chunk-K3NQKI34.js";
+} from "./chunk-HWBUESB4.js";
+import "./chunk-2ERPDCOT.js";
 
 // src/machine-connect.ts
 import fs from "fs";
@@ -106,7 +112,7 @@ async function connectMachine(ctx, p) {
   state.installed.claude_dirs = hooks.claude_dirs;
   if (hooks.codex_dir) {
     state.installed.codex_dir = hooks.codex_dir;
-    warnings.push("Codex asks you to trust new hooks: run codex, open /hooks and approve the Hivefloor hooks once.");
+    warnings.push("Codex asks you to trust new hooks: run codex, open /hooks and approve the HiveFloor hooks once.");
   }
   writeMachine(state);
   if (p.flags["no-service"]) {