Merge remote-tracking branch 'origin/main' into cl-6797-dead-export-purge-ts-prune-flags-870-candidates-verify

# Conflicts:
#	src/tui/geometry/index.ts

Author: TheGreatAxios

CHANGELOG.md

@@ -32,6 +32,58 @@ by hand.
   (Critic on the diff plus at most one extra lens), loading `/review`
   for quality rules only.
 
+## [0.3.26] - 2026-09-15
+
+### What's Changed
+* Wait briefly for connecting servers before answering an empty tool search by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/996
+* Refuse path-trust migration from corrupt stores by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/995
+* Abandon a parked approval only on its own timeout by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/997
+* fix(provider): keep the Anthropic cache breakpoint off ephemeral turns by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1008
+* Do not let OAuth projections overwrite hand-named provider entries by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1007
+* Share workspace roots with list_dir and delete_file bounds by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1009
+* Route unclaimed popup keys back to the prompt by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1011
+* Enforce exec director tool allowlists through tool_search and promote by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1010
+* Harden path-escape sanitization for nested and alternate path keys by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1005
+* docs(product): remove shipped items from roadmap by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1020
+* fix(hardening): small follow-ups from the 0.3.25 review by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1021
+* Correct PerfTrace export prerequisites and settings secrets guidance by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1013
+* Verify docs/TUI.md against the terminal UI as it behaves by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1016
+* Correct MCP trust fingerprint, store path, and auth UX by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1017
+* Open transcript URLs on modifier click by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/964
+* Correct vendoring doc claims against the vendored tree by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1015
+* Restore Emil critique layer from the CMO original at full fidelity by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/999
+* feat(tests): make the suite runnable under bun test --parallel by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1023
+* Give Muse Spark its own reasoning effort ladder by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/979
+* Verify docs/PLUGINS.md against the plugin loader by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1014
+* feat(tui): brand the startup transcript with a quiet session header by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1022
+* Give Muse Spark tool-discipline rules by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/981
+* Only skip the spill URI sandbox for reader tools by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1006
+* Re-vendor Interchange trees to main HEAD for the director loader by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1025
+* Restore missing Common Patterns in create-issue skill by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/998
+* Hold newly promoted tools off the wire until a cache-safe boundary by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1027
+* Shard the CI test matrix into four time-balanced slices by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1028
+* Resolve transcript link clicks without the removed renderer hit-test by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1033
+* Collapse duplicate provider adapters and model catalogs by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1029
+* Inline TUI and agent micro-modules and merge the delivery queue trio by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1030
+* Rewrite brittle copy-pinned tests as behavior contracts by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1035
+* Unify permission verdict path with a mode-invariant catastrophic deny by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1037
+* Fold small session, chrome, and compaction helpers into owning modules by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1036
+* Correct two stale statements in the vendor patch ledgers by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1039
+* Give the two-attempt watchdog stall test an explicit 10s timeout by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1038
+* Harden transcript link resolution at markup edges by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1043
+* Unify tool, skill, and agent search on one rank-and-cut pipeline by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1045
+* Fold Go and Zen model catalogs into one parameterized module by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1053
+* Split transcript link helpers into focused modules by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1055
+* fix(subagent): queue overlapping steers instead of dropping them by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1063
+* Deliver a stashed steer as a follow-up when the run wins the race by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1066
+* fix(subagent): reap shell children so interrupt and close settle by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1068
+* Fail fast when an approval delivery is never accepted by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1069
+* fix(subagent): land steer and shell critique follow-ups by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1070
+* fix(tui): keep approved hold across retry and prove shell-guard kill by @TheGreatAxios in https://github.com/corbitsdev/corbits-code/pull/1071
+
+
+**Full Changelog**: https://github.com/corbitsdev/corbits-code/compare/v0.3.25...v0.3.26
+
 ## [0.3.25] - 2026-09-14
 
 ### What's Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corbits/code",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "description": "Single-process coding agent CLI built on the Interchange runtime (Bun + TypeScript)",
   "private": true,
   "license": "SEE LICENSE IN LICENSE.md",

src/agent/agent-search.ts

@@ -5,6 +5,7 @@ import { type } from "arktype";
 import { scrubSecretShapedContent } from "../plugins/tool-result-secret-scrub.js";
 import {
   lexicalFields,
+  rankAndCut,
   scoreLexical,
   tokenizeLexical,
 } from "./lexical-rank.js";
@@ -23,7 +24,8 @@ export interface AgentIndex {
   search(query: string, limit?: number): AgentProfile[];
 }
 
-// Lexical ranker over id, description, and role text — same spirit as tool_search.
+// Shares the lexical ranker with tool/skill search. The description-substring
+// bonus stays here: it is agent-specific, not part of the shared scorer.
 export function createAgentIndex(
   getProfiles: () => readonly AgentProfile[],
 ): AgentIndex {
@@ -45,12 +47,11 @@ export function createAgentIndex(
       const queryTokens = tokenizeLexical(query);
       const profiles = getProfiles();
       if (queryTokens.length === 0) return profiles.slice(0, limit);
-      return profiles
-        .map((p) => ({ profile: p, score: score(p, queryTokens, rawQuery) }))
-        .filter((entry) => entry.score > 0)
-        .sort((a, b) => b.score - a.score)
-        .slice(0, limit)
-        .map((entry) => entry.profile);
+      return rankAndCut(
+        profiles,
+        (p) => score(p, queryTokens, rawQuery),
+        limit,
+      );
     },
   };
 }

src/agent/background-shell-tool.test.ts

@@ -129,6 +129,81 @@ describe("background shell through the agent toolset", () => {
     }
   });
 
+  test("shell_collect with an aborted signal releases as running without killing the child", async () => {
+    const toolset = await createAgentToolset({
+      cwd: process.cwd(),
+      permissionGate: gate(process.cwd()),
+    });
+    try {
+      const started = await toolset.dynamicRunner.run(
+        {
+          id: "a-start",
+          name: "run_shell",
+          arguments: {
+            command: "sleep 60",
+            background: true,
+          },
+        },
+        new AbortController().signal,
+      );
+      const { shell_id } = JSON.parse(String(started.content)) as {
+        shell_id: string;
+      };
+      const aborted = new AbortController();
+      aborted.abort(new Error("interrupted by interrupt_agent"));
+      const out = await toolset.dynamicRunner.run(
+        {
+          id: "a-collect",
+          name: "shell_collect",
+          arguments: { shell_id, action: "collect", wait_ms: 60_000 },
+        },
+        aborted.signal,
+      );
+      expect(JSON.parse(String(out.content))).toMatchObject({
+        status: "running",
+      });
+      // A live-signal collect still sees the child running: the abort above
+      // released the waiter instead of killing the process. Had the abort
+      // killed it, this would already report completed.
+      const stillThere = await toolset.dynamicRunner.run(
+        {
+          id: "a-collect2",
+          name: "shell_collect",
+          arguments: { shell_id, action: "collect" },
+        },
+        new AbortController().signal,
+      );
+      expect(JSON.parse(String(stillThere.content))).toMatchObject({
+        status: "running",
+      });
+      // And the child is still killable: cancel settles it as completed.
+      const cancelled = await toolset.dynamicRunner.run(
+        {
+          id: "a-cancel",
+          name: "shell_collect",
+          arguments: { shell_id, action: "cancel" },
+        },
+        new AbortController().signal,
+      );
+      expect(JSON.parse(String(cancelled.content))).toMatchObject({
+        status: "cancelling",
+      });
+      const final = await toolset.dynamicRunner.run(
+        {
+          id: "a-collect3",
+          name: "shell_collect",
+          arguments: { shell_id, action: "collect", wait_ms: 5_000 },
+        },
+        new AbortController().signal,
+      );
+      expect(JSON.parse(String(final.content))).toMatchObject({
+        status: "completed",
+      });
+    } finally {
+      await toolset.dispose();
+    }
+  });
+
   test("toolset dispose kills every live background process group", async () => {
     const token = `ic_toolset_dispose_${randomUUID()}`;
     const toolset = await createAgentToolset({

src/agent/background-shell-tool.ts

@@ -79,7 +79,10 @@ export function createShellCollectTool(
 ) {
   return {
     definition: shellCollectDefinition,
-    handler: async (rawArgs: Record<string, unknown>): Promise<string> => {
+    handler: async (
+      rawArgs: Record<string, unknown>,
+      signal?: AbortSignal,
+    ): Promise<string> => {
       const parsed = ShellCollectArgs(rawArgs);
       if (parsed instanceof type.errors) {
         return "Error: shell_collect requires shell_id (string) and action ('collect' | 'cancel').";
@@ -91,7 +94,11 @@ export function createShellCollectTool(
         }
         return JSON.stringify({ shell_id, status: "cancelling" });
       }
-      const snapshot = await registry.collect(shell_id, parsed.wait_ms ?? 0);
+      const snapshot = await registry.collect(
+        shell_id,
+        parsed.wait_ms ?? 0,
+        signal,
+      );
       if (snapshot.state === "running") {
         return JSON.stringify({ shell_id, status: "running" });
       }

src/agent/lexical-rank.ts

@@ -40,3 +40,21 @@ export function scoreLexical(
   if (name.includes(rawQuery)) total += 1;
   return total;
 }
+
+// One shared rank→filter→sort→slice→map cut behind tool_search,
+// search_agents, and skill_search. Per-surface scoring (and the agent
+// description bonus) stays at each call site; only the cut is shared. The
+// sort is score-descending and stable, so tied scores keep catalog order
+// identically on every surface.
+export function rankAndCut<T>(
+  items: readonly T[],
+  scoreItem: (item: T) => number,
+  limit: number,
+): T[] {
+  return items
+    .map((item) => ({ item, score: scoreItem(item) }))
+    .filter((entry) => entry.score > 0)
+    .sort((a, b) => b.score - a.score)
+    .slice(0, limit)
+    .map((entry) => entry.item);
+}

src/agent/search-scorer-parity.test.ts

@@ -8,9 +8,10 @@ import type { SkillSummary } from "../extensions/skills.js";
 import { createToolIndex } from "./tool-search.js";
 
 /**
- * The tool, skill, and agent search surfaces each carry their own copy of the
- * lexical ranker. This fixture drives all three with parallel catalogs so a
- * weight change in one copy fails loudly instead of drifting silently.
+ * The three search surfaces share one lexical ranker and one rank-and-cut
+ * pipeline; only per-surface scoring bonuses differ. This fixture drives all
+ * three with parallel catalogs so a weight change in one copy fails loudly
+ * instead of drifting silently.
  */
 const QUERY = "granola";
 

src/agent/skill-search.ts

@@ -6,6 +6,7 @@ import { type } from "arktype";
 import type { SkillSummary } from "../extensions/skills.js";
 import {
   lexicalFields,
+  rankAndCut,
   scoreLexical,
   tokenizeLexical,
 } from "./lexical-rank.js";
@@ -82,15 +83,11 @@ export function createSkillSearchTool(
       if (queryTokens.length === 0) {
         return `No skills matched "${query}". Try different keywords describing the capability.`;
       }
-      const matches = catalog
-        .map((skill) => ({
-          skill,
-          score: scoreSkill(skill, queryTokens, rawQuery),
-        }))
-        .filter((entry) => entry.score > 0)
-        .sort((a, b) => b.score - a.score)
-        .slice(0, DEFAULT_LIMIT)
-        .map((entry) => entry.skill);
+      const matches = rankAndCut(
+        catalog,
+        (skill) => scoreSkill(skill, queryTokens, rawQuery),
+        DEFAULT_LIMIT,
+      );
       if (matches.length === 0) {
         return `No skills matched "${query}". Try different keywords describing the capability.`;
       }

src/agent/tool-search.ts

@@ -5,6 +5,7 @@ import { type } from "arktype";
 
 import {
   lexicalFields,
+  rankAndCut,
   scoreLexical,
   tokenizeLexical,
 } from "./lexical-rank.js";
@@ -234,9 +235,9 @@ export interface ToolIndex {
   search(query: string, limit?: number): string[];
 }
 
-// A dependency-free lexical ranker over each tool's name + description. Exact name
-// token hits weigh most, then description token hits, then raw-substring matches
-// (so "linear" finds mcp__linear__* even though it is not a whole token there).
+// Rank registered tools against name + description via the shared lexical
+// scorer. Already-advertised tools are always callable so they never rank;
+// the allow list (when set) keeps search from promoting outside it.
 export function createToolIndex(
   getDefs: () => readonly ToolDefinition[],
   advertisedNames: readonly string[] = ADVERTISED_TOOL_NAMES,
@@ -260,17 +261,14 @@ export function createToolIndex(
       const rawQuery = query.toLowerCase().trim();
       const queryTokens = tokenizeLexical(query);
       if (queryTokens.length === 0) return [];
-      return getDefs()
+      const candidates = getDefs()
         .filter((def) => !advertisedNames.includes(def.name))
-        .filter((def) => allow === undefined || allow.includes(def.name))
-        .map((def) => ({
-          name: def.name,
-          score: score(def, queryTokens, rawQuery),
-        }))
-        .filter((entry) => entry.score > 0)
-        .sort((a, b) => b.score - a.score)
-        .slice(0, limit)
-        .map((entry) => entry.name);
+        .filter((def) => allow === undefined || allow.includes(def.name));
+      return rankAndCut(
+        candidates,
+        (def) => score(def, queryTokens, rawQuery),
+        limit,
+      ).map((def) => def.name);
     },
   };
 }

src/config.test.ts

@@ -43,12 +43,10 @@ import {
 } from "../packages/zen/src/index.js";
 import {
   prefetchGoModels,
-  resetGoModelDiscoveryForTests,
-} from "./provider/opencode-go-models.js";
-import {
   prefetchZenModels,
+  resetGoModelDiscoveryForTests,
   resetZenModelDiscoveryForTests,
-} from "./provider/zen-models.js";
+} from "./provider/model-catalogs.js";
 import {
   generateSessionId,
   initSessionDir,