xonecas.io
64875
Mc

mini-coder / commit 29c547e

fix: align context discovery and decouple errors

xonecas2026-03-31 29c547e0896b1e5fa41e4ee4e2dfce19693ca21c parent 5192821

9 files changed

docs/mini-coder.1.md+7−1
@@ -40,9 +40,15 @@ _prompt_
4040 `/model`
4141 : List all available models.
4242
43+`/models`
44+: Alias for `/model`.
45+
4346 `/model` _id_
4447 : Switch model.
4548
49+`/models` _id_
50+: Alias for `/model` _id_.
51+
4652 `/model effort` _low|medium|high|xhigh|off_
4753 : Set reasoning effort.
4854
@@ -180,7 +186,7 @@ Config roots: `.agents/`, `.claude/` — local (repo) or global (`~/`).
180186 **Context files** (global files first, then the nearest local directory with context files):
181187
182188 - Global files concatenate in this order: `~/.agents/AGENTS.md` → `~/.agents/CLAUDE.md` → `~/.claude/CLAUDE.md`
183-- Local files concatenate in this order within the nearest matching directory: `./.agents/AGENTS.md` → `./.agents/CLAUDE.md` → `./.claude/CLAUDE.md` → `./CLAUDE.md` → `./AGENTS.md`
189+- Local files concatenate in this order within the nearest matching directory (the same nearest-directory precedence applies to both `AGENTS.md` and `CLAUDE.md`): `./.agents/AGENTS.md` → `./.agents/CLAUDE.md` → `./.claude/CLAUDE.md` → `./CLAUDE.md` → `./AGENTS.md`
184190
185191 **Precedence:**
186192
src/agent/context-files.test.ts+47−0
@@ -0,0 +1,47 @@
1+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
2+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
3+import { tmpdir } from "node:os";
4+import { join, resolve } from "node:path";
5+import { discoverContextFiles } from "./context-files.ts";
6+
7+describe("discoverContextFiles", () => {
8+ let fakeHome = "";
9+ let repoRoot = "";
10+
11+ beforeEach(() => {
12+ fakeHome = mkdtempSync(join(tmpdir(), "mc-context-home-"));
13+ repoRoot = mkdtempSync(join(tmpdir(), "mc-context-repo-"));
14+ mkdirSync(join(repoRoot, ".git"));
15+ });
16+
17+ afterEach(() => {
18+ rmSync(fakeHome, { recursive: true, force: true });
19+ rmSync(repoRoot, { recursive: true, force: true });
20+ });
21+
22+ test("shows nearest parent local context files for subdirectories", () => {
23+ mkdirSync(join(fakeHome, ".agents"), { recursive: true });
24+ writeFileSync(join(fakeHome, ".agents", "AGENTS.md"), "global");
25+ writeFileSync(join(repoRoot, "AGENTS.md"), "root agents");
26+ const cwd = join(repoRoot, "src", "cli");
27+ mkdirSync(cwd, { recursive: true });
28+
29+ expect(discoverContextFiles(cwd, fakeHome)).toEqual([
30+ "~/.agents/AGENTS.md",
31+ resolve(repoRoot, "AGENTS.md"),
32+ ]);
33+ });
34+
35+ test("uses the nearest local context directory for AGENTS.md and CLAUDE.md", () => {
36+ writeFileSync(join(repoRoot, "AGENTS.md"), "root agents");
37+ const appDir = join(repoRoot, "packages", "app");
38+ mkdirSync(appDir, { recursive: true });
39+ writeFileSync(join(appDir, "CLAUDE.md"), "app claude");
40+ const cwd = join(appDir, "src");
41+ mkdirSync(cwd, { recursive: true });
42+
43+ expect(discoverContextFiles(cwd, fakeHome)).toEqual([
44+ resolve(appDir, "CLAUDE.md"),
45+ ]);
46+ });
47+});
src/agent/context-files.ts+25−16
@@ -49,16 +49,34 @@ function dirContextCandidates(dir: string): ContextCandidate[] {
4949 ];
5050 }
5151
52+function existingCandidates(
53+ candidates: ContextCandidate[],
54+): ContextCandidate[] {
55+ return candidates.filter((candidate) => existsSync(candidate.abs));
56+}
57+
58+function nearestLocalContextCandidates(cwd: string): ContextCandidate[] {
59+ let current = resolve(cwd);
60+ while (true) {
61+ const matches = existingCandidates(dirContextCandidates(current));
62+ if (matches.length > 0) return matches;
63+ if (existsSync(join(current, ".git"))) break;
64+ const parent = dirname(current);
65+ if (parent === current) break;
66+ current = parent;
67+ }
68+ return [];
69+}
70+
5271 /**
53- * All context file candidates: global + local directory.
54- * For the banner (cwd only, no parent walking).
72+ * Active context file labels: global files plus the nearest local context
73+ * directory between cwd and the git root.
5574 */
5675 export function discoverContextFiles(cwd: string, homeDir?: string): string[] {
57- const candidates = [
58- ...globalContextCandidates(homeDir),
59- ...dirContextCandidates(cwd),
76+ return [
77+ ...existingCandidates(globalContextCandidates(homeDir)).map((c) => c.label),
78+ ...nearestLocalContextCandidates(cwd).map((c) => c.label),
6079 ];
61- return candidates.filter((c) => existsSync(c.abs)).map((c) => c.label);
6280 }
6381
6482 // ─── Content loading (for system prompt) ─────────────────────────────────────
@@ -90,14 +108,5 @@ export function loadGlobalContextFile(homeDir?: string): string | null {
90108 * returning content from the nearest directory with context files.
91109 */
92110 export function loadLocalContextFile(cwd: string): string | null {
93- let current = resolve(cwd);
94- while (true) {
95- const content = readCandidates(dirContextCandidates(current));
96- if (content) return content;
97- if (existsSync(join(current, ".git"))) break;
98- const parent = dirname(current);
99- if (parent === current) break;
100- current = parent;
101- }
102- return null;
111+ return readCandidates(nearestLocalContextCandidates(cwd));
103112 }
src/agent/session-runner.test.ts+51−0
@@ -58,6 +58,57 @@ describe("SessionRunner session switching", () => {
5858 rmSync(fakeHome, { recursive: true, force: true });
5959 });
6060
61+ test("throws when asked to resume a missing session", () => {
62+ const result = runInHome(
63+ fakeHome,
64+ cwd,
65+ `
66+ import { SessionRunner } from ${JSON.stringify(sessionRunnerModuleUrl)};
67+
68+ const reporter = {
69+ info() {},
70+ error() {},
71+ warn() {},
72+ writeText() {},
73+ startSpinner() {},
74+ stopSpinner() {},
75+ async renderTurn() {
76+ throw new Error("renderTurn should not be called in this test");
77+ },
78+ renderStatusBar() {},
79+ restoreTerminal() {},
80+ };
81+
82+ try {
83+ new SessionRunner({
84+ cwd: ${JSON.stringify(cwd)},
85+ reporter,
86+ tools: [],
87+ mcpTools: [],
88+ initialModel: "ollama/llama3.2",
89+ initialThinkingEffort: null,
90+ initialShowReasoning: false,
91+ initialVerboseOutput: false,
92+ sessionId: "missing-session",
93+ });
94+ console.log("no-error");
95+ } catch (error) {
96+ console.log(JSON.stringify({
97+ name: error instanceof Error ? error.name : typeof error,
98+ message: error instanceof Error ? error.message : String(error),
99+ }));
100+ }
101+ `,
102+ );
103+
104+ expect(result.exitCode).toBe(0);
105+ expect(result.stderr).toBe("");
106+ expect(JSON.parse(result.stdout)).toEqual({
107+ name: "Error",
108+ message: 'Session "missing-session" not found.',
109+ });
110+ });
111+
61112 test("switchSession resets activated skill state", () => {
62113 const result = runInHome(
63114 fakeHome,
src/agent/session-runner.ts+1−2
@@ -102,8 +102,7 @@ export class SessionRunner {
102102 if (sessionId) {
103103 const resumed = resumeSession(sessionId);
104104 if (!resumed) {
105- this.reporter.error(`Session "${sessionId}" not found.`);
106- process.exit(1);
105+ throw new Error(`Session "${sessionId}" not found.`);
107106 }
108107 this.session = resumed;
109108 this.currentModel = this.session.model;
src/cli/commands-help.test.ts+22−0
@@ -0,0 +1,22 @@
1+import { afterEach, describe, expect, test } from "bun:test";
2+import { renderHelpCommand } from "./commands-help.ts";
3+import {
4+ captureStdout,
5+ getCapturedStdout,
6+ restoreStdout,
7+ stripAnsi,
8+} from "./test-helpers.ts";
9+
10+afterEach(() => {
11+ restoreStdout();
12+});
13+
14+describe("renderHelpCommand", () => {
15+ test("lists the /models alias", () => {
16+ captureStdout();
17+
18+ renderHelpCommand({ cwd: process.cwd() } as never);
19+
20+ expect(stripAnsi(getCapturedStdout())).toContain("/models");
21+ });
22+});
src/cli/commands-help.ts+1−0
@@ -26,6 +26,7 @@ export function renderHelpCommand(ctx: CommandContext): void {
2626 writeln(` ${c.dim("model + context")}`);
2727 renderEntries([
2828 ["/model [id]", "list or switch models"],
29+ ["/models [id]", "alias for /model"],
2930 ["/reasoning [on|off]", "toggle reasoning display"],
3031 ["/verbose [on|off]", "toggle output truncation"],
3132 ["/mcp list", "list MCP servers"],
src/session/db/message-repo.test.ts+67−0
@@ -0,0 +1,67 @@
1+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
2+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
3+import { tmpdir } from "node:os";
4+import { join } from "node:path";
5+
6+const messageRepoModuleUrl = new URL("./message-repo.ts", import.meta.url).href;
7+const connectionModuleUrl = new URL("./connection.ts", import.meta.url).href;
8+
9+function runInHome(
10+ home: string,
11+ script: string,
12+): {
13+ exitCode: number;
14+ stdout: string;
15+ stderr: string;
16+} {
17+ const scriptPath = join(
18+ tmpdir(),
19+ `mc-message-repo-test-${process.pid}-${Date.now()}.mjs`,
20+ );
21+ writeFileSync(scriptPath, script);
22+ try {
23+ const result = Bun.spawnSync([process.execPath, scriptPath], {
24+ env: { ...process.env, HOME: home },
25+ stdout: "pipe",
26+ stderr: "pipe",
27+ });
28+ return {
29+ exitCode: result.exitCode,
30+ stdout: result.stdout.toString(),
31+ stderr: result.stderr.toString(),
32+ };
33+ } finally {
34+ rmSync(scriptPath, { force: true });
35+ }
36+}
37+
38+describe("loadMessages", () => {
39+ let fakeHome = "";
40+
41+ beforeEach(() => {
42+ fakeHome = mkdtempSync(join(tmpdir(), "mc-message-home-"));
43+ });
44+
45+ afterEach(() => {
46+ rmSync(fakeHome, { recursive: true, force: true });
47+ });
48+
49+ test("skips invalid message rows without writing CLI output", () => {
50+ const result = runInHome(
51+ fakeHome,
52+ `
53+ import { loadMessages } from ${JSON.stringify(messageRepoModuleUrl)};
54+ import { getDb } from ${JSON.stringify(connectionModuleUrl)};
55+ const db = getDb();
56+ db.run("INSERT INTO sessions (id, cwd, model, created_at, updated_at) VALUES (?, ?, ?, ?, ?)", ["s1", "/tmp", "zen/gpt-5.4", 1, 1]);
57+ db.run("INSERT INTO messages (session_id, payload, turn_index, created_at) VALUES (?, ?, ?, ?)", ["s1", "{not-json", 0, 1]);
58+ const messages = loadMessages("s1");
59+ console.log(JSON.stringify({ count: messages.length }));
60+ `,
61+ );
62+
63+ expect(result.exitCode).toBe(0);
64+ expect(result.stderr).toBe("");
65+ expect(result.stdout.trim()).toBe('{"count":0}');
66+ });
67+});
src/session/db/message-repo.ts+3−2
@@ -1,5 +1,5 @@
1-import { renderError } from "../../cli/output.ts";
21 import type { CoreMessage } from "../../llm-api/turn.ts";
2+import { logError } from "../../logging/context.ts";
33 import { getDb } from "./connection.ts";
44
55 // Hoist prepared statements to module-level lazy singletons so hot-path calls
@@ -105,10 +105,11 @@ export function loadMessages(sessionId: string): CoreMessage[] {
105105 try {
106106 messages.push(JSON.parse(row.payload) as CoreMessage);
107107 } catch (_err) {
108- renderError(
108+ logError(
109109 new Error(
110110 `Failed to parse message ID ${row.id} for session ${sessionId}`,
111111 ),
112+ "message-repo.loadMessages",
112113 );
113114 }
114115 }