@dosu/cli 0.16.1 → 0.17.0

package/bin/dosu.js

@@ -2218,6 +2218,34 @@ class Client {
   async delete(path) {
     return this.doRequest("DELETE", path);
   }
+  async getWithApiKey(path) {
+    return this.apiKeyRequest("GET", path);
+  }
+  async postWithApiKey(path, body) {
+    return this.apiKeyRequest("POST", path, body);
+  }
+  async apiKeyRequest(method, path, body) {
+    if (!this.config.api_key) {
+      throw new Error("no API key available");
+    }
+    const url = this.baseURL + path;
+    const headers = {
+      "Content-Type": "application/json",
+      "X-Dosu-API-Key": this.config.api_key
+    };
+    const options = { method, headers };
+    if (body !== undefined) {
+      options.body = JSON.stringify(body);
+    }
+    const controller = new AbortController;
+    const timeout = setTimeout(() => controller.abort(), 1e4);
+    options.signal = controller.signal;
+    try {
+      return await fetch(url, options);
+    } finally {
+      clearTimeout(timeout);
+    }
+  }
   async refreshToken() {
     if (!this.config.refresh_token) {
       throw new Error("no refresh token available");
@@ -4497,7 +4525,7 @@ var init_dist4 = __esm(() => {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.16.1";
+var VERSION = "0.17.0";
 
 // src/debug/logger.ts
 import {
@@ -5408,7 +5436,7 @@ function isDefinitiveError(err) {
 }
 async function requestCreateTicket(cfg, req) {
   const client = new Client(cfg);
-  const resp = await client.post(TICKETS_PATH, req);
+  const resp = await client.postWithApiKey(TICKETS_PATH, req);
   if (resp.status !== 202 && resp.status !== 200 && resp.status !== 201) {
     throw new TicketHttpError(resp.status);
   }
@@ -5416,7 +5444,7 @@ async function requestCreateTicket(cfg, req) {
 }
 async function requestGetTicket(cfg, ticketId) {
   const client = new Client(cfg);
-  const resp = await client.get(`${TICKETS_PATH}/${encodeURIComponent(ticketId)}`);
+  const resp = await client.getWithApiKey(`${TICKETS_PATH}/${encodeURIComponent(ticketId)}`);
   if (resp.status !== 200 && resp.status !== 202) {
     throw new TicketHttpError(resp.status);
   }
@@ -6224,7 +6252,8 @@ function installClaudeHooks(configPath, opts = {}) {
   if (typeof cfg.hooks !== "object" || cfg.hooks === null) {
     cfg.hooks = {};
   }
-  const events = [...DEFAULT_HOOK_EVENTS, ...opts.withStop ? ["Stop"] : []];
+  const includeStop = opts.stop !== false;
+  const events = DEFAULT_HOOK_EVENTS.filter((event) => event !== "Stop" || includeStop);
   for (const event of events) {
     const existing = Array.isArray(cfg.hooks[event]) ? cfg.hooks[event] : [];
     const preserved = existing.filter((g2) => !isDosuGroup(g2));
@@ -6284,7 +6313,7 @@ function inspectClaudeHooks(configPath) {
 var DEFAULT_HOOK_EVENTS, MARKER = "__dosu", EVENT_SUBCOMMAND;
 var init_claude_code = __esm(() => {
   init_config_helpers();
-  DEFAULT_HOOK_EVENTS = ["UserPromptSubmit", "PostToolUse"];
+  DEFAULT_HOOK_EVENTS = ["UserPromptSubmit", "PostToolUse", "Stop"];
   EVENT_SUBCOMMAND = {
     UserPromptSubmit: "user-prompt-submit",
     PostToolUse: "post-tool-use",
@@ -9389,7 +9418,7 @@ function hasNewVisibleRepository(previousRepos, nextRepos) {
   const previousRepoIds = new Set(previousRepos.map((repo) => repo.repository_id));
   return nextRepos.some((repo) => !previousRepoIds.has(repo.repository_id));
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function waitForRepositoryRefresh(trpc, orgID, previousRepos, opts) {
@@ -9403,7 +9432,7 @@ async function waitForRepositoryRefresh(trpc, orgID, previousRepos, opts) {
     if (hasNewVisibleRepository(previousRepos, latestRepos)) {
       return { repos: latestRepos, foundNew: true };
     }
-    await sleep2(intervalMs);
+    await sleep3(intervalMs);
   }
   return { repos: latestRepos, foundNew: false };
 }
@@ -9536,7 +9565,7 @@ async function verifyDataSourcesPersist(trpc, orgID, expectedDataSourceIds, opts
       return { alive, dropped };
     if (timeoutMs === 0)
       break;
-    await sleep2(intervalMs);
+    await sleep3(intervalMs);
   }
   return { alive, dropped };
 }
@@ -10136,7 +10165,7 @@ async function waitForImportTaskCompletion(trpc, taskID, spinner, expectedTotal)
         return null;
       }
     }
-    await sleep3(IMPORT_STATUS_POLL_INTERVAL_MS);
+    await sleep4(IMPORT_STATUS_POLL_INTERVAL_MS);
   }
 }
 function buildImportProgressMessage(status, expectedTotal) {
@@ -10187,7 +10216,7 @@ async function waitForImportableGithubFiles(trpc, orgID, spaceID, expectedDataSo
           spinner.stop(latestFiles.length > 0 ? "Docs ready" : "No markdown docs found");
           return latestFiles;
         }
-        await sleep3(DOC_SCAN_POLL_INTERVAL_MS);
+        await sleep4(DOC_SCAN_POLL_INTERVAL_MS);
         continue;
       }
       latestFiles = await fetchImportableGithubFiles(trpc, spaceID);
@@ -10199,7 +10228,7 @@ async function waitForImportableGithubFiles(trpc, orgID, spaceID, expectedDataSo
         spinner.stop("No markdown docs found");
         return [];
       }
-      await sleep3(DOC_SCAN_POLL_INTERVAL_MS);
+      await sleep4(DOC_SCAN_POLL_INTERVAL_MS);
     }
     spinner.stop("Timed out");
     const choice = await ve({
@@ -10293,7 +10322,7 @@ async function getKnowledgeStoreID(trpc, spaceID) {
     return null;
   }
 }
-function sleep3(ms) {
+function sleep4(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 var DOC_SCAN_POLL_INTERVAL_MS = 2000, DOC_SCAN_POLL_TIMEOUT_MS = 60000, IMPORT_STATUS_POLL_INTERVAL_MS = 2000, IMPORT_STATUS_MAX_ERRORS = 3;
@@ -12962,6 +12991,8 @@ function saveState(state) {
 // src/commands/hooks.ts
 var COOLDOWN_DEFAULT_MS = 3000;
 var TTL_DEFAULT_MS = 10 * 60 * 1000;
+var STOP_WAIT_DEFAULT_MS = 8000;
+var STOP_POLL_DEFAULT_MS = 1000;
 var SUPPORTED_AGENTS = ["claude-code"];
 function cooldownMs() {
   const n = Number.parseInt(process.env.DOSU_HOOK_CHECK_COOLDOWN_MS ?? "", 10);
@@ -12971,12 +13002,21 @@ function ttlMs() {
   const n = Number.parseInt(process.env.DOSU_HOOK_TTL_MS ?? "", 10);
   return Number.isFinite(n) && n > 0 ? n : TTL_DEFAULT_MS;
 }
+function stopWaitMs() {
+  const n = Number.parseInt(process.env.DOSU_HOOK_STOP_WAIT_MS ?? "", 10);
+  return Number.isFinite(n) && n >= 0 ? n : STOP_WAIT_DEFAULT_MS;
+}
+function stopPollMs() {
+  const n = Number.parseInt(process.env.DOSU_HOOK_STOP_POLL_MS ?? "", 10);
+  return Number.isFinite(n) && n > 0 ? n : STOP_POLL_DEFAULT_MS;
+}
 function printHookContext(event, additionalContext) {
   console.log(JSON.stringify({ hookSpecificOutput: { hookEventName: event, additionalContext } }));
 }
 function printContinue() {
   console.log(JSON.stringify({ continue: true }));
 }
+var sleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 function sid8(sessionId) {
   return sessionId.slice(0, 8);
 }
@@ -12999,7 +13039,7 @@ async function runUserPromptSubmit(input, now = Date.now()) {
     return;
   }
   const cfg = loadConfig();
-  if (!isAuthenticated(cfg) || !cfg.deployment_id) {
+  if (!cfg.api_key || !cfg.deployment_id) {
     logger.debug("hooks", "submit skipped reason=not-configured");
     return;
   }
@@ -13053,7 +13093,7 @@ async function runPostToolUse(input, now = Date.now()) {
     return;
   }
   const cfg = loadConfig();
-  if (!isAuthenticated(cfg) || !cfg.deployment_id) {
+  if (!cfg.api_key || !cfg.deployment_id) {
     saveState({ ...state, lastCheckedAt: now });
     return;
   }
@@ -13099,40 +13139,42 @@ async function runStop(input, now = Date.now()) {
   const sessionId = input.session_id;
   if (!sessionId)
     return printContinue();
-  if (input.stop_hook_active === true)
-    return printContinue();
   const state = loadState(sessionId);
   if (!state)
     return printContinue();
   if (state.status !== "pending" || now > state.expiresAt)
     return printContinue();
-  if (state.lastCheckedAt !== undefined && now - state.lastCheckedAt < cooldownMs()) {
-    return printContinue();
-  }
   const cfg = loadConfig();
-  if (!isAuthenticated(cfg) || !cfg.deployment_id)
+  if (!cfg.api_key || !cfg.deployment_id)
     return printContinue();
   const tc = await Promise.resolve().then(() => (init_ticket_client(), exports_ticket_client));
-  let resp;
-  try {
-    resp = await tc.requestGetTicket(cfg, state.ticketId);
-  } catch {
-    saveState({ ...state, lastCheckedAt: now });
-    return printContinue();
-  }
-  if (resp.status === "ready" && resp.result) {
-    saveState({ ...state, 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}
+  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);
+    } catch {
+      saveState({ ...state, lastCheckedAt: now });
+      return printContinue();
+    }
+    if (resp.status === "ready" && resp.result) {
+      saveState({ ...state, 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`);
-      return;
+        logger.info("hooks", `stop tid=${state.ticketId} delivered=true`);
+        return;
+      }
+      logger.debug("hooks", `stop tid=${state.ticketId} delivered=true gap-no-block`);
+      return printContinue();
     }
-    logger.debug("hooks", `stop tid=${state.ticketId} delivered=true gap-no-block`);
-    return printContinue();
+    if (resp.status !== "pending" || waited >= maxWaits)
+      break;
+    await sleep2(pollMs);
   }
   saveState({ ...state, lastCheckedAt: now });
   logger.debug("hooks", `stop tid=${state.ticketId} delivered=false`);
@@ -13210,7 +13252,7 @@ async function runInstall(agent, opts) {
   const { installClaudeHooks: installClaudeHooks2, claudeLocalSettingsPath: claudeLocalSettingsPath2 } = await Promise.resolve().then(() => (init_claude_code(), exports_claude_code));
   const configPath = claudeLocalSettingsPath2(resolveDir(opts.dir));
   try {
-    const { events } = installClaudeHooks2(configPath, { withStop: opts.withStop });
+    const { events } = installClaudeHooks2(configPath, { stop: opts.stop });
     if (opts.json) {
       const { emitStep: emitStep2 } = await Promise.resolve().then(() => exports_output);
       emitStep2({ step: "hooks-install", path: configPath, events });
@@ -13300,7 +13342,7 @@ async function collectDoctorChecks(opts) {
       detail: "no deployment selected (run 'dosu setup')"
     });
   }
-  if (cfg.api_key && cfg.deployment_id && isAuthenticated(cfg)) {
+  if (cfg.api_key && cfg.deployment_id) {
     const { Client: Client2 } = await Promise.resolve().then(() => (init_client(), exports_client));
     const ok = await new Client2(cfg).validateAPIKey(cfg.api_key, cfg.deployment_id);
     checks.push({
@@ -13312,7 +13354,7 @@ async function collectDoctorChecks(opts) {
     checks.push({
       name: "backend",
       status: "warn",
-      detail: "skipped (not authenticated / no deployment)"
+      detail: "skipped (no API key / no deployment)"
     });
   }
   return checks;
@@ -13342,7 +13384,7 @@ function hooksCommand() {
   cmd.command("post-tool-use").description("Hook entrypoint: poll and inject ready knowledge once").action(async () => {
     await runHookEntrypoint("post-tool-use", readStdinRaw());
   });
-  cmd.command("stop").description("Hook entrypoint (opt-in): last-chance non-blocking delivery").action(async () => {
+  cmd.command("stop").description("Hook entrypoint: last-chance knowledge delivery when the agent stops").action(async () => {
     await runHookEntrypoint("stop", readStdinRaw());
   });
   cmd.command("status").description("Show the active Dosu knowledge ticket for this session").option("--json", "Output JSON", false).action((opts) => {
@@ -13355,13 +13397,13 @@ function hooksCommand() {
     }
     runStatus(input, opts);
   });
-  cmd.command("install").description("Install Dosu hooks into a coding agent's local config").addArgument(new Argument("<agent>", "coding agent to configure").choices(SUPPORTED_AGENTS)).option("--scope <scope>", "Config scope (local only)", "local").option("--dir <path>", "Project root (defaults to current directory)").option("--with-stop", "Also install the optional Stop hook", false).option("--json", "Emit machine-readable JSON", false).addHelpText("after", [
+  cmd.command("install").description("Install Dosu hooks into a coding agent's local config").addArgument(new Argument("<agent>", "coding agent to configure").choices(SUPPORTED_AGENTS)).option("--scope <scope>", "Config scope (local only)", "local").option("--dir <path>", "Project root (defaults to current directory)").option("--no-stop", "Skip the Stop hook (knowledge then delivers mid-session only, less reliably)").option("--json", "Emit machine-readable JSON", false).addHelpText("after", [
     "",
     `Supported agents: ${SUPPORTED_AGENTS.join(", ")}`,
     "",
     "Examples:",
     "  $ dosu hooks install claude-code",
-    "  $ dosu hooks install claude-code --with-stop",
+    "  $ dosu hooks install claude-code --no-stop",
     "  $ dosu hooks install claude-code --dir ./my-project"
   ].join(`
 `)).action((agent, opts) => runInstall(agent, opts));

package/package.json

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