@vincemakes/kiso-code 0.31.1 → 0.32.1

package/dist/state.d.ts

@@ -12,6 +12,14 @@ import type { KisoExtension, StoreRecord } from "@vincemakes/kiso-runtime";
  *  env vars (KISO_EXTENSIONS_DIR / KISO_MCP_CONFIG / KISO_SKILLS_DIR)
  *  still override their own path; nothing hard-codes ~/.kiso anymore. */
 export declare function kisoHome(): string;
+/** DC-49 — the workspace the coding tools may touch, and the one place it
+ *  is decided. The session's own tool set and the `!` command's runner both
+ *  need it, and two copies of a ruling-bearing literal is how a later DC-49
+ *  amendment reaches one caller and not the other. */
+export declare function codingToolOptions(): {
+    readonly workspaceRoot: string;
+    readonly excludeRoots: readonly string[];
+};
 export declare function sessionsDir(): string;
 /** E1: the extension scan directory — KISO_EXTENSIONS_DIR overrides. */
 export declare function extensionsDir(): string;
@@ -77,6 +85,15 @@ export interface LineInput {
     /** W15: the expand key (ctrl+o) — the chain-level action, never the
      *  editor's own interpretation. */
     onExpand(cb: () => void): void;
+    /** §2.3: the thinking key (ctrl+t) — the same chain-level shape as
+     *  onExpand. Optional: the readline input has no such key, and a
+     *  dock-less session has nothing to reprint. */
+    onThink?(cb: () => void): void;
+    /** §2.4: the external-editor key (ctrl+g). */
+    onEditor?(cb: () => void): void;
+    /** §2.4: hand the terminal over, run `edit`, take it back. The editor
+     *  owns the handover; the CLI owns the spawn. */
+    externalEdit?(edit: (text: string) => string | null): void;
     /** E1 §3: the copy key (ctrl+x) — the chain-level action, never the
      *  composer's own. The readline input ignores it; `/copy` is the
      *  route that works everywhere. */
@@ -178,6 +195,24 @@ export declare let configModels: Readonly<Record<string, import("./config.js").M
 export declare function setConfigModels(models: Readonly<Record<string, import("./config.js").ModelProfile>>): void;
 /** The name of the model currently driving the session ("faux" or the
  *  profile name / provider/model write / env model). */
+/**
+ * §2.5 — the profile the human CHOSE by name, and the only source a
+ * rebuild may read for the model.
+ *
+ * Not `currentModelName`: that holds whatever resolution produced, and
+ * an env-resolved session's name ("gpt-4o", "claude-sonnet-5") is not a
+ * key in `models`, so handing it back to `resolveModel` throws. Not the
+ * startup flag either, or a `/model` switch would silently revert on the
+ * first reload — the effort-axis round produced that bug once already
+ * from having two sources for the model.
+ *
+ * One variable, seeded by `makeAgent` from the startup flag and
+ * overwritten by `/model`. Undefined means "resolve exactly as this
+ * process did at startup", which is the right answer for a session that
+ * never named a profile.
+ */
+export declare let modelChoice: string | undefined;
+export declare function setModelChoice(value: string | undefined): void;
 export declare let currentModelName: string;
 export declare function setCurrentModelName(value: string): void;
 /** E1: the extensions loaded by makeAgent — their names feed the banner. */

package/dist/state.js

@@ -18,6 +18,13 @@ import { AT_CAP, AT_SKIP, Dock } from "@vincemakes/kiso-tui";
 export function kisoHome() {
     return process.env.KISO_HOME ?? join(homedir(), ".kiso");
 }
+/** DC-49 — the workspace the coding tools may touch, and the one place it
+ *  is decided. The session's own tool set and the `!` command's runner both
+ *  need it, and two copies of a ruling-bearing literal is how a later DC-49
+ *  amendment reaches one caller and not the other. */
+export function codingToolOptions() {
+    return { workspaceRoot: process.cwd(), excludeRoots: [kisoHome()] };
+}
 export function sessionsDir() {
     return join(kisoHome(), "sessions");
 }
@@ -246,6 +253,26 @@ export function setConfigModels(models) {
 }
 /** The name of the model currently driving the session ("faux" or the
  *  profile name / provider/model write / env model). */
+/**
+ * §2.5 — the profile the human CHOSE by name, and the only source a
+ * rebuild may read for the model.
+ *
+ * Not `currentModelName`: that holds whatever resolution produced, and
+ * an env-resolved session's name ("gpt-4o", "claude-sonnet-5") is not a
+ * key in `models`, so handing it back to `resolveModel` throws. Not the
+ * startup flag either, or a `/model` switch would silently revert on the
+ * first reload — the effort-axis round produced that bug once already
+ * from having two sources for the model.
+ *
+ * One variable, seeded by `makeAgent` from the startup flag and
+ * overwritten by `/model`. Undefined means "resolve exactly as this
+ * process did at startup", which is the right answer for a session that
+ * never named a profile.
+ */
+export let modelChoice;
+export function setModelChoice(value) {
+    modelChoice = value;
+}
 export let currentModelName = "faux";
 export function setCurrentModelName(value) {
     currentModelName = value;

package/dist/trust-ui.js

@@ -162,17 +162,38 @@ export function askUi(input) {
 export async function addDontAskAgainRule(rule) {
     const dir = extensionsDir();
     const file = join(dir, "dont-ask-again.mjs");
-    const existed = existsSync(file);
+    // §2.5: the LIVE extension, found by name in the array the chain reads.
+    // This is the only handle on the rules that is guaranteed to be the one
+    // in force, and finding it also tells us whether this is a first rule.
+    const at = currentAgentExtensions.findIndex((e) => e.name === "dont-ask-again");
+    const live = at >= 0 ? currentAgentExtensions[at] : undefined;
+    // Every rule the session already grants, plus this one (RL-F2: the file
+    // used to be rewritten with ONLY the newest rule, so a second grant
+    // erased the first from disk — invisible in-session, because the
+    // in-memory Set kept both, and only discovered at the next start).
+    //
+    // RL-F5: a file generated BEFORE this change exports RULES and puts
+    // nothing on the extension, so `live.rules` is undefined for it and a
+    // union starting from nothing would rewrite the file with this grant
+    // alone — every rule the human gave under 0.31.x gone, in exactly the
+    // way RL-F2 was invisible. The rules come out of the file instead, and
+    // the migration costs one grant.
+    const existing = live?.rules !== undefined ? [...live.rules] : rulesInFile(file);
+    const rules = [...new Set([...existing, rule])].sort();
     const module = [
         "// generated by kiso — the \"2 Yes, don't ask again for <tool>\" rule.",
         "// HUMAN-EDITABLE and HUMAN-DELETABLE — this file IS the revocation path:",
         "// delete a rule from the set (or the whole file) to be asked again.",
         "// ALLOW-ONLY by design (R3): never emits deny or ask — the mode moat",
         "// and the safe-defaults moat keep their teeth.",
-        `export const RULES = new Set(${JSON.stringify([rule])});`,
+        `const RULES = new Set(${JSON.stringify(rules)});`,
         "",
         "export default {",
         '  name: "dont-ask-again",',
+        "  // the live handle: kiso mutates THIS set to make a new rule take",
+        "  // effect without a reload. It is the same object the decide below",
+        "  // closes over, which is the whole point.",
+        "  rules: RULES,",
         "  approvals: [",
         "    {",
         "      decide(call) {",
@@ -185,21 +206,57 @@ export async function addDontAskAgainRule(rule) {
     ].join("\n");
     mkdirSync(dir, { recursive: true });
     writeFileSync(file, module, "utf8");
-    // The live in-session effect: a file that existed at startup was
-    // imported by the loader — ONE namespace — so mutating the exported
-    // RULES Set is live NOW (the current run's chain reads the same Set).
-    const mod = (await import(pathToFileURL(file).href));
-    if (mod.RULES !== undefined && !mod.RULES.has(rule))
-        mod.RULES.add(rule);
-    // A FIRST-time rule (a file that did not exist at startup) is not yet
-    // in the current run's chain — the chain is fixed at a run's start —
-    // so the generated extension joins the NEXT run's policies (run.ts
-    // re-reads the session config's extensions array, shared by
-    // reference). The honest story: a new rule applies from the next run.
-    if (!existed && mod.default !== undefined) {
+    // The live in-session effect. This used to re-import the plain file URL
+    // and mutate the module's exported Set, on the stated assumption that a
+    // file the loader imported is ONE namespace. §2.5's loader appends a
+    // per-load nonce so `/reload` can pick up edited code, and that
+    // assumption died with it: the loader holds `file?load=N` and a plain
+    // import is the startup namespace. A rule granted after any reload
+    // would mutate a Set nothing reads — the human clicks don't-ask-again
+    // and is asked again on the very next identical call.
+    //
+    // So there is no second import. The rule is added THROUGH the live
+    // extension, which is one source of truth by construction.
+    if (live?.rules !== undefined) {
+        live.rules.add(rule);
+        return;
+    }
+    // Either a FIRST rule (no such extension loaded) or the RL-F5 migration
+    // (a legacy extension is loaded but has no live handle). The freshly
+    // written file is imported and joins the chain — REPLACING the legacy
+    // entry rather than sitting beside it, because two extensions of the
+    // same name in the chain is a second source of truth and the whole point
+    // of the handle is that there is one. The chain is fixed at a run's
+    // start, so a first rule applies from the NEXT run (run.ts re-reads the
+    // session config's extensions array, shared by reference).
+    //
+    // The nonce is the loader's own lesson applied here: a plain file URL is
+    // cached forever, so a second grant in one process would import the
+    // bytes of the first.
+    const mod = (await import(`${pathToFileURL(file).href}?grant=${(grantSerial += 1)}`));
+    if (mod.default === undefined)
+        return;
+    if (at >= 0)
+        currentAgentExtensions[at] = mod.default;
+    else
         currentAgentExtensions.push(mod.default);
+}
+/** RL-F5 — the rules a generated file already holds. The `new Set([...])`
+ *  literal is JSON, which is what makes reading it back honest rather than
+ *  a parser. An unreadable or hand-edited-past-recognition file yields
+ *  nothing, and the new rule stands alone — the file is documented as
+ *  human-editable, so kiso must not fail on what a human wrote there. */
+function rulesInFile(file) {
+    try {
+        const m = /new Set\((\[[^\]]*\])\)/.exec(readFileSync(file, "utf8"));
+        return m === null ? [] : JSON.parse(m[1]);
+    }
+    catch {
+        return [];
     }
 }
+/** RL-F5: distinguishes each grant's import of the generated file. */
+let grantSerial = 0;
 /**
  * W21 — the §3.5 fix-hint table: per speaker, the ONE-line path to stop
  * being asked. The hint names the FIX, never a bypass ("switch to
@@ -309,8 +366,24 @@ function readMcpConfig(path) {
 }
 /** Merge user-level + project-level mcp.json into one temp file and point
  *  KISO_MCP_CONFIG at it — the mcp extension reads it at load time. */
+/**
+ * RL-F4 — the user mcp.json as it was BEFORE any merge, and RL-F1's exact
+ * sibling one function up. `applyMcpMerge` read `KISO_MCP_CONFIG` and then
+ * assigned the merged file to it, so a second merge — which is what a
+ * reload is — took the first merged file as the user config. That file
+ * already holds the project's servers, so the "exists in both" check
+ * throws for every one of them and EVERY reload fails in exactly the
+ * projects that carry MCP servers.
+ *
+ * Found by the lead reviewing the commit that fixed RL-F1 in the function
+ * below. The lesson is the sibling, not the loop: a defect found in one
+ * function is a question to ask of every function beside it, and I fixed
+ * one merge without looking at the other.
+ */
+let originalUserMcpPath;
 function applyMcpMerge(root) {
-    const userPath = process.env.KISO_MCP_CONFIG ?? join(kisoHome(), "mcp.json");
+    originalUserMcpPath ??= process.env.KISO_MCP_CONFIG ?? join(kisoHome(), "mcp.json");
+    const userPath = originalUserMcpPath;
     const user = readMcpConfig(userPath);
     const project = readMcpConfig(join(root, "mcp.json"));
     const userServers = user.mcpServers ?? {};
@@ -323,17 +396,37 @@ function applyMcpMerge(root) {
         }
     }
     const merged = { mcpServers: { ...userServers, ...projectServers } };
-    const temp = join(tmpdir(), `kiso-mcp-merged-${process.pid}.json`);
+    // RL-F4, second half: the path used to be `kiso-mcp-merged-<pid>.json`,
+    // the SAME file on every merge in one process — so a reload's cleanup of
+    // the paths the previous set owned deleted the file the new set had just
+    // been merged into. One directory per merge, and the directory is what is
+    // recorded, so the cleanup removes exactly what that merge created.
+    const dir = mkdtempSync(join(tmpdir(), "kiso-mcp-"));
+    const temp = join(dir, "mcp.json");
     writeFileSync(temp, `${JSON.stringify(merged, null, 2)}\n`, "utf8");
     process.env.KISO_MCP_CONFIG = temp;
-    mergedTempPaths.push(temp);
+    mergedTempPaths.push(dir);
 }
 /** Merge user-level + project-level skills into one temp scan dir (project
  *  skill dirs symlinked first; a name in both → project wins + a stderr
  *  note) and point KISO_SKILLS_DIR at it — the skills extension's existing
  *  scan reads it at load time and per read_skill call. */
+/**
+ * §2.5 — the user skills directory as it was BEFORE any merge.
+ *
+ * `applySkillsMerge` ends by pointing `KISO_SKILLS_DIR` at the merged
+ * directory it just made. Read twice — which is exactly what a reload
+ * does — that is a loop: the second merge takes the FIRST merge as its
+ * user directory. A skill deleted from the real user directory would
+ * survive forever, and each merge would produce a temp directory the
+ * previous one's symlinks depend on, so none of them could ever be
+ * removed. This tree has already lost an afternoon to 449,956 stale
+ * temp directories.
+ */
+let originalUserSkillsDir;
 function applySkillsMerge(root) {
-    const userDir = process.env.KISO_SKILLS_DIR ?? join(kisoHome(), "skills");
+    originalUserSkillsDir ??= process.env.KISO_SKILLS_DIR ?? join(kisoHome(), "skills");
+    const userDir = originalUserSkillsDir;
     const projectDir = join(root, "skills");
     const merged = mkdtempSync(join(tmpdir(), "kiso-skills-"));
     mergedTempPaths.push(merged);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@vincemakes/kiso-code",
-	"version": "0.31.1",
-	"description": "kiso CLI — the durable coding agent that survives kill -9: kiso chat / kiso resume / kiso sessions.",
+	"version": "0.32.1",
+	"description": "kiso-code — the coding agent on kiso, the durable runtime for AI agents: kiso chat / kiso resume / kiso sessions.",
 	"type": "module",
 	"license": "MIT",
 	"bin": {
@@ -18,20 +18,20 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"@vincemakes/kiso-ask-ext": "0.31.1",
-		"@vincemakes/kiso-core": "0.31.1",
-		"@vincemakes/kiso-evals": "0.31.1",
-		"@vincemakes/kiso-mcp-ext": "0.31.1",
-		"@vincemakes/kiso-provider-anthropic": "0.31.1",
-		"@vincemakes/kiso-provider-openai": "0.31.1",
-		"@vincemakes/kiso-provider-openai-responses": "0.31.1",
-		"@vincemakes/kiso-runtime": "0.31.1",
-		"@vincemakes/kiso-skills-ext": "0.31.1",
-		"@vincemakes/kiso-subagent-ext": "0.31.1",
-		"@vincemakes/kiso-task-ext": "0.31.1",
-		"@vincemakes/kiso-tools-node": "0.31.1",
-		"@vincemakes/kiso-tui": "0.31.1",
-		"@vincemakes/kiso-tui-cells": "0.31.1"
+		"@vincemakes/kiso-ask-ext": "0.32.1",
+		"@vincemakes/kiso-core": "0.32.1",
+		"@vincemakes/kiso-evals": "0.32.1",
+		"@vincemakes/kiso-mcp-ext": "0.32.1",
+		"@vincemakes/kiso-provider-anthropic": "0.32.1",
+		"@vincemakes/kiso-provider-openai": "0.32.1",
+		"@vincemakes/kiso-provider-openai-responses": "0.32.1",
+		"@vincemakes/kiso-runtime": "0.32.1",
+		"@vincemakes/kiso-skills-ext": "0.32.1",
+		"@vincemakes/kiso-subagent-ext": "0.32.1",
+		"@vincemakes/kiso-task-ext": "0.32.1",
+		"@vincemakes/kiso-tools-node": "0.32.1",
+		"@vincemakes/kiso-tui": "0.32.1",
+		"@vincemakes/kiso-tui-cells": "0.32.1"
 	},
 	"devDependencies": {
 		"@types/node": "^26.1.2",