@dosu/cli 0.38.0 → 0.40.0

package/bin/dosu.js

@@ -4759,7 +4759,7 @@ var init_dist4 = __esm(() => {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.38.0", INSTALL_CHANNEL = "npm";
+var VERSION = "0.40.0", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -8178,7 +8178,8 @@ __export(exports_prompts, {
   buildReadyEnvelope: () => buildReadyEnvelope,
   STOP_PREFIX: () => STOP_PREFIX,
   SAVE_NUDGE: () => SAVE_NUDGE,
-  LOOKUP_STARTED_NOTE: () => LOOKUP_STARTED_NOTE
+  LOOKUP_STARTED_NOTE: () => LOOKUP_STARTED_NOTE,
+  LATE_RESULT_NOTE: () => LATE_RESULT_NOTE
 });
 function buildReadyEnvelope(context, saveRecommended = false) {
   const trimmed = context.trim();
@@ -8204,9 +8205,10 @@ function buildReadyEnvelope(context, saveRecommended = false) {
 
 `);
 }
-var LOOKUP_STARTED_NOTE, STOP_PREFIX, SAVE_NUDGE;
+var LOOKUP_STARTED_NOTE, LATE_RESULT_NOTE, STOP_PREFIX, SAVE_NUDGE;
 var init_prompts = __esm(() => {
   LOOKUP_STARTED_NOTE = "Dosu started a background knowledge lookup for this request. Keep working normally — " + "do not wait or pause for it. If Dosu context arrives during this session, fold it in " + "quietly to work faster and avoid wrong assumptions. Mention Dosu when its context " + "helps you.";
+  LATE_RESULT_NOTE = "Heads-up: the context below answers your PREVIOUS prompt — its lookup finished after " + "that turn had already ended. Apply it only where it is still relevant to the current " + "work; do not treat it as a response to the new prompt.";
   STOP_PREFIX = "Dosu knowledge finished after your last action. Re-check your current conclusion against " + "it, then continue or finish — do not redo work it merely confirms.";
   SAVE_NUDGE = "Dosu has little or no existing knowledge on this topic. If you uncover something durable — " + "a non-obvious mechanism, a gotcha, or a route through the code — save it with the Dosu " + "`save_topic` tool when you finish, so future sessions start ahead. Only save genuinely " + "reusable knowledge; skip trivial or one-off details.";
 });
@@ -15033,12 +15035,13 @@ init_commander();
 init_config();
 init_logger();
 init_prompts();
+import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync11, readFileSync as readFileSync11 } from "node:fs";
 import { basename } from "node:path";
 
 // src/hooks/state.ts
 init_config();
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync6, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "node:fs";
 import { dirname as dirname2, join as join5 } from "node:path";
 function getStateDir() {
   return process.env.DOSU_HOOK_STATE_DIR ?? join5(getConfigDir(), "hooks");
@@ -15066,9 +15069,24 @@ function saveState(state) {
     writeFileSync5(file, JSON.stringify(state, null, 2), { mode: 384 });
   } catch {}
 }
-function clearState(sessionId) {
+function claimState(sessionId) {
+  const file = stateFile(sessionId);
   try {
-    rmSync2(stateFile(sessionId), { force: true });
+    renameSync2(file, `${file}.claim`);
+    return JSON.parse(readFileSync6(`${file}.claim`, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function releaseState(sessionId, state) {
+  const file = stateFile(sessionId);
+  if (state) {
+    try {
+      writeFileSync5(file, JSON.stringify(state, null, 2), { flag: "wx", mode: 384 });
+    } catch {}
+  }
+  try {
+    rmSync2(`${file}.claim`, { force: true });
   } catch {}
 }
 
@@ -15111,6 +15129,27 @@ function errMsg(err) {
 function repoSlug(cwd) {
   return cwd ? basename(cwd) : undefined;
 }
+function gitContext(cwd) {
+  if (!cwd)
+    return {};
+  const run2 = (args) => {
+    try {
+      const out = execFileSync2("git", args, {
+        cwd,
+        timeout: 1500,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"]
+      });
+      return out.toString().trim() || undefined;
+    } catch {
+      return;
+    }
+  };
+  const repo = run2(["remote", "get-url", "origin"]);
+  if (!repo)
+    return {};
+  return { repo, branch: run2(["branch", "--show-current"]) };
+}
 async function runUserPromptSubmit(input, now = Date.now(), agent = DEFAULT_AGENT) {
   const sessionId = input.session_id;
   if (!sessionId)
@@ -15128,14 +15167,31 @@ async function runUserPromptSubmit(input, now = Date.now(), agent = DEFAULT_AGEN
     logger.debug("hooks", `submit sid=${sid8(sessionId)} reuse tid=${existing.ticketId}`);
     return;
   }
-  if (existing)
-    clearState(sessionId);
+  const claimed = existing ? claimState(sessionId) : null;
   const cfg = loadConfig();
   if (!cfg.active_account?.target?.api_key || !cfg.active_account?.target?.deployment_id) {
+    if (claimed)
+      releaseState(sessionId, null);
     logger.debug("hooks", "submit skipped reason=not-configured");
     return;
   }
+  const git = gitContext(input.cwd);
   const tc = await Promise.resolve().then(() => (init_ticket_client(), exports_ticket_client));
+  let lateBlock;
+  if (claimed && claimed.status === "pending" && now <= claimed.expiresAt) {
+    try {
+      const old = await tc.requestGetTicket(cfg, claimed.ticketId);
+      if (old.status === "ready" && old.result?.context.trim()) {
+        const { buildReadyEnvelope: buildReadyEnvelope2, LATE_RESULT_NOTE: LATE_RESULT_NOTE2 } = await Promise.resolve().then(() => (init_prompts(), exports_prompts));
+        lateBlock = `${LATE_RESULT_NOTE2}
+
+${buildReadyEnvelope2(old.result.context, old.result.save_recommended ?? false)}`;
+        logger.info("hooks", `harvest tid=${claimed.ticketId} delivered=late`);
+      }
+    } catch {}
+  }
+  if (claimed)
+    releaseState(sessionId, null);
   const startedAt = Date.now();
   let resp;
   try {
@@ -15145,7 +15201,8 @@ async function runUserPromptSubmit(input, now = Date.now(), agent = DEFAULT_AGEN
       session_id: sessionId,
       turn_id: turnId,
       prompt,
-      repo: repoSlug(input.cwd)
+      repo: git.repo ?? repoSlug(input.cwd),
+      branch: git.branch
     });
   } catch (err) {
     logger.warn("hooks", `error event=user-prompt-submit reason=${errMsg(err)}`);
@@ -15161,7 +15218,9 @@ async function runUserPromptSubmit(input, now = Date.now(), agent = DEFAULT_AGEN
   });
   logger.info("hooks", `create sid=${sid8(sessionId)} tid=${resp.ticket_id} latency=${Date.now() - startedAt}ms`);
   const { LOOKUP_STARTED_NOTE: LOOKUP_STARTED_NOTE2 } = await Promise.resolve().then(() => (init_prompts(), exports_prompts));
-  printHookContext("UserPromptSubmit", LOOKUP_STARTED_NOTE2);
+  printHookContext("UserPromptSubmit", lateBlock ? `${lateBlock}
+
+${LOOKUP_STARTED_NOTE2}` : LOOKUP_STARTED_NOTE2);
 }
 async function runPostToolUse(input, now = Date.now()) {
   const sessionId = input.session_id;
@@ -15189,35 +15248,45 @@ async function runPostToolUse(input, now = Date.now()) {
     saveState({ ...state, lastCheckedAt: now });
     return;
   }
+  const claimed = claimState(sessionId);
+  if (!claimed) {
+    logger.debug("hooks", `poll tid=${state.ticketId} skipped=contended`);
+    return;
+  }
   const tc = await Promise.resolve().then(() => (init_ticket_client(), exports_ticket_client));
   const startedAt = Date.now();
   let resp;
   try {
-    resp = await tc.requestGetTicket(cfg, state.ticketId);
+    resp = await tc.requestGetTicket(cfg, claimed.ticketId);
   } catch (err) {
     if (tc.isDefinitiveError(err)) {
-      saveState({ ...state, status: "failed", lastCheckedAt: now });
+      releaseState(sessionId, { ...claimed, status: "failed", lastCheckedAt: now });
       logger.warn("hooks", `error event=post-tool-use reason=${errMsg(err)} definitive`);
     } else {
-      saveState({ ...state, lastCheckedAt: now });
-      logger.debug("hooks", `poll tid=${state.ticketId} transient-error`);
+      releaseState(sessionId, { ...claimed, lastCheckedAt: now });
+      logger.debug("hooks", `poll tid=${claimed.ticketId} transient-error`);
     }
     return;
   }
   if (resp.status === "pending") {
-    saveState({ ...state, lastCheckedAt: now });
-    logger.debug("hooks", `poll tid=${state.ticketId} status=pending`);
+    releaseState(sessionId, { ...claimed, lastCheckedAt: now });
+    logger.debug("hooks", `poll tid=${claimed.ticketId} status=pending`);
     return;
   }
   if (resp.status === "failed" || resp.status === "expired") {
-    saveState({ ...state, status: resp.status, lastCheckedAt: now });
+    releaseState(sessionId, { ...claimed, status: resp.status, lastCheckedAt: now });
     return;
   }
   if (!resp.result) {
-    saveState({ ...state, status: "failed", lastCheckedAt: now });
+    releaseState(sessionId, { ...claimed, status: "failed", lastCheckedAt: now });
     return;
   }
-  saveState({ ...state, status: "delivered", deliveredAt: now, lastCheckedAt: now });
+  releaseState(sessionId, {
+    ...claimed,
+    status: "delivered",
+    deliveredAt: now,
+    lastCheckedAt: now
+  });
   const { buildReadyEnvelope: buildReadyEnvelope2 } = await Promise.resolve().then(() => (init_prompts(), exports_prompts));
   const context = buildReadyEnvelope2(resp.result.context, resp.result.save_recommended ?? false);
   if (context) {
@@ -15239,37 +15308,45 @@ async function runStop(input, now = Date.now()) {
   const cfg = loadConfig();
   if (!cfg.active_account?.target?.api_key || !cfg.active_account?.target?.deployment_id)
     return printContinue();
+  const claimed = claimState(sessionId);
+  if (!claimed)
+    return printContinue();
   const tc = await Promise.resolve().then(() => (init_ticket_client(), exports_ticket_client));
   const pollMs = stopPollMs();
   const maxWaits = pollMs > 0 ? Math.floor(stopWaitMs() / pollMs) : 0;
   for (let waited = 0;; waited++) {
     let resp;
     try {
-      resp = await tc.requestGetTicket(cfg, state.ticketId);
+      resp = await tc.requestGetTicket(cfg, claimed.ticketId);
     } catch {
-      saveState({ ...state, lastCheckedAt: now });
+      releaseState(sessionId, { ...claimed, lastCheckedAt: now });
       return printContinue();
     }
     if (resp.status === "ready" && resp.result) {
-      saveState({ ...state, status: "delivered", deliveredAt: now, lastCheckedAt: now });
+      releaseState(sessionId, {
+        ...claimed,
+        status: "delivered",
+        deliveredAt: now,
+        lastCheckedAt: now
+      });
       if (resp.result.context.trim()) {
         const { buildReadyEnvelope: buildReadyEnvelope2, STOP_PREFIX: STOP_PREFIX2 } = await Promise.resolve().then(() => (init_prompts(), exports_prompts));
         const envelope = buildReadyEnvelope2(resp.result.context, resp.result.save_recommended ?? false);
         console.log(JSON.stringify({ decision: "block", reason: `${STOP_PREFIX2}
 
 ${envelope}` }));
-        logger.info("hooks", `stop tid=${state.ticketId} delivered=true`);
+        logger.info("hooks", `stop tid=${claimed.ticketId} delivered=true`);
         return;
       }
-      logger.debug("hooks", `stop tid=${state.ticketId} delivered=true gap-no-block`);
+      logger.debug("hooks", `stop tid=${claimed.ticketId} delivered=true gap-no-block`);
       return printContinue();
     }
     if (resp.status !== "pending" || waited >= maxWaits)
       break;
     await sleep4(pollMs);
   }
-  saveState({ ...state, lastCheckedAt: now });
-  logger.debug("hooks", `stop tid=${state.ticketId} delivered=false`);
+  releaseState(sessionId, { ...claimed, lastCheckedAt: now });
+  logger.debug("hooks", `stop tid=${claimed.ticketId} delivered=false`);
   printContinue();
 }
 function runStatus(input, opts, now = Date.now()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",