@dosu/cli 0.16.2 → 0.17.0

package/bin/dosu.js

@@ -4525,7 +4525,7 @@ var init_dist4 = __esm(() => {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.16.2";
+var VERSION = "0.17.0";
 
 // src/debug/logger.ts
 import {
@@ -9418,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) {
@@ -9432,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 };
 }
@@ -9565,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 };
 }
@@ -10165,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) {
@@ -10216,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);
@@ -10228,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({
@@ -10322,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;
@@ -12991,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);
@@ -13000,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);
 }
@@ -13128,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 (!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`);

package/package.json

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