gsd-pi 2.35.0-dev.30eec3f → 2.35.0-dev.640d5c7

package/dist/resources/extensions/gsd/templates/plan.md

@@ -113,14 +113,6 @@
   - Tasks execute sequentially in order (T01, T02, T03, ...)
   - est: is informational (e.g. 30m, 1h, 2h) and optional
 
-  Verify field rules:
-  - MUST be a mechanically executable command: `npm test`, `grep -q "pattern" file`, `test -f path`
-  - For content/document tasks: verify file existence, section count, YAML validity, or word count
-    NOT exact phrasing, specific formulas, or "zero TBD" aspirational criteria
-  - If no command can verify the output, write: "Manual review — file exists and is non-empty"
-  - BAD: "Sections 3.1 and 3.2 exist with exact formulas. Zero TBD/TODO."
-  - GOOD: `grep -c "^## " doc.md` returns >= 4 (4+ sections), `! grep -q "TBD\|TODO" doc.md`
-
   Integration closure rule:
   - At least one slice in any multi-boundary milestone should perform real composition/wiring, not just contract hardening
   - For the final assembly slice, verification must exercise the real entrypoint or runtime path

package/dist/resources/extensions/gsd/worktree-resolver.js

@@ -12,8 +12,6 @@
  * Key invariant: `createAutoWorktree()` and `enterAutoWorktree()` call
  * `process.chdir()` internally — this class MUST NOT double-chdir.
  */
-import { existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
 import { debugLog } from "./debug-logger.js";
 // ─── WorktreeResolver ──────────────────────────────────────────────────────
 export class WorktreeResolver {
@@ -255,16 +253,6 @@ export class WorktreeResolver {
                 fallback: "chdir-to-project-root",
             });
             ctx.notify(`Milestone merge failed: ${msg}`, "warning");
-            // Clean up stale merge state left by failed squash-merge (#1389)
-            try {
-                const gitDir = join(originalBase || this.s.basePath, ".git");
-                for (const f of ["SQUASH_MSG", "MERGE_HEAD", "MERGE_MSG"]) {
-                    const p = join(gitDir, f);
-                    if (existsSync(p))
-                        unlinkSync(p);
-                }
-            }
-            catch { /* best-effort */ }
             // Error recovery: always restore to project root
             if (originalBase) {
                 try {

package/dist/resources/extensions/remote-questions/remote-command.js

@@ -2,12 +2,12 @@
  * Remote Questions — /gsd remote command
  */
 import { AuthStorage } from "@gsd/pi-coding-agent";
-import { Editor, Key, matchesKey, truncateToWidth } from "@gsd/pi-tui";
+import { CURSOR_MARKER, Editor, Key, matchesKey, truncateToWidth } from "@gsd/pi-tui";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { getGlobalGSDPreferencesPath, loadEffectiveGSDPreferences } from "../gsd/preferences.js";
 import { getRemoteConfigStatus, isValidChannelId, resolveRemoteConfig } from "./config.js";
-import { maskEditorLine, sanitizeError } from "../shared/mod.js";
+import { sanitizeError } from "../shared/sanitize.js";
 import { getLatestPromptSummary } from "./status.js";
 export async function handleRemote(subcommand, ctx, _pi) {
     const trimmed = subcommand.trim();
@@ -339,6 +339,26 @@ function removeRemoteQuestionsConfig() {
     const next = frontmatter ? `---\n${frontmatter}\n---${content.slice(fmMatch[0].length)}` : content.slice(fmMatch[0].length).replace(/^\n+/, "");
     writeFileSync(prefsPath, next, "utf-8");
 }
+function maskEditorLine(line) {
+    let output = "";
+    let i = 0;
+    while (i < line.length) {
+        if (line.startsWith(CURSOR_MARKER, i)) {
+            output += CURSOR_MARKER;
+            i += CURSOR_MARKER.length;
+            continue;
+        }
+        const ansiMatch = /^\x1b\[[0-9;]*m/.exec(line.slice(i));
+        if (ansiMatch) {
+            output += ansiMatch[0];
+            i += ansiMatch[0].length;
+            continue;
+        }
+        output += line[i] === " " ? " " : "*";
+        i += 1;
+    }
+    return output;
+}
 async function promptMaskedInput(ctx, label, hint) {
     if (!ctx.hasUI)
         return null;

package/dist/resources/extensions/shared/mod.js

@@ -6,6 +6,6 @@ export { toPosixPath } from "./path-display.js";
 export { showInterviewRound } from "./interview-ui.js";
 export { showNextAction } from "./next-action-ui.js";
 export { showConfirm } from "./confirm-ui.js";
-export { sanitizeError, maskEditorLine } from "./sanitize.js";
+export { sanitizeError } from "./sanitize.js";
 export { formatDateShort, truncateWithEllipsis } from "./format-utils.js";
 export { splitFrontmatter, parseFrontmatterMap } from "./frontmatter.js";

package/dist/resources/extensions/shared/sanitize.js

@@ -1,8 +1,6 @@
 /**
  * Sanitize error messages by redacting token-like strings before surfacing.
- * Also provides maskEditorLine for masking sensitive TUI editor input.
  */
-import { CURSOR_MARKER } from "@gsd/pi-tui";
 const TOKEN_PATTERNS = [
     /xoxb-[A-Za-z0-9\-]+/g, // Slack bot tokens
     /xoxp-[A-Za-z0-9\-]+/g, // Slack user tokens
@@ -17,31 +15,3 @@ export function sanitizeError(msg) {
     }
     return sanitized;
 }
-/**
- * Replace editor visible text with masked characters while preserving
- * ANSI cursor/sequencer codes. Keeps border/metadata lines readable.
- */
-export function maskEditorLine(line) {
-    if (line.startsWith("─")) {
-        return line;
-    }
-    let output = "";
-    let i = 0;
-    while (i < line.length) {
-        if (line.startsWith(CURSOR_MARKER, i)) {
-            output += CURSOR_MARKER;
-            i += CURSOR_MARKER.length;
-            continue;
-        }
-        const ansiMatch = /^\x1b\[[0-9;]*m/.exec(line.slice(i));
-        if (ansiMatch) {
-            output += ansiMatch[0];
-            i += ansiMatch[0].length;
-            continue;
-        }
-        const ch = line[i];
-        output += ch === " " ? " " : "*";
-        i += 1;
-    }
-    return output;
-}

package/dist/resources/extensions/shared/wizard-ui.js

@@ -0,0 +1,478 @@
+/**
+ * General-purpose multi-page wizard UI.
+ *
+ * Supports declarative page definitions with select and text fields.
+ * Pages can conditionally route to different next pages based on answers.
+ *
+ * Navigation:
+ *   ←           go back one page (on page 1: triggers exit confirmation)
+ *   → / Enter   advance to next page (or submit on last page)
+ *   Escape      triggers exit confirmation overlay
+ *
+ * Exit confirmation (shown on Escape or ← from page 1):
+ *   1. Go back  — dismiss and return to current page
+ *   2. Exit     — cancel the wizard, returns null to caller
+ *
+ * Returns:
+ *   Record<pageId, Record<fieldId, string | string[]>>  on completion
+ *   null                                                 on exit/cancel
+ *
+ * Example:
+ *
+ *   const result = await showWizard(ctx, {
+ *     title: "New Project",
+ *     pages: [
+ *       {
+ *         id: "mode",
+ *         fields: [
+ *           {
+ *             type: "select",
+ *             id: "start_type",
+ *             question: "How do you want to start?",
+ *             options: [
+ *               { label: "Describe it", description: "Type what you want to build." },
+ *               { label: "Provide a file", description: "Point to an existing doc." },
+ *             ],
+ *           },
+ *         ],
+ *         next: (answers) =>
+ *           answers["mode"]?.["start_type"] === "Provide a file" ? "file_path" : null,
+ *       },
+ *       {
+ *         id: "file_path",
+ *         fields: [
+ *           { type: "text", id: "path", label: "File path", placeholder: "/path/to/doc.md" },
+ *         ],
+ *         next: () => null,
+ *       },
+ *     ],
+ *   });
+ *
+ *   if (!result) return; // user exited
+ *   const startType = result["mode"]["start_type"]; // "Describe it" | "Provide a file"
+ *   const filePath  = result["file_path"]?.["path"];
+ */
+import { Editor, Key, matchesKey, truncateToWidth, } from "@gsd/pi-tui";
+import { makeUI } from "./ui.js";
+// ─── Main export ──────────────────────────────────────────────────────────────
+/**
+ * Show a multi-page wizard and return collected answers, or null if the user exits.
+ */
+export async function showWizard(ctx, opts) {
+    const pageMap = new Map(opts.pages.map((p) => [p.id, p]));
+    return ctx.ui.custom((tui, theme, _kb, done) => {
+        // ── State ──────────────────────────────────────────────────────────────
+        /** Stack of page ids visited — drives back navigation */
+        const pageStack = [opts.pages[0].id];
+        const pageStates = new Map();
+        /** Collected answers across all pages */
+        const answers = {};
+        /** Whether the exit-confirmation overlay is showing */
+        let showingExitConfirm = false;
+        /** Cursor in the exit-confirm overlay: 0 = go back, 1 = exit */
+        let exitCursor = 0;
+        let cachedLines;
+        // Editors keyed by fieldId — one per text field
+        // editorTheme is derived from the design system at first render
+        const editors = new Map();
+        let resolvedEditorTheme = null;
+        function getEditor(fieldId) {
+            if (!resolvedEditorTheme)
+                resolvedEditorTheme = makeUI(theme, 80).editorTheme;
+            if (!editors.has(fieldId))
+                editors.set(fieldId, new Editor(tui, resolvedEditorTheme));
+            return editors.get(fieldId);
+        }
+        // ── Page state helpers ─────────────────────────────────────────────────
+        function getPageState(pageId) {
+            if (!pageStates.has(pageId)) {
+                pageStates.set(pageId, {
+                    selectStates: new Map(),
+                    textValues: new Map(),
+                    focusedFieldId: null,
+                });
+            }
+            return pageStates.get(pageId);
+        }
+        function getSelectState(pageId, fieldId, _optCount) {
+            const ps = getPageState(pageId);
+            if (!ps.selectStates.has(fieldId)) {
+                ps.selectStates.set(fieldId, {
+                    cursorIndex: 0,
+                    committedIndex: null, // nothing pre-committed — user must explicitly confirm
+                    checkedIndices: new Set(),
+                });
+            }
+            return ps.selectStates.get(fieldId);
+        }
+        // ── Current page ───────────────────────────────────────────────────────
+        function currentPageId() {
+            return pageStack[pageStack.length - 1];
+        }
+        function currentPage() {
+            return pageMap.get(currentPageId());
+        }
+        function currentPageState() {
+            return getPageState(currentPageId());
+        }
+        // ── Validation ─────────────────────────────────────────────────────────
+        function isPageComplete(page, ps) {
+            for (const field of page.fields) {
+                if (field.type === "select") {
+                    const ss = ps.selectStates.get(field.id);
+                    if (!ss)
+                        return false;
+                    if (field.allowMultiple) {
+                        if (ss.checkedIndices.size === 0)
+                            return false;
+                    }
+                    else {
+                        if (ss.committedIndex === null)
+                            return false;
+                    }
+                }
+                else {
+                    const val = ps.textValues.get(field.id) ?? "";
+                    if (!val.trim())
+                        return false;
+                }
+            }
+            return true;
+        }
+        // ── Collect answers for a page ─────────────────────────────────────────
+        function collectPageAnswers(page, ps) {
+            const result = {};
+            for (const field of page.fields) {
+                if (field.type === "select") {
+                    const ss = ps.selectStates.get(field.id);
+                    if (!ss)
+                        continue;
+                    if (field.allowMultiple) {
+                        result[field.id] = Array.from(ss.checkedIndices)
+                            .sort((a, b) => a - b)
+                            .map((i) => field.options[i].label);
+                    }
+                    else {
+                        if (ss.committedIndex !== null && ss.committedIndex < field.options.length) {
+                            result[field.id] = field.options[ss.committedIndex].label;
+                        }
+                    }
+                }
+                else {
+                    result[field.id] = ps.textValues.get(field.id) ?? "";
+                }
+            }
+            return result;
+        }
+        // ── Auto-focus helper ──────────────────────────────────────────────────
+        /** If a page's first field is a text field, focus it immediately on arrival. */
+        function autoFocusPageIfText(pageId) {
+            const page = pageMap.get(pageId);
+            if (!page)
+                return;
+            const firstField = page.fields[0];
+            if (firstField?.type === "text") {
+                const ps = getPageState(pageId);
+                ps.focusedFieldId = firstField.id;
+                const editor = getEditor(firstField.id);
+                editor.setText(ps.textValues.get(firstField.id) ?? "");
+            }
+        }
+        // Auto-focus the first page if it starts with a text field
+        autoFocusPageIfText(opts.pages[0].id);
+        // ── Navigation ─────────────────────────────────────────────────────────
+        function advance() {
+            const page = currentPage();
+            const ps = currentPageState();
+            if (!isPageComplete(page, ps)) {
+                refresh();
+                return;
+            }
+            // Save text field values from editors
+            for (const field of page.fields) {
+                if (field.type === "text") {
+                    ps.textValues.set(field.id, getEditor(field.id).getText().trim());
+                }
+            }
+            // Collect answers for this page
+            answers[page.id] = collectPageAnswers(page, ps);
+            // Route to next page
+            const nextId = page.next ? page.next(answers) : null;
+            if (!nextId) {
+                // End of wizard
+                done(answers);
+                return;
+            }
+            const nextPage = pageMap.get(nextId);
+            if (!nextPage) {
+                done(answers);
+                return;
+            }
+            pageStack.push(nextId);
+            autoFocusPageIfText(nextId);
+            refresh();
+        }
+        function goBack() {
+            if (pageStack.length <= 1) {
+                // Already at first page — Esc here means exit
+                showingExitConfirm = true;
+                exitCursor = 0;
+                refresh();
+                return;
+            }
+            pageStack.pop();
+            autoFocusPageIfText(currentPageId());
+            refresh();
+        }
+        function refresh() {
+            cachedLines = undefined;
+            tui.requestRender();
+        }
+        // ── Input handler ──────────────────────────────────────────────────────
+        function handleInput(data) {
+            // ── Exit confirm overlay ─────────────────────────────────────────
+            if (showingExitConfirm) {
+                if (matchesKey(data, Key.up)) {
+                    exitCursor = 0;
+                    refresh();
+                    return;
+                }
+                if (matchesKey(data, Key.down)) {
+                    exitCursor = 1;
+                    refresh();
+                    return;
+                }
+                if (data === "1") {
+                    showingExitConfirm = false;
+                    refresh();
+                    return;
+                }
+                if (data === "2") {
+                    done(null);
+                    return;
+                }
+                if (matchesKey(data, Key.enter) || matchesKey(data, Key.space)) {
+                    if (exitCursor === 0) {
+                        showingExitConfirm = false;
+                        refresh();
+                    }
+                    else {
+                        done(null);
+                    }
+                    return;
+                }
+                // Esc on the confirm screen = go back (dismiss confirm)
+                if (matchesKey(data, Key.escape)) {
+                    showingExitConfirm = false;
+                    refresh();
+                    return;
+                }
+                return;
+            }
+            // ── Text field focus ─────────────────────────────────────────────
+            const ps = currentPageState();
+            if (ps.focusedFieldId) {
+                const editor = getEditor(ps.focusedFieldId);
+                if (matchesKey(data, Key.escape)) {
+                    // First Esc: unfocus the text field
+                    ps.textValues.set(ps.focusedFieldId, editor.getText().trim());
+                    ps.focusedFieldId = null;
+                    refresh();
+                    return;
+                }
+                if (matchesKey(data, Key.enter)) {
+                    ps.textValues.set(ps.focusedFieldId, editor.getText().trim());
+                    ps.focusedFieldId = null;
+                    advance();
+                    return;
+                }
+                editor.handleInput(data);
+                refresh();
+                return;
+            }
+            // ── Esc with no text field focused: go back (or exit if on page 1) ──
+            if (matchesKey(data, Key.escape)) {
+                goBack();
+                return;
+            }
+            // ── Enter / → to advance ─────────────────────────────────────────
+            if (matchesKey(data, Key.enter) || matchesKey(data, Key.right)) {
+                // For single-select fields, commit cursor before advancing
+                const page = currentPage();
+                for (const field of page.fields) {
+                    if (field.type === "select" && !field.allowMultiple) {
+                        const ss = getSelectState(currentPageId(), field.id, field.options.length);
+                        if (ss.committedIndex === null)
+                            ss.committedIndex = ss.cursorIndex;
+                    }
+                }
+                advance();
+                return;
+            }
+            // ── Select field interactions ────────────────────────────────────
+            const page = currentPage();
+            for (const field of page.fields) {
+                if (field.type !== "select")
+                    continue;
+                const ss = getSelectState(currentPageId(), field.id, field.options.length);
+                const totalOpts = field.options.length;
+                if (matchesKey(data, Key.up)) {
+                    ss.cursorIndex = (ss.cursorIndex - 1 + totalOpts) % totalOpts;
+                    refresh();
+                    return;
+                }
+                if (matchesKey(data, Key.down)) {
+                    ss.cursorIndex = (ss.cursorIndex + 1) % totalOpts;
+                    refresh();
+                    return;
+                }
+                if (field.allowMultiple) {
+                    if (matchesKey(data, Key.space)) {
+                        if (ss.checkedIndices.has(ss.cursorIndex))
+                            ss.checkedIndices.delete(ss.cursorIndex);
+                        else
+                            ss.checkedIndices.add(ss.cursorIndex);
+                        refresh();
+                        return;
+                    }
+                }
+                else {
+                    // Numeric shortcut: press the number to select and immediately advance
+                    if (data.length === 1 && data >= "1" && data <= "9") {
+                        const idx = parseInt(data, 10) - 1;
+                        if (idx < totalOpts) {
+                            ss.cursorIndex = idx;
+                            ss.committedIndex = idx;
+                            advance();
+                            return;
+                        }
+                    }
+                    // Enter/Space commit cursor and advance (Enter handled above, Space here)
+                    if (matchesKey(data, Key.space)) {
+                        ss.committedIndex = ss.cursorIndex;
+                        advance();
+                        return;
+                    }
+                }
+                // Only handle the first select field for nav
+                break;
+            }
+        }
+        // ── Render ─────────────────────────────────────────────────────────────
+        function renderExitConfirm(width) {
+            const ui = makeUI(theme, width);
+            const lines = [];
+            const push = (...rows) => { for (const r of rows)
+                lines.push(...r); };
+            push(ui.bar(), ui.blank(), ui.header("  Exit wizard?"), ui.blank(), ui.subtitle("  Your progress will be lost."), ui.blank());
+            if (exitCursor === 0)
+                push(ui.actionSelected(1, "Go back", "Return to where you were."));
+            else
+                push(ui.actionUnselected(1, "Go back", "Return to where you were."));
+            push(ui.blank());
+            if (exitCursor === 1)
+                push(ui.actionSelected(2, "Exit", "Cancel and discard all answers."));
+            else
+                push(ui.actionUnselected(2, "Exit", "Cancel and discard all answers."));
+            push(ui.blank(), ui.hints(["↑/↓ to choose", "1/2 to quick-select", "enter to confirm"]), ui.bar());
+            return lines;
+        }
+        function renderSelectField(ui, field, lines) {
+            const push = (...rows) => { for (const r of rows)
+                lines.push(...r); };
+            const ss = getSelectState(currentPageId(), field.id, field.options.length);
+            const multi = !!field.allowMultiple;
+            push(ui.question(`  ${field.question}`));
+            if (multi)
+                push(ui.meta("  (select all that apply — space to toggle, enter to confirm)"));
+            push(ui.blank());
+            for (let i = 0; i < field.options.length; i++) {
+                const opt = field.options[i];
+                const isCursor = i === ss.cursorIndex;
+                const isCommitted = i === ss.committedIndex;
+                if (multi) {
+                    const isChecked = ss.checkedIndices.has(i);
+                    if (isCursor)
+                        push(ui.checkboxSelected(opt.label, opt.description, isChecked));
+                    else
+                        push(ui.checkboxUnselected(opt.label, opt.description, isChecked));
+                }
+                else {
+                    if (isCursor)
+                        push(ui.optionSelected(i + 1, opt.label, opt.description, isCommitted));
+                    else
+                        push(ui.optionUnselected(i + 1, opt.label, opt.description, { isCommitted }));
+                }
+            }
+        }
+        function renderTextField(ui, field, ps, lines, width) {
+            const push = (...rows) => { for (const r of rows)
+                lines.push(...r); };
+            const isFocused = ps.focusedFieldId === field.id;
+            const value = isFocused ? getEditor(field.id).getText() : (ps.textValues.get(field.id) ?? "");
+            push(ui.question(`  ${field.label}`), ui.blank());
+            if (isFocused) {
+                for (const line of getEditor(field.id).render(width - 2))
+                    lines.push(truncateToWidth(` ${line}`, width));
+            }
+            else if (value) {
+                push(ui.answer(`  ${value}`));
+            }
+            else if (field.placeholder) {
+                push(ui.meta(`  ${field.placeholder}`));
+            }
+        }
+        function render(width) {
+            if (cachedLines)
+                return cachedLines;
+            if (showingExitConfirm) {
+                cachedLines = renderExitConfirm(width);
+                return cachedLines;
+            }
+            const ui = makeUI(theme, width);
+            const lines = [];
+            const push = (...rows) => { for (const r of rows)
+                lines.push(...r); };
+            push(ui.bar(), ui.header(`  ${opts.title}`));
+            // ── Page indicator ────────────────────────────────────────────────
+            if (opts.pages.length > 1) {
+                push(ui.pageDots(opts.pages.length, pageStack.length - 1));
+            }
+            // ── Page content ──────────────────────────────────────────────────
+            const page = currentPage();
+            const ps = currentPageState();
+            if (page.subtitle) {
+                push(ui.blank(), ui.subtitle(`  ${page.subtitle}`));
+            }
+            push(ui.blank());
+            for (const field of page.fields) {
+                if (field.type === "select")
+                    renderSelectField(ui, field, lines);
+                else
+                    renderTextField(ui, field, ps, lines, width);
+                push(ui.blank());
+            }
+            // ── Footer hints ──────────────────────────────────────────────────
+            const isFirst = pageStack.length === 1;
+            const ps2 = currentPageState();
+            const hints = [];
+            if (ps2.focusedFieldId) {
+                hints.push("enter to continue");
+                hints.push("esc to unfocus");
+            }
+            else {
+                hints.push("↑/↓ to move");
+                hints.push("enter to select");
+                hints.push(!isFirst ? "esc to go back" : "esc to exit");
+            }
+            push(ui.hints(hints), ui.bar());
+            cachedLines = lines;
+            return lines;
+        }
+        return {
+            render,
+            invalidate: () => { cachedLines = undefined; },
+            handleInput,
+        };
+    });
+}

package/dist/resources/extensions/subagent/index.js

@@ -20,7 +20,6 @@ import { StringEnum } from "@gsd/pi-ai";
 import { getMarkdownTheme } from "@gsd/pi-coding-agent";
 import { Container, Markdown, Spacer, Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { formatTokenCount } from "../shared/mod.js";
 import { discoverAgents } from "./agents.js";
 import { createIsolation, mergeDeltaPatches, readIsolationMode, } from "./isolation.js";
 import { registerWorker, updateWorker } from "./worker-registry.js";
@@ -59,22 +58,31 @@ async function stopLiveSubagents() {
         }
     }
 }
+function formatTokens(count) {
+    if (count < 1000)
+        return count.toString();
+    if (count < 10000)
+        return `${(count / 1000).toFixed(1)}k`;
+    if (count < 1000000)
+        return `${Math.round(count / 1000)}k`;
+    return `${(count / 1000000).toFixed(1)}M`;
+}
 function formatUsageStats(usage, model) {
     const parts = [];
     if (usage.turns)
         parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
     if (usage.input)
-        parts.push(`↑${formatTokenCount(usage.input)}`);
+        parts.push(`↑${formatTokens(usage.input)}`);
     if (usage.output)
-        parts.push(`↓${formatTokenCount(usage.output)}`);
+        parts.push(`↓${formatTokens(usage.output)}`);
     if (usage.cacheRead)
-        parts.push(`R${formatTokenCount(usage.cacheRead)}`);
+        parts.push(`R${formatTokens(usage.cacheRead)}`);
     if (usage.cacheWrite)
-        parts.push(`W${formatTokenCount(usage.cacheWrite)}`);
+        parts.push(`W${formatTokens(usage.cacheWrite)}`);
     if (usage.cost)
         parts.push(`$${(Number(usage.cost) || 0).toFixed(4)}`);
     if (usage.contextTokens && usage.contextTokens > 0) {
-        parts.push(`ctx:${formatTokenCount(usage.contextTokens)}`);
+        parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
     }
     if (model)
         parts.push(model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsd-pi",
-  "version": "2.35.0-dev.30eec3f",
+  "version": "2.35.0-dev.640d5c7",
   "description": "GSD — Get Shit Done coding agent",
   "license": "MIT",
   "repository": {
@@ -50,7 +50,6 @@
     "copy-themes": "node scripts/copy-themes.cjs",
     "copy-export-html": "node scripts/copy-export-html.cjs",
     "test:unit": "node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*.test.ts src/resources/extensions/gsd/tests/*.test.mjs src/tests/*.test.ts",
-    "test:marketplace": "GSD_TEST_CLONE_MARKETPLACES=1 node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/claude-import-tui.test.ts src/resources/extensions/gsd/tests/plugin-importer-live.test.ts src/tests/marketplace-discovery.test.ts",
     "test:coverage": "c8 --reporter=text --reporter=lcov --exclude='src/resources/extensions/gsd/tests/**' --exclude='src/tests/**' --exclude='scripts/**' --exclude='native/**' --exclude='node_modules/**' --check-coverage --statements=50 --lines=50 --branches=20 --functions=20 node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*.test.ts src/resources/extensions/gsd/tests/*.test.mjs src/tests/*.test.ts",
     "test:integration": "node --import ./src/resources/extensions/gsd/tests/resolve-ts.mjs --experimental-strip-types --test src/resources/extensions/gsd/tests/*integration*.test.ts src/tests/integration/*.test.ts",
     "test": "npm run test:unit && npm run test:integration",