@mrciphersmith/keryx 0.3.15 → 0.3.16

package/dist/cli.js

@@ -17637,7 +17637,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@mrciphersmith/keryx",
-    version: "0.3.15",
+    version: "0.3.16",
     description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
     private: false,
     publishConfig: {
@@ -58996,7 +58996,13 @@ ${hint}
       }
       if (roundState.round < roundState.maxRounds) {
         roundState.round += 1;
-        await finishWithBudgetSummary(io, deps, history, parentRunId, { maxAttempts, toolLog }, signal);
+        const wrapUp = await finishWithBudgetSummary(io, deps, history, parentRunId, { maxAttempts, toolLog }, signal);
+        if (wrapUp.aborted) {
+          system(`
+[stopped] Model turn interrupted by user.
+`);
+          return { finishReason: "interrupted" };
+        }
       } else {
         system(`
 [budget] Stopping tools: no progress (only repeated/exhausted tool signatures; ` + `max ${maxAttempts} attempts each). No model rounds remain for a wrap-up.
@@ -59208,6 +59214,9 @@ ${logBlock}
   };
   const request = signal === undefined ? { ...baseRequest } : { ...baseRequest, signal };
   const round = await streamWrapUpRound(io, deps, request, signal, system);
+  if (round.aborted || signal?.aborted === true) {
+    return { aborted: true };
+  }
   if (round.thrownError !== undefined) {
     system(`
 [error] wrap-up failed: ${round.thrownError}
@@ -59226,6 +59235,7 @@ ${logBlock}
     system(`
 [budget] No wrap-up text from the model. Re-run your request, or call the ` + "needed `keryx \u2026` command directly (e.g. `keryx wiki enrich --all`).\n");
   }
+  return { aborted: false };
 }
 async function finishWithSubmitResult(io, deps, history, parentRunId, why, signal) {
   const system = (text) => {
@@ -68912,6 +68922,7 @@ async function enrichPageDeep(input) {
   if (input.signal?.aborted) {
     return { fallback: true, reason: "deep enrich cancelled", toolCalls };
   }
+  let disposeComposed;
   try {
     const env = envWithSavedApiKeys(input.env ?? process.env);
     const credentialAvailable = hasCredential(input.provider, env);
@@ -68988,6 +68999,7 @@ async function enrichPageDeep(input) {
     let pending;
     const abort = new AbortController;
     const composed = composeAbortSignals(input.signal, abort.signal);
+    disposeComposed = composed.dispose;
     const io = {
       write: (s) => {
         assistant += s;
@@ -69086,6 +69098,7 @@ async function enrichPageDeep(input) {
     }
     return { enriched: raw, toolCalls };
   } catch (cause) {
+    disposeComposed?.();
     return { fallback: true, reason: `deep enrich failed: ${errorMessage2(cause)}`, toolCalls };
   }
 }
@@ -160994,256 +161007,257 @@ Kept the current session.
 `);
     }
   };
-  for await (const line of io.lines) {
-    io.onSafeBoundary?.();
-    if (line.startsWith("/")) {
-      const parts = line.trim().split(/\s+/);
-      const command = parts[0] ?? "";
-      const argument = parts.slice(1).join(" ");
-      if (command === "/exit" || command === "/quit") {
-        leaveBus();
-        releaseLease();
-        return;
-      }
-      if (command === "/bus") {
-        await runBusSlashCommand(bus, argument, system);
-        continue;
-      }
-      if (command === "/help") {
-        system(HELP_TEXT);
-        continue;
-      }
-      if (isSessionInfoCommand(command)) {
-        const cwd = deps.session?.cwd;
-        const [workspaces, flows] = cwd === undefined ? [[], []] : await Promise.all([loadInspectorWorkspaces(cwd), loadInspectorFlows(cwd)]);
-        system(formatSessionInfoText(buildSessionInfoSnapshot({
-          summary: live?.summary,
-          selection: { provider: providerName, model: modelName },
-          version: package_default.version,
-          estimateTokens: estimateContextTokens(history),
-          limits: await loadSessionLimits({
-            provider: providerName,
-            model: modelName,
-            ...baseUrl !== undefined ? { baseUrl } : {}
-          }),
-          sessionText: history.map((message) => message.content).join(`
-`),
-          workspaces,
-          flows
-        })));
-        continue;
-      }
-      if (isFlowsCommand(command)) {
-        const cwd = deps.session?.cwd;
-        const items = cwd === undefined ? [] : await loadInspectorFlows(cwd);
-        const query = argument.trim();
-        if (query.length > 0) {
-          const found = findFlowItem(items, query);
-          system(found !== undefined ? formatFlowDetailText(found) : `No flow matching '${query}'.
-`);
+  try {
+    for await (const line of io.lines) {
+      io.onSafeBoundary?.();
+      if (line.startsWith("/")) {
+        const parts = line.trim().split(/\s+/);
+        const command = parts[0] ?? "";
+        const argument = parts.slice(1).join(" ");
+        if (command === "/exit" || command === "/quit") {
+          return;
+        }
+        if (command === "/bus") {
+          await runBusSlashCommand(bus, argument, system);
           continue;
         }
-        system(formatFlowListText(items));
-        continue;
-      }
-      if (command === "/theme") {
-        const wanted = argument.trim();
-        if (wanted.length === 0) {
-          system(formatThemeList(getThemeId()));
+        if (command === "/help") {
+          system(HELP_TEXT);
           continue;
         }
-        const next = parseThemeId(wanted);
-        if (next === undefined) {
-          system(`Unknown theme '${wanted}'.
-${formatThemeList(getThemeId())}`);
+        if (isSessionInfoCommand(command)) {
+          const cwd = deps.session?.cwd;
+          const [workspaces, flows] = cwd === undefined ? [[], []] : await Promise.all([loadInspectorWorkspaces(cwd), loadInspectorFlows(cwd)]);
+          system(formatSessionInfoText(buildSessionInfoSnapshot({
+            summary: live?.summary,
+            selection: { provider: providerName, model: modelName },
+            version: package_default.version,
+            estimateTokens: estimateContextTokens(history),
+            limits: await loadSessionLimits({
+              provider: providerName,
+              model: modelName,
+              ...baseUrl !== undefined ? { baseUrl } : {}
+            }),
+            sessionText: history.map((message) => message.content).join(`
+`),
+            workspaces,
+            flows
+          })));
           continue;
         }
-        applyThemeId(next);
-        persistThemeId(next);
-        system(`Theme: ${themeLabel(next)}
-`);
-        continue;
-      }
-      if (command === "/clear" || command === "/new") {
-        if (sessionsOn) {
-          try {
-            const next = switchLeasedSession(lease, () => openLeased({ cwd: sessionCwd, provider: providerName, model: modelName }));
-            holdLease(next.lease);
-            live = next.handle;
-          } catch (cause) {
-            system(`${cause instanceof Error ? cause.message : String(cause)}
-Kept the current session.
+        if (isFlowsCommand(command)) {
+          const cwd = deps.session?.cwd;
+          const items = cwd === undefined ? [] : await loadInspectorFlows(cwd);
+          const query = argument.trim();
+          if (query.length > 0) {
+            const found = findFlowItem(items, query);
+            system(found !== undefined ? formatFlowDetailText(found) : `No flow matching '${query}'.
 `);
             continue;
           }
-          history = [];
-          archive = [];
-          try {
-            await bus?.setSession(live.summary.id);
-          } catch (cause) {
-            system(busErrorLine(cause));
-          }
-          system(`New session ${shortSessionId(live.summary.id)} (previous kept on disk)
-`);
-        } else {
-          history.length = 0;
+          system(formatFlowListText(items));
+          continue;
         }
-        continue;
-      }
-      if (command === "/compact") {
-        if (live === undefined) {
-          system(`No persistent session in this mode.
+        if (command === "/theme") {
+          const wanted = argument.trim();
+          if (wanted.length === 0) {
+            system(formatThemeList(getThemeId()));
+            continue;
+          }
+          const next = parseThemeId(wanted);
+          if (next === undefined) {
+            system(`Unknown theme '${wanted}'.
+${formatThemeList(getThemeId())}`);
+            continue;
+          }
+          applyThemeId(next);
+          persistThemeId(next);
+          system(`Theme: ${themeLabel(next)}
 `);
           continue;
         }
-        if (!leaseWatch.canPersist()) {
-          system(LOST_LEASE_COMPACT_REFUSAL);
+        if (command === "/clear" || command === "/new") {
+          if (sessionsOn) {
+            try {
+              const next = switchLeasedSession(lease, () => openLeased({ cwd: sessionCwd, provider: providerName, model: modelName }));
+              holdLease(next.lease);
+              live = next.handle;
+            } catch (cause) {
+              system(`${cause instanceof Error ? cause.message : String(cause)}
+Kept the current session.
+`);
+              continue;
+            }
+            history = [];
+            archive = [];
+            try {
+              await bus?.setSession(live.summary.id);
+            } catch (cause) {
+              system(busErrorLine(cause));
+            }
+            system(`New session ${shortSessionId(live.summary.id)} (previous kept on disk)
+`);
+          } else {
+            history.length = 0;
+          }
           continue;
         }
-        const focus = argument.trim();
-        const packed = compactSession(live, history, archive, {
-          keepLastUserTurns: 3,
-          ...focus.length > 0 ? { focus } : {},
-          provider: providerName,
-          model: modelName
-        });
-        live = packed.handle;
-        history = packed.context;
-        if (packed.result.noop) {
-          system(`Nothing to compact (context already small).
+        if (command === "/compact") {
+          if (live === undefined) {
+            system(`No persistent session in this mode.
 `);
-        } else {
-          system(`Compacted: removed ${packed.result.removed} msgs from context \xB7 archive ${live.summary.archiveMessageCount} \xB7 compact\xD7${live.summary.compactCount}
+            continue;
+          }
+          if (!leaseWatch.canPersist()) {
+            system(LOST_LEASE_COMPACT_REFUSAL);
+            continue;
+          }
+          const focus = argument.trim();
+          const packed = compactSession(live, history, archive, {
+            keepLastUserTurns: 3,
+            ...focus.length > 0 ? { focus } : {},
+            provider: providerName,
+            model: modelName
+          });
+          live = packed.handle;
+          history = packed.context;
+          if (packed.result.noop) {
+            system(`Nothing to compact (context already small).
 `);
+          } else {
+            system(`Compacted: removed ${packed.result.removed} msgs from context \xB7 archive ${live.summary.archiveMessageCount} \xB7 compact\xD7${live.summary.compactCount}
+`);
+          }
+          continue;
         }
-        continue;
-      }
-      if (command === "/model") {
-        if (argument.length > 0) {
-          modelName = argument;
-          provider = makeActive();
+        if (command === "/model") {
+          if (argument.length > 0) {
+            modelName = argument;
+            provider = makeActive();
+          }
+          continue;
         }
-        continue;
-      }
-      if (command === "/models") {
-        if (deps.selectProviderModel === undefined) {
-          system(`Interactive model selection is not available in this session.
+        if (command === "/models") {
+          if (deps.selectProviderModel === undefined) {
+            system(`Interactive model selection is not available in this session.
 `);
+            continue;
+          }
+          await selectAndApply({ onlyProvider: providerName });
           continue;
         }
-        await selectAndApply({ onlyProvider: providerName });
-        continue;
-      }
-      if (command === "/provider") {
-        if (argument.length > 0) {
-          if (argument === "openai-codex") {
-            if (deps.selectProviderModel === undefined) {
-              system("Interactive subscription selection is not available. Run `keryx auth login openai-codex` and select an authorized model.\n");
-            } else {
-              await selectAndApply({ onlyProvider: "openai-codex" });
+        if (command === "/provider") {
+          if (argument.length > 0) {
+            if (argument === "openai-codex") {
+              if (deps.selectProviderModel === undefined) {
+                system("Interactive subscription selection is not available. Run `keryx auth login openai-codex` and select an authorized model.\n");
+              } else {
+                await selectAndApply({ onlyProvider: "openai-codex" });
+              }
+              continue;
             }
+            providerName = argument;
+            provider = makeActive();
             continue;
           }
-          providerName = argument;
-          provider = makeActive();
+          if (deps.selectProviderModel === undefined) {
+            system(`Interactive provider selection is not available in this session.
+`);
+            continue;
+          }
+          await selectAndApply({});
           continue;
         }
-        if (deps.selectProviderModel === undefined) {
-          system(`Interactive provider selection is not available in this session.
-`);
+        if (command === "/connect") {
+          if (deps.selectProviderModel === undefined) {
+            system(CONNECT_GUIDANCE);
+            continue;
+          }
+          await selectAndApply({ onlyConnected: true });
           continue;
         }
-        await selectAndApply({});
-        continue;
-      }
-      if (command === "/connect") {
-        if (deps.selectProviderModel === undefined) {
-          system(CONNECT_GUIDANCE);
+        const wrongMode = describeUnavailableCommand(command, "chat");
+        if (wrongMode !== undefined) {
+          system(wrongMode);
           continue;
         }
-        await selectAndApply({ onlyConnected: true });
+        system(`Unknown command: ${command}. Type /help for commands.
+`);
         continue;
       }
-      const wrongMode = describeUnavailableCommand(command, "chat");
-      if (wrongMode !== undefined) {
-        system(wrongMode);
+      if (line.trim().length === 0) {
         continue;
       }
-      system(`Unknown command: ${command}. Type /help for commands.
-`);
-      continue;
-    }
-    if (line.trim().length === 0) {
-      continue;
-    }
-    history.push({ role: "user", content: line, provenance: "project" });
-    const resolvedMaxOutputTokens = modelParams.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS;
-    const request = {
-      providerId: providerName,
-      modelId: modelName,
-      systemInstruction: SYSTEM_INSTRUCTION,
-      messages: [...history],
-      budget: { maxOutputTokens: resolvedMaxOutputTokens, runReservation: resolvedMaxOutputTokens },
-      ...modelParams.temperature !== undefined ? { options: { temperature: modelParams.temperature } } : {},
-      stream: true,
-      requestId: deps.idSeq(),
-      parentRunId
-    };
-    let accumulated = "";
-    let errored = false;
-    busWorking = true;
-    io.onTurnStart?.();
-    try {
-      const streamOptions = {
-        attemptId: deps.idSeq(),
-        ...modelParams.timeoutMs !== undefined ? { timeoutMs: modelParams.timeoutMs } : {}
+      history.push({ role: "user", content: line, provenance: "project" });
+      const resolvedMaxOutputTokens = modelParams.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS;
+      const request = {
+        providerId: providerName,
+        modelId: modelName,
+        systemInstruction: SYSTEM_INSTRUCTION,
+        messages: [...history],
+        budget: { maxOutputTokens: resolvedMaxOutputTokens, runReservation: resolvedMaxOutputTokens },
+        ...modelParams.temperature !== undefined ? { options: { temperature: modelParams.temperature } } : {},
+        stream: true,
+        requestId: deps.idSeq(),
+        parentRunId
       };
-      for await (const event of provider.stream(request, streamOptions)) {
-        if (event.kind === "text_delta") {
-          const text = event.text ?? "";
-          io.write(text);
-          accumulated += text;
-        } else if (event.kind === "provider_error") {
-          const detail = event.error?.message ?? event.error?.kind ?? "provider error";
-          system(`
+      let accumulated = "";
+      let errored = false;
+      busWorking = true;
+      io.onTurnStart?.();
+      try {
+        const streamOptions = {
+          attemptId: deps.idSeq(),
+          ...modelParams.timeoutMs !== undefined ? { timeoutMs: modelParams.timeoutMs } : {}
+        };
+        for await (const event of provider.stream(request, streamOptions)) {
+          if (event.kind === "text_delta") {
+            const text = event.text ?? "";
+            io.write(text);
+            accumulated += text;
+          } else if (event.kind === "provider_error") {
+            const detail = event.error?.message ?? event.error?.kind ?? "provider error";
+            system(`
 [error] ${detail}
 `);
-          errored = true;
-          break;
-        } else if (event.kind === "model_end") {
-          break;
+            errored = true;
+            break;
+          } else if (event.kind === "model_end") {
+            break;
+          }
         }
-      }
-    } catch (cause) {
-      system(`
+      } catch (cause) {
+        system(`
 [error] ${cause instanceof Error ? cause.message : String(cause)}
 `);
-      errored = true;
-    }
-    if (accumulated.length > 0) {
-      io.onTurnEnd?.(accumulated);
-    }
-    if (!errored) {
-      history.push({ role: "assistant", content: accumulated, provenance: "model" });
-      archive.push({ role: "user", content: line, provenance: "project" });
-      archive.push({ role: "assistant", content: accumulated, provenance: "model" });
-      save();
-    } else if (accumulated.length > 0) {
-      history.push({ role: "assistant", content: accumulated, provenance: "model" });
-      archive.push({ role: "user", content: line, provenance: "project" });
-      archive.push({ role: "assistant", content: accumulated, provenance: "model" });
-      save();
-    } else {
-      history.pop();
-    }
-    busWorking = false;
-    io.onSafeBoundary?.();
-    io.write(`
+        errored = true;
+      }
+      if (accumulated.length > 0) {
+        io.onTurnEnd?.(accumulated);
+      }
+      if (!errored) {
+        history.push({ role: "assistant", content: accumulated, provenance: "model" });
+        archive.push({ role: "user", content: line, provenance: "project" });
+        archive.push({ role: "assistant", content: accumulated, provenance: "model" });
+        save();
+      } else if (accumulated.length > 0) {
+        history.push({ role: "assistant", content: accumulated, provenance: "model" });
+        archive.push({ role: "user", content: line, provenance: "project" });
+        archive.push({ role: "assistant", content: accumulated, provenance: "model" });
+        save();
+      } else {
+        history.pop();
+      }
+      busWorking = false;
+      io.onSafeBoundary?.();
+      io.write(`
 
 `);
+    }
+  } finally {
+    leaveBus();
+    releaseLease();
   }
-  leaveBus();
-  releaseLease();
 }
 function realMakeProvider(write) {
   return (name, model, baseUrl) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {