codebase-cli 2.0.0-pre.4 → 2.0.0-pre.40

package/dist/skills/platform-loader.js

@@ -1,15 +1,20 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { CredentialsStore } from "../auth/credentials.js";
+const DEFAULT_BASE_URL = "https://codebase.design/api/cli";
+const DEFAULT_CACHE_PATH = join(homedir(), ".codebase", "cache", "platform-assets.json");
+const DEFAULT_TTL_MS = 60 * 60 * 1000; // 1 hour
 /**
- * Loader that fetches the user's curated skills, templates, and
- * prompts from their codebase.foundation account.
+ * Fetches the user's curated skills/templates/prompts from
+ * codebase.design and merges them into the AssetRegistry. Caches
+ * the response under ~/.codebase/cache/platform-assets.json so
+ * subsequent CLI launches don't pay the round trip.
  *
- * NOT YET IMPLEMENTED. This file exists as a contract anchor so the
- * AssetRegistry already knows about the platform path: when the
- * Phase 7+ implementation lands, it slots in here without further
- * surgery to the agent or App layer.
+ * Wire format (server returns one bundle, the loader fans it out
+ * into the three asset kinds):
  *
- * Wire format (planned):
- *
- *   GET https://codebase.foundation/api/cli/skills
+ *   GET ${baseUrl}/assets
  *   Authorization: Bearer <accessToken>
  *
  *   200 OK
@@ -17,47 +22,137 @@
  *     "templates": [ { id, name, description, body, files?, tags? }, … ],
  *     "prompts":   [ { id, name, description, body, tags? }, … ] }
  *
- * Cache the response under ~/.codebase/cache/platform-assets.json with
- * an ETag header so subsequent CLI launches don't pay the round trip.
- * Refresh on `codebase auth refresh` or after 1 hour, whichever is
- * sooner. Refresh failures fall back to the cached response — never
- * leave a session stranded because the platform is briefly down.
+ * Behavior matrix:
  *
- * Not authenticated → returns empty lists, never throws. The user just
- * sees their bundled + local assets, which is the correct
- * unauthenticated UX.
+ *   not signed in         → returns [] without a network call
+ *   network error         → returns the last cached body if any,
+ *                           else [] (silent — never crashes a session)
+ *   404 (endpoint TBD)    → caches an empty bundle, returns []
+ *                           (no warning — the backend half is
+ *                           expected to land later, see
+ *                           docs/plans/2026-05-09-codebase-cli-
+ *                           oauth-server-side.md §3-4)
+ *   200                   → caches body + ETag, returns shaped list
+ *   304 (ETag match)      → bumps the cache timestamp, returns cached
  */
 export class PlatformLoader {
+    source = "platform";
     credentials;
     baseUrl;
-    source = "platform";
-    constructor(credentials, baseUrl = "https://codebase.foundation/api/cli") {
-        this.credentials = credentials;
-        this.baseUrl = baseUrl;
+    cachePath;
+    ttlMs;
+    fetchFn;
+    now;
+    inFlight = null;
+    constructor(options = {}) {
+        this.credentials = options.credentials ?? new CredentialsStore();
+        this.baseUrl = (options.baseUrl ?? DEFAULT_BASE_URL).replace(/\/+$/, "");
+        this.cachePath = options.cachePath ?? DEFAULT_CACHE_PATH;
+        this.ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+        this.fetchFn = options.fetchFn ?? globalThis.fetch.bind(globalThis);
+        this.now = options.now ?? Date.now;
     }
     async listSkills() {
-        void this.fetchOrEmpty;
-        return [];
+        const bundle = await this.bundle();
+        return (bundle.skills ?? []).map((s) => ({ ...s, kind: "skill", source: this.source }));
     }
     async listTemplates() {
-        return [];
+        const bundle = await this.bundle();
+        return (bundle.templates ?? []).map((t) => ({ ...t, kind: "template", source: this.source }));
     }
     async listPrompts() {
-        return [];
-    }
-    /**
-     * Placeholder for the real fetch path. Implementation steps:
-     *   1. Read credentials; if absent or expired, return null.
-     *   2. GET ${baseUrl}/skills with Authorization: Bearer …
-     *   3. On 401, trigger refresh via OAuthFlow.refreshAccessToken.
-     *   4. On success, cache under ~/.codebase/cache/platform-assets.json.
-     *   5. On any failure post-401-retry, return cached response if any
-     *      and log a one-line warning.
-     */
-    async fetchOrEmpty() {
-        void this.credentials;
-        void this.baseUrl;
+        const bundle = await this.bundle();
+        return (bundle.prompts ?? []).map((p) => ({ ...p, kind: "prompt", source: this.source }));
+    }
+    /** Force the next list call to re-fetch instead of using the cache. */
+    invalidate() {
+        try {
+            if (existsSync(this.cachePath)) {
+                writeFileSync(this.cachePath, JSON.stringify({ fetchedAt: 0, body: {} }));
+            }
+        }
+        catch {
+            // non-fatal
+        }
+    }
+    async bundle() {
+        // Coalesce concurrent calls — listSkills + listTemplates + listPrompts
+        // from a single registry pass should share one fetch.
+        if (this.inFlight)
+            return this.inFlight;
+        this.inFlight = this.bundleOnce().finally(() => {
+            this.inFlight = null;
+        });
+        return this.inFlight;
+    }
+    async bundleOnce() {
+        // Not signed in → never fetch, never cache, never warn.
+        const creds = this.credentials.load();
+        if (!creds || this.credentials.isExpired(creds))
+            return {};
+        const cached = readCache(this.cachePath);
+        const fresh = cached && this.now() - cached.fetchedAt < this.ttlMs;
+        if (fresh)
+            return cached.body;
+        try {
+            const headers = {
+                Authorization: `Bearer ${creds.accessToken}`,
+                Accept: "application/json",
+            };
+            if (cached?.etag)
+                headers["If-None-Match"] = cached.etag;
+            const res = await this.fetchFn(`${this.baseUrl}/assets`, { headers });
+            if (res.status === 304 && cached) {
+                // ETag match — bump the cache timestamp, return cached body.
+                writeCache(this.cachePath, { ...cached, fetchedAt: this.now() });
+                return cached.body;
+            }
+            if (res.status === 404) {
+                // Endpoint TBD. Cache an empty bundle so we don't hammer the
+                // server until the next TTL window.
+                const empty = { fetchedAt: this.now(), body: {} };
+                writeCache(this.cachePath, empty);
+                return empty.body;
+            }
+            if (res.status === 401 || !res.ok) {
+                // Auth blip or transient 5xx — fall back to whatever's cached.
+                return cached?.body ?? {};
+            }
+            const body = (await res.json());
+            const etag = res.headers.get("ETag") ?? undefined;
+            writeCache(this.cachePath, { fetchedAt: this.now(), etag, body });
+            return body;
+        }
+        catch {
+            // Network failures degrade to cached. Never throw — a flaky
+            // platform shouldn't take the agent down.
+            return cached?.body ?? {};
+        }
+    }
+}
+function readCache(path) {
+    if (!existsSync(path))
+        return null;
+    try {
+        const raw = readFileSync(path, "utf8");
+        const parsed = JSON.parse(raw);
+        if (typeof parsed.fetchedAt !== "number")
+            return null;
+        if (!parsed.body || typeof parsed.body !== "object")
+            return null;
+        return parsed;
+    }
+    catch {
         return null;
     }
 }
+function writeCache(path, bundle) {
+    try {
+        mkdirSync(dirname(path), { recursive: true });
+        writeFileSync(path, JSON.stringify(bundle));
+    }
+    catch {
+        // non-fatal — the in-memory result still serves the current process
+    }
+}
 //# sourceMappingURL=platform-loader.js.map

package/dist/skills/platform-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-loader.js","sourceRoot":"","sources":["../../src/skills/platform-loader.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,OAAO,cAAc;IAIR;IACA;IAJT,MAAM,GAAG,UAAmB,CAAC;IAEtC,YACkB,WAA6B,EAC7B,UAAkB,qCAAqC;QADvD,gBAAW,GAAX,WAAW,CAAkB;QAC7B,YAAO,GAAP,OAAO,CAAgD;IACtE,CAAC;IAEJ,KAAK,CAAC,UAAU;QACf,KAAK,IAAI,CAAC,YAAY,CAAC;QACvB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,OAAO,EAAE,CAAC;IACX,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,OAAO,EAAE,CAAC;IACX,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,YAAY;QACzB,KAAK,IAAI,CAAC,WAAW,CAAC;QACtB,KAAK,IAAI,CAAC,OAAO,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;CACD"}
+{"version":3,"file":"platform-loader.js","sourceRoot":"","sources":["../../src/skills/platform-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,MAAM,gBAAgB,GAAG,iCAAiC,CAAC;AAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;AACzF,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;AA4BhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,OAAO,cAAc;IACjB,MAAM,GAAG,UAAmB,CAAC;IAErB,WAAW,CAAmB;IAC9B,OAAO,CAAS;IAChB,SAAS,CAAS;IAClB,KAAK,CAAS;IACd,OAAO,CAAe;IACtB,GAAG,CAAe;IAE3B,QAAQ,GAAmC,IAAI,CAAC;IAExD,YAAY,UAAiC,EAAE;QAC9C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,gBAAgB,EAAE,CAAC;QACjE,IAAI,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,cAAc,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,UAAU;QACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,UAAmB,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,QAAiB,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACpG,CAAC;IAED,uEAAuE;IACvE,UAAU;QACT,IAAI,CAAC;YACJ,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBAChC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3E,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YACR,YAAY;QACb,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,MAAM;QACnB,uEAAuE;QACvE,sDAAsD;QACtD,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,UAAU;QACvB,wDAAwD;QACxD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE3D,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QACnE,IAAI,KAAK;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC;QAE9B,IAAI,CAAC;YACJ,MAAM,OAAO,GAA2B;gBACvC,aAAa,EAAE,UAAU,KAAK,CAAC,WAAW,EAAE;gBAC5C,MAAM,EAAE,kBAAkB;aAC1B,CAAC;YACF,IAAI,MAAM,EAAE,IAAI;gBAAE,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;YAEzD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAEtE,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,MAAM,EAAE,CAAC;gBAClC,6DAA6D;gBAC7D,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACjE,OAAO,MAAM,CAAC,IAAI,CAAC;YACpB,CAAC;YAED,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACxB,6DAA6D;gBAC7D,oCAAoC;gBACpC,MAAM,KAAK,GAAiB,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBAChE,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;gBAClC,OAAO,KAAK,CAAC,IAAI,CAAC;YACnB,CAAC;YAED,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACnC,+DAA+D;gBAC/D,OAAO,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;YAC3B,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAmB,CAAC;YAClD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC;YAClD,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACR,4DAA4D;YAC5D,0CAA0C;YAC1C,OAAO,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QAC3B,CAAC;IACF,CAAC;CACD;AAED,SAAS,SAAS,CAAC,IAAY;IAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;QAC/C,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACjE,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,MAAoB;IACrD,IAAI,CAAC;QACJ,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACR,oEAAoE;IACrE,CAAC;AACF,CAAC"}

package/dist/tools/__test__/mock-tool-context.js

@@ -0,0 +1,31 @@
+/**
+ * Typed factory for a ToolContext suitable for unit tests. Uses real
+ * instances of the in-memory stores (they're cheap to construct) so
+ * tests catch interface-shape drift the moment a field is added to
+ * ToolContext — previously this was `{} as any` for every field, which
+ * meant adding a new required member to ToolContext compiled green
+ * while every test was secretly missing it.
+ */
+import { MemoryStore } from "../../memory/store.js";
+import { PlanModeStore } from "../../plan/store.js";
+import { UserQueryStore } from "../../user-queries/store.js";
+import { FileStateCache } from "../file-state-cache.js";
+import { TaskStore } from "../task-store.js";
+export function makeMockToolContext(cwd) {
+    return {
+        cwd,
+        fileStateCache: new FileStateCache(),
+        tasks: new TaskStore(),
+        userQueries: new UserQueryStore(),
+        planMode: new PlanModeStore(),
+        memory: new MemoryStore({ cwd }),
+        // spawnSubagent is the only field a test can't supply a real
+        // implementation for (it depends on the live agent factory).
+        // We throw to make the boundary explicit: any test that calls a
+        // subagent-spawning tool needs to provide its own stub.
+        spawnSubagent: () => {
+            throw new Error("mock-tool-context: spawnSubagent not stubbed — provide one in the test if you need it");
+        },
+    };
+}
+//# sourceMappingURL=mock-tool-context.js.map

package/dist/tools/__test__/mock-tool-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-tool-context.js","sourceRoot":"","sources":["../../../src/tools/__test__/mock-tool-context.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC9C,OAAO;QACN,GAAG;QACH,cAAc,EAAE,IAAI,cAAc,EAAE;QACpC,KAAK,EAAE,IAAI,SAAS,EAAE;QACtB,WAAW,EAAE,IAAI,cAAc,EAAE;QACjC,QAAQ,EAAE,IAAI,aAAa,EAAE;QAC7B,MAAM,EAAE,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,6DAA6D;QAC7D,6DAA6D;QAC7D,gEAAgE;QAChE,wDAAwD;QACxD,aAAa,EAAE,GAAG,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;QAC1G,CAAC;KACD,CAAC;AACH,CAAC"}

package/dist/tools/file-state-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-state-cache.js","sourceRoot":"","sources":["../../src/tools/file-state-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-state-cache.js","sourceRoot":"","sources":["../../src/tools/file-state-cache.ts"],"names":[],"mappings":"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"}

package/dist/tools/read-file.js

@@ -35,7 +35,7 @@ Arguments:
 - limit (optional): max lines to return. Default 2000, max 2000.
 
 Behavior:
-- Text files: returned line-numbered (six-column gutter, tab, content), suitable for the model to quote back into edit_file.
+- Text files: returned line-numbered as \`     N→content\` (six-column right-aligned line number, an arrow separator, then the line). When you quote a line into edit_file's old_string, quote only the part after the arrow.
 - Image files (.png, .jpg, .jpeg, .gif, .webp, .bmp): returned as a vision payload — works only with image-capable models.
 - Files > 5 MB are rejected; use shell head/tail/sed for huge files.
 - Binary text files are rejected.
@@ -100,7 +100,12 @@ export function createReadFile(ctx) {
             const endIdx = Math.min(startIdx + limit, totalLines);
             const isPartialView = startIdx > 0 || endIdx < totalLines;
             const slice = allLines.slice(startIdx, endIdx);
-            const formatted = slice.map((line, i) => `${pad6(startIdx + i + 1)}\t${line}`).join("\n");
+            // Use a literal arrow instead of \t so the gutter renders tight in
+            // every terminal (TUI / pager / web echo). cat -n's tab gets
+            // expanded to the next tab stop by most renderers, producing an
+            // ugly 8-column gap. The `${num}→${content}` format also reads
+            // well in model context where tab-alignment is unreliable.
+            const formatted = slice.map((line, i) => `${pad6(startIdx + i + 1)}→${line}`).join("\n");
             const tail = isPartialView ? `\n... (showing lines ${startIdx + 1}-${endIdx} of ${totalLines})` : "";
             ctx.fileStateCache.record({
                 path: absPath,

package/dist/tools/read-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"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"}

package/dist/ui/App.js

@@ -7,17 +7,22 @@ import { initialState, reducer } from "../agent/events.js";
 import { routeUserInput } from "../agent/router.js";
 import { BUILTIN_COMMANDS } from "../commands/builtins.js";
 import { CommandRegistry } from "../commands/registry.js";
-import { buildAgentPrompt, generatePlan, generateQuestion, MAX_QUESTIONS, parseAnswer, revisePlan, } from "../plan/flow.js";
-import { ANSWER_START_BUILDING } from "../plan/types.js";
-import { UserQueryCancelled } from "../user-queries/store.js";
+import { runPlanFlow } from "../plan/run-flow.js";
+import { buildAttachmentPrompt, collectAttachments } from "./attachments.js";
+import { CompactionBanner } from "./CompactionBanner.js";
 import { FirstRunSetup } from "./FirstRunSetup.js";
+import { HistoryStore } from "./history-store.js";
 import { Input } from "./Input.js";
 import { MessageList } from "./MessageList.js";
 import { Permission } from "./Permission.js";
 import { Status } from "./Status.js";
+import { runShellEscape } from "./shell-escape.js";
 import { TaskPanel } from "./TaskPanel.js";
 import { ToolPanel } from "./ToolPanel.js";
 import { UserQueryView } from "./UserQuery.js";
+import { useCoalescedAgentEvents } from "./use-coalesced-agent-events.js";
+import { usePromptSuggestion } from "./use-prompt-suggestion.js";
+import { Welcome } from "./Welcome.js";
 export function App() {
     const { exit } = useApp();
     const [setupAttempt, setSetupAttempt] = useState(0);
@@ -25,7 +30,12 @@ export function App() {
     const { bundle, configError } = useMemo(() => {
         void setupAttempt;
         try {
-            return { bundle: createAgent(), configError: undefined };
+            // Auto-resume the prior session for this cwd by default. The
+            // `--new` CLI flag (parsed in cli.tsx) sets CODEBASE_FRESH so
+            // users who explicitly want a clean slate can opt out without
+            // having to wipe ~/.codebase/sessions manually.
+            const resume = process.env.CODEBASE_FRESH !== "1";
+            return { bundle: createAgent({ resume }), configError: undefined };
         }
         catch (err) {
             return {
@@ -49,21 +59,46 @@ function ChatApp({ bundle, onExit }) {
     const [state, dispatch] = useReducer(reducer, initialState({ provider: bundle.model.provider, id: bundle.model.id, name: bundle.model.name }));
     const [permRequest, setPermRequest] = useState(bundle.permissions.current());
     const [userQuery, setUserQuery] = useState(bundle.userQueries.current());
+    const [compactionState, setCompactionState] = useState(bundle.compactionMonitor.current());
     const [statusLines, setStatusLines] = useState([]);
+    // Cap the buffer so noisy emits (long /help, many !cmds) don't grow
+    // the status pane indefinitely. 50 rows ≈ a screen on most terms.
+    const appendStatus = (line) => setStatusLines((prev) => {
+        const next = [...prev, line];
+        return next.length > 50 ? next.slice(next.length - 50) : next;
+    });
     const [tasks, setTasks] = useState(() => bundle.toolContext.tasks.list());
     const registry = useMemo(() => {
         const reg = new CommandRegistry();
         reg.registerAll(BUILTIN_COMMANDS);
         return reg;
     }, []);
+    const commandSuggestions = useMemo(() => registry.list().map((c) => ({ name: c.name, description: c.description })), [registry]);
+    const historyStore = useMemo(() => new HistoryStore({ cwd: bundle.toolContext.cwd }), [bundle.toolContext.cwd]);
+    const persistedHistory = useMemo(() => historyStore.load(), [historyStore]);
+    const inputHistory = useMemo(() => {
+        // Build the recall list from (persisted history) ++ (this-session prompts),
+        // in chronological order. Persisted gives the user prior runs to recall;
+        // this-session ensures their most recent prompt is at the top of ↑.
+        const out = [...persistedHistory];
+        for (const m of state.messages) {
+            if (m.role !== "user")
+                continue;
+            const text = typeof m.content === "string" ? m.content : extractUserText(m.content);
+            if (text.trim().length === 0)
+                continue;
+            if (out[out.length - 1] === text)
+                continue;
+            out.push(text);
+        }
+        return out;
+    }, [state.messages, persistedHistory]);
+    useCoalescedAgentEvents(bundle, dispatch);
     useEffect(() => {
-        const unsubscribe = bundle.subscribe((event) => {
-            dispatch({ type: "agent-event", event });
-        });
-        return unsubscribe;
+        return bundle.permissions.subscribe((req) => setPermRequest(req));
     }, [bundle]);
     useEffect(() => {
-        return bundle.permissions.subscribe((req) => setPermRequest(req));
+        return bundle.compactionMonitor.subscribe((s) => setCompactionState(s));
     }, [bundle]);
     useEffect(() => {
         return bundle.userQueries.subscribe((q) => setUserQuery(q));
@@ -72,29 +107,51 @@ function ChatApp({ bundle, onExit }) {
         return bundle.toolContext.tasks.subscribe((snapshot) => setTasks(snapshot));
     }, [bundle]);
     const busy = state.status === "thinking" || state.status === "streaming" || state.status === "tool";
+    const { suggestion, dismiss: dismissSuggestion } = usePromptSuggestion(bundle, state.status, state.messages.length);
     const handleSubmit = async (text) => {
+        // `!cmd` runs a shell command directly without involving the LLM —
+        // "I just want to check something real quick." We bypass the agent
+        // loop entirely and inject the output as a synthetic user /
+        // toolResult pair so it shows up in the transcript but doesn't end
+        // up in the model's context.
+        if (text.startsWith("!") && text.length > 1) {
+            await runShellEscape(text.slice(1), bundle.toolContext.cwd, appendStatus);
+            return;
+        }
         // Slash commands first — they bypass the agent.
         if (text.startsWith("/")) {
             const result = await registry.dispatch(text, {
                 bundle,
                 state: state,
-                emit: (line) => setStatusLines((prev) => [...prev, line]),
-                clearDisplay: () => dispatch({ type: "reset" }),
+                emit: appendStatus,
+                clearDisplay: () => {
+                    dispatch({ type: "reset" });
+                    setStatusLines([]);
+                },
                 exit: onExit,
-                // Inject the registry so /help can list commands.
-                // biome-ignore lint/suspicious/noExplicitAny: cross-cutting injection
                 registry,
-                // biome-ignore lint/suspicious/noExplicitAny: cross-cutting injection
             });
             if (result.handled)
                 return;
         }
+        // `@path` tokens auto-attach file contents to the prompt so the
+        // user doesn't have to spend a tool turn just to put a file in
+        // context. Anything that doesn't resolve falls through unchanged
+        // — we don't want to silently transform a literal @-mention.
+        const attachments = collectAttachments(text, bundle.toolContext.cwd);
+        const augmentedText = attachments.length > 0 ? buildAttachmentPrompt(text, attachments) : text;
+        if (attachments.length > 0) {
+            appendStatus(`Attached: ${attachments.map((a) => a.relPath).join(", ")}`);
+        }
         // Capture history-presence BEFORE the user-prompt dispatch — React's
         // batched updates mean state.messages won't reflect the new user message
         // in the same tick, but the router needs to know whether this is a
         // continuation (greeting fast-track) or a first message.
         const hadHistory = state.messages.some((m) => m.role === "assistant");
         dispatch({ type: "user-prompt", text });
+        // Persist the raw user input (pre-attachment-augmentation) so ↑ in
+        // future sessions recalls what they actually typed.
+        historyStore.append(text);
         try {
             const route = await routeUserInput(bundle.glue, text, { hasHistory: hadHistory });
             if (route.kind === "chat") {
@@ -102,119 +159,61 @@ function ChatApp({ bundle, onExit }) {
                 return;
             }
             if (route.kind === "plan") {
-                await runPlanFlow(text);
+                await runPlanFlow(bundle, text, {
+                    onReply: (replyText) => dispatch({ type: "chat-reply", text: replyText }),
+                    onError: (message) => dispatch({ type: "error", message }),
+                });
                 return;
             }
         }
         catch (err) {
             // If the router itself crashes, don't drop the request — run the agent.
             // We still log it as a non-fatal status line so users notice.
-            setStatusLines((prev) => [
-                ...prev,
-                `(router fell back to agent: ${err instanceof Error ? err.message : err})`,
-            ]);
+            appendStatus(`(router fell back to agent: ${err instanceof Error ? err.message : err})`);
         }
-        bundle.agent.prompt(text).catch((err) => {
+        bundle.agent.prompt(augmentedText).catch((err) => {
             dispatch({ type: "error", message: err instanceof Error ? err.message : String(err) });
         });
     };
-    /**
-     * Plan-mode flow:
-     *   1. Q&A loop (up to MAX_QUESTIONS, with the start-building escape).
-     *   2. Generate plan, render as a synthetic assistant message so the
-     *      user can read it in chat.
-     *   3. Approve / Revise / Cancel via the UserQuery primitive.
-     *   4. On approve, hand the original prompt + plan + Q&A to the agent
-     *      with the canonical buildAgentPrompt wrapper so weaker models
-     *      stick to the plan instead of re-planning mid-execution.
-     */
-    const runPlanFlow = async (originalPrompt) => {
-        const qaHistory = [];
-        try {
-            for (let i = 0; i < MAX_QUESTIONS; i++) {
-                const result = await generateQuestion(bundle.glue, originalPrompt, qaHistory, i);
-                if (result.done || !result.question)
-                    break;
-                const q = result.question;
-                const optionLabels = q.options?.map((o) => o.label);
-                const answer = await bundle.userQueries.ask({
-                    question: q.question,
-                    options: optionLabels,
-                    placeholder: optionLabels ? `1-${optionLabels.length}, or type a free-form answer` : undefined,
-                });
-                const resolved = parseAnswer(answer, q);
-                if (resolved === ANSWER_START_BUILDING)
-                    break;
-                qaHistory.push({ question: q.question, answer: resolved });
-            }
-            let plan = await generatePlan(bundle.glue, originalPrompt, qaHistory);
-            while (true) {
-                dispatch({ type: "chat-reply", text: plan });
-                const decision = await bundle.userQueries.ask({
-                    question: "Approve this plan and run it?",
-                    options: ["Yes — run it", "Revise", "Cancel"],
-                });
-                const choice = matchOption(decision, ["Yes — run it", "Revise", "Cancel"]);
-                if (choice === "Yes — run it") {
-                    const finalPrompt = buildAgentPrompt(originalPrompt, plan, qaHistory);
-                    bundle.agent.prompt(finalPrompt).catch((err) => {
-                        dispatch({ type: "error", message: err instanceof Error ? err.message : String(err) });
-                    });
-                    return;
-                }
-                if (choice === "Cancel") {
-                    dispatch({ type: "chat-reply", text: "(plan cancelled)" });
-                    return;
-                }
-                const feedback = await bundle.userQueries.ask({
-                    question: "What should change about the plan?",
-                    placeholder: "describe the revision",
-                });
-                plan = await revisePlan(bundle.glue, plan, feedback);
-            }
-        }
-        catch (err) {
-            if (err instanceof UserQueryCancelled) {
-                dispatch({ type: "chat-reply", text: "(plan cancelled)" });
-                return;
-            }
-            dispatch({
-                type: "error",
-                message: `plan flow failed: ${err instanceof Error ? err.message : String(err)}`,
-            });
-        }
-    };
+    // Ctrl-C semantics:
+    //   • While the agent is busy: abort the turn. Stays in the app.
+    //   • A second Ctrl-C within DOUBLE_TAP_MS exits, regardless of
+    //     whether the previous press aborted or just landed a hint.
+    //     "Twice real fast" is universally understood as "I want out."
+    //   • While idle: first press posts a hint + arms the exit window.
+    //
+    // 1000ms is "real fast" — wide enough that intentional double-taps
+    // register, tight enough that mashing Ctrl-C twice while flustered
+    // doesn't accidentally exit. Tunable here if testers want it longer.
+    const exitTimerRef = useMemo(() => ({ deadline: 0 }), []);
     const handleAbort = () => {
+        const DOUBLE_TAP_MS = 1000;
+        const now = Date.now();
+        if (now < exitTimerRef.deadline) {
+            onExit();
+            return;
+        }
+        exitTimerRef.deadline = now + DOUBLE_TAP_MS;
         if (busy) {
             bundle.agent.abort();
             dispatch({ type: "abort" });
+            // No hint here — the abort itself is the feedback. The
+            // exit window is set silently so a quick second tap still
+            // gets the user out without confirmation theater.
+            return;
         }
-        else {
-            onExit();
-        }
+        appendStatus("Press Ctrl-C again to exit.");
     };
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { paddingX: 1, paddingY: 0, marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "codebase v2" }), _jsxs(Text, { dimColor: true, children: [" ", "\u00B7 ", bundle.model.name, " (", bundle.source, ")"] })] }), _jsx(MessageList, { messages: state.messages, streaming: state.streaming }), _jsx(ToolPanel, { tools: state.tools }), _jsx(TaskPanel, { tasks: tasks }), statusLines.length > 0 ? (_jsx(Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: statusLines.map((line, i) => (_jsx(Text, { dimColor: true, children: line }, `${i}-${line.slice(0, 8)}`))) })) : null, _jsx(Status, { state: state }), permRequest ? (_jsx(Permission, { request: permRequest, onRespond: (choice) => bundle.permissions.respond(permRequest.id, choice) })) : userQuery ? (_jsx(UserQueryView, { query: userQuery, onAnswer: (answer) => bundle.userQueries.respond(userQuery.id, answer), onCancel: () => bundle.userQueries.cancel(userQuery.id) })) : (_jsx(Input, { disabled: busy, onSubmit: handleSubmit, onAbort: handleAbort }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [state.messages.length === 0 && !state.streaming ? (_jsx(Welcome, { modelName: bundle.model.name, source: bundle.source, cwd: bundle.toolContext.cwd, resumedFrom: bundle.resumedFrom })) : (_jsxs(Box, { paddingX: 1, paddingY: 0, marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "codebase" }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", bundle.model.name, " Model"] })] })), _jsx(MessageList, { messages: state.messages, streaming: state.streaming, tools: state.tools }), compactionState.active ? _jsx(CompactionBanner, { state: compactionState }) : null, _jsx(ToolPanel, { tools: state.tools }), _jsx(TaskPanel, { tasks: tasks }), statusLines.length > 0 ? (_jsx(Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: statusLines.map((line, i) => (_jsx(Text, { dimColor: true, children: line }, `${i}-${line.slice(0, 8)}`))) })) : null, _jsx(Status, { state: state, cwd: bundle.toolContext.cwd }), permRequest ? (_jsx(Permission, { request: permRequest, onRespond: (choice) => bundle.permissions.respond(permRequest.id, choice) })) : userQuery ? (_jsx(UserQueryView, { query: userQuery, onAnswer: (answer) => bundle.userQueries.respond(userQuery.id, answer), onCancel: () => bundle.userQueries.cancel(userQuery.id) })) : (_jsx(Input, { disabled: busy, onSubmit: handleSubmit, onAbort: handleAbort, commands: commandSuggestions, history: inputHistory, cwd: bundle.toolContext.cwd, suggestion: suggestion, onSuggestionDismiss: dismissSuggestion }))] }));
 }
-/**
- * Resolve a user's typed answer to one of the supplied options.
- * Accepts the option label (case-insensitive), a 1-based index,
- * or the leading word of the label. Falls back to the raw input
- * if nothing matches — caller decides what to do with that.
- */
-function matchOption(answer, options) {
-    const trimmed = answer.trim();
-    const idx = Number.parseInt(trimmed, 10);
-    if (Number.isFinite(idx) && idx >= 1 && idx <= options.length) {
-        return options[idx - 1];
-    }
-    const lower = trimmed.toLowerCase();
-    for (const option of options) {
-        if (option.toLowerCase() === lower)
-            return option;
-        if (option.toLowerCase().startsWith(lower) && lower.length >= 3)
-            return option;
-    }
-    return trimmed;
+/** Extract the user-visible text from a content array (image messages). */
+function extractUserText(content) {
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .filter((b) => b?.type === "text")
+        .map((b) => b.text ?? "")
+        .join("");
 }
 function ExitOnCtrlC({ onExit }) {
     useEffect(() => {