@krtclcdy/tersio 2.25.4 → 2.25.6

package/dist/cli/usage.js

@@ -1,12 +1,12 @@
 // cli/usage.ts — ledger + session-token usage report, tokscale-style.
-import { co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
-import { resolveRtkBinary } from '../extensions/lib/utils.js';
+import { PRICE_TIERS_FIRM, co2GramsFor, displayModelId, energyWhFor, foldModelsByLabel, importSessionTokens, ledgerPath, priceFor, pricesOverridePath, readResetWatermark, readRtkAdoption, readRtkRecallDiagnostics, readUsage, refreshPricesIfStale, sessionsDir, usdCost, } from '../extensions/shared/usage-ledger.js';
+import { resolveRtkBinary } from '../extensions/shared/utils.js';
 import { readRtkGain } from '../extensions/shared/rtk-gain.js';
 import { readUsageDb, reparseGuardReport, syncUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { withInteractiveSpinner } from './interactive.js';
 import { PACKAGE_VERSION, currency } from './common.js';
 import { formatCurrency } from './currency.js';
-// RTK's history is machine-wide; rows group by command alone. 2000 groups covers a long history while still bounding /data.json.
+// RTK history is machine-wide; rows group by command. 2000 groups covers a long history while bounding /data.json.
 const RTK_COMMAND_ROWS = 2000;
 export function summarizeUsage(rows) {
     refreshPricesIfStale();
@@ -17,7 +17,7 @@ export function summarizeUsage(rows) {
         detailCounts[r.detail] = (detailCounts[r.detail] ?? 0) + 1;
     }
     const byDetail = Object.entries(detailCounts).sort((a, b) => b[1] - a[1]).slice(0, 10);
-    // usage.db is a cache of the same per-message rows: sync best-effort, read stored, fall back to the live parse when the store is missing or stale.
+    // usage.db caches the same per-message rows: sync best-effort, read stored, fall back to the live parse when stale.
     let synced = false;
     try {
         synced = syncUsageDb();
@@ -39,11 +39,13 @@ export function summarizeUsage(rows) {
     const source = stored ? (synced ? 'stored' : 'stored-stale') : 'live';
     const watermark = readResetWatermark();
     let usd = 0;
+    let estimatedUsd = 0;
     let priced = true;
     let savedUsd = 0;
     const byModelUsd = {};
     const byModelBucketUsd = {};
     const byHost = {};
+    const byAgent = {};
     const byDayModel = {};
     let co2g = 0;
     let energyWh = 0;
@@ -55,9 +57,24 @@ export function summarizeUsage(rows) {
     };
     // Price by exact key first (gateways can differ), then fold every map under the display label.
     const folded = foldModelsByLabel(session.byModel, session.byModelMessages);
+    const priceTiers = {};
+    // Named in the loop so the list is built in one pass, then sorted by token volume below.
+    const weakModels = [];
+    const measuredModels = [];
     for (const [model, t] of Object.entries(session.byModel)) {
-        const c = usdCost(t, model);
+        // A model counts as measured only when the host priced every message, or unpriced ones would read as zero.
+        const covered = (session.byModelCostMessages[model] ?? 0) >= (session.byModelMessages[model] ?? 0);
+        const measured = covered ? session.byModelMeasured[model] : undefined;
+        const c = usdCost(t, model, measured);
         usd += c.usd;
+        priceTiers[c.tier] = (priceTiers[c.tier] ?? 0) + 1;
+        if (c.tier === 'measured')
+            measuredModels.push(model);
+        // A non-firm tier is kept out of the firm total, or a guessed cost would make the figure read as a bill.
+        if (!PRICE_TIERS_FIRM.includes(c.tier)) {
+            estimatedUsd += c.usd;
+            weakModels.push(model);
+        }
         const label = displayModelId(model);
         byModelUsd[label] = (byModelUsd[label] ?? 0) + c.usd;
         byModelBucketUsd[label] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
@@ -67,6 +84,11 @@ export function summarizeUsage(rows) {
             byHost[label][host] ??= { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
             addTok(byHost[label][host], hb);
         }
+        for (const [agent, ab] of Object.entries(session.byAgent[model] ?? {})) {
+            byAgent[agent] ??= { tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, msgs: 0 };
+            addTok(byAgent[agent].tokens, ab);
+            byAgent[agent].msgs += session.byAgentMessages[model]?.[agent] ?? 0;
+        }
         co2g += co2GramsFor(model, t.output);
         energyWh += energyWhFor(model, t.output);
         if (!c.priced)
@@ -81,6 +103,10 @@ export function summarizeUsage(rows) {
         }
     }
     const byTool = Object.entries(session.byTool).sort((a, b) => b[1] - a[1]).slice(0, 10);
+    // Heaviest first, then capped to five: the line is guidance, not a dump of the model table.
+    const weakKeys = weakModels
+        .toSorted((a, b) => tokenTotal(session.byModel[b]) - tokenTotal(session.byModel[a]))
+        .slice(0, 5);
     return {
         total: rows.length,
         byKind,
@@ -94,6 +120,7 @@ export function summarizeUsage(rows) {
         byModelBucketUsd,
         byModelMessages: folded.byModelMessages,
         byHost,
+        byAgent,
         byDay: session.byDay,
         byDayModel,
         byTool,
@@ -106,6 +133,10 @@ export function summarizeUsage(rows) {
         rtkRecall: readRtkRecallDiagnostics(resolveRtkBinary()),
         usd,
         priced,
+        estimatedUsd,
+        priceTiers,
+        weakModels: weakKeys,
+        measuredModels,
         savedUsd,
         costMeasured: session.costMeasured,
         co2g,
@@ -119,6 +150,10 @@ export function summarizeUsage(rows) {
 function fmt(n) {
     return n.toLocaleString('en-US');
 }
+/** Every billed bucket, so a model sorts by how much of the estimate it carries. */
+function tokenTotal(t) {
+    return t.input + t.output + t.cacheRead + t.cacheWrite;
+}
 function fmtShort(n) {
     if (n >= 1e12)
         return (n / 1e12).toFixed(1) + 'T';
@@ -143,7 +178,7 @@ const ROW_CAP = 15;
 function pad(s, n) {
     return s.length >= n ? s : s + ' '.repeat(n - s.length);
 }
-// Box-drawing table, plain text (piped-safe, byte-stable). Numeric columns right-align; long cells truncate with an ellipsis. Shared with cli/settings.ts.
+// Box-drawing table, plain text (piped-safe, byte-stable). Numbers right-align; long cells truncate with an ellipsis.
 function textTable(headers, rows, right = [], maxW = 32) {
     const cells = [headers, ...rows].map((r) => r.map((c) => (c.length > maxW ? c.slice(0, maxW - 1) + '…' : c)));
     const widths = headers.map((_, i) => Math.max(...cells.map((r) => r[i].length)));
@@ -163,12 +198,33 @@ function printReport(report) {
     }
     const t = report.tokens;
     const a = report.rtkAdoption;
+    // A tier that is not firm is named, so a figure that is partly a guess never reads as a bill.
+    const weak = ['tail', 'default'].reduce((sum, tier) => sum + (report.priceTiers[tier] ?? 0), 0);
+    const overridden = report.priceTiers.override ?? 0;
+    // The count stays in the cell; names go below, since a 118-column cell would truncate a model-id list.
+    const listed = report.weakModels.map((m) => displayModelId(m));
+    const measuredCount = report.measuredModels.length;
+    const costNote = weak > 0
+        ? ` · ${weak} model${weak === 1 ? '' : 's'} priced from another provider or the default table — add them to ${pricesOverridePath()}`
+        : overridden > 0
+            ? ` · ${overridden} model${overridden === 1 ? '' : 's'} priced from your override file`
+            : measuredCount > 0
+                ? ` · ${measuredCount} model${measuredCount === 1 ? '' : 's'} priced by the host`
+                : '';
     for (const l of textTable(['Metric', 'Value'], [
         ['Tokens', `${fmt(t.input)} in · ${fmt(t.output)} out · ${fmt(t.cacheRead)} cache read · ${fmt(t.cacheWrite)} cache write`],
-        ['Cost', `${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)`],
+        ['Cost', `${formatCurrency(report.usd, report.currency)}${report.priced ? '' : ' (includes default pricing)'} · ~${formatCurrency(report.savedUsd, report.currency)} cache-saved (est.) · ~${report.co2g.toFixed(1)}g CO2 (est.)${costNote}`],
         ['RTK adoption', `${fmt(a.rtkCalls)}/${fmt(a.eligibleCalls)} eligible Bash calls use RTK (${a.adoptionPct.toFixed(1)}%) · ${fmt(a.missedCalls)} missed · recall ${report.rtkRecall.available ? `${report.rtkRecall.mode} (${report.rtkRecall.entries})` : 'unavailable'}`],
     ], [false, false], 118))
         console.log(l);
+    if (measuredCount > 0) {
+        // Named, because a measured figure is only worth trusting when a reader sees whose it is.
+        console.log(`  Priced by the host: ${measuredCount} model${measuredCount === 1 ? '' : 's'}`);
+    }
+    if (weak > 0) {
+        // Heaviest first, one per host spelling, so the operator sees exactly what to write.
+        console.log(`  Unpriced (heaviest first): ${listed.join(', ')}`);
+    }
     const allModels = Object.entries(report.byModel).filter(([, b]) => b.input + b.output + b.cacheRead + b.cacheWrite > 0).sort((a, b) => (b[1].input + b[1].output) - (a[1].input + a[1].output));
     const models = allModels.slice(0, ROW_CAP);
     if (models.length) {
@@ -186,6 +242,18 @@ function printReport(report) {
         if (allModels.length > ROW_CAP)
             console.log(`  showing top ${ROW_CAP} of ${fmt(allModels.length)} models — full set in the dashboard`);
     }
+    const agentKinds = Object.entries(report.byAgent).filter(([, per]) => per.msgs > 0).toSorted((x, y) => y[1].msgs - x[1].msgs);
+    if (agentKinds.length > 1) {
+        console.log('  BY AGENT');
+        const top = agentKinds.reduce((m, [, per]) => Math.max(m, per.tokens.input + per.tokens.output + per.tokens.cacheRead + per.tokens.cacheWrite), 1);
+        const arows = agentKinds.map(([kind, per]) => {
+            const total = per.tokens.input + per.tokens.output + per.tokens.cacheRead + per.tokens.cacheWrite;
+            return [kind === 'subagent' ? 'Subagents' : 'Main agent', fmt(per.msgs), fmt(per.tokens.input), fmt(per.tokens.output), fmt(per.tokens.cacheRead), `${bar(total / top, 8)} ${fmtShort(total)}`];
+        });
+        for (const line of textTable(['Agent', 'Msgs', 'Input', 'Output', 'Cache read', 'Share'], arows, [false, true, true, true, true, false])) {
+            console.log(line);
+        }
+    }
     const cmdRows = report.byTool.map(([tool, n]) => ({ name: tool, count: n, saved: null, avgPct: null, avgMs: null }));
     for (const r of report.rtkGain.byCommand) {
         cmdRows.push({ name: r.command, count: r.count, saved: r.saved, avgPct: r.avgPct, avgMs: r.avgMs });

package/dist/extensions/{caveman-session → caveman}/index.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from 'node:url';
 import { getSharedComboState, hasModeState, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, systemPromptIncludes } from '../shared/session-state.js';
 import { dirname, join } from 'node:path';
 import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
-import { announceStatus } from '../shared/status.js';
+import { announceStatus, formatCavemanStatus } from '../shared/status.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 // Upstream ships one skill per register: default, ultracave, megacave.
@@ -66,6 +66,8 @@ export default function cavemanSessionExtension(pi) {
             }
             if (arg === 'status') {
                 announceStatus(ctx);
+                // The footer carries one line, so the mode is answered here instead of standing as a second status key.
+                ctx?.ui?.notify?.(formatCavemanStatus(currentMode), 'info');
                 return;
             }
             if (!setMode(arg, ctx)) {
@@ -84,7 +86,7 @@ export default function cavemanSessionExtension(pi) {
         // A subagent's branch has no Tersio entries; reconciling it would wipe shared state.
         if (hasModeState(entries))
             reconcileSharedComboEntries(entries);
-        // Persisted state wins, then a mode already chosen this session, then the configured default. `off` is the start value, not "unset".
+        // Persisted state wins, then a mode already chosen, then the default. `off` is the start value, not unset.
         const persisted = resolveMode(entries, '');
         const alreadyChosen = currentMode !== DEFAULT_MODE;
         currentMode = persisted || (alreadyChosen ? currentMode : normalizeMode('caveman', readCavemanDefault())) || DEFAULT_MODE;

package/{extensions/caveman-session → dist/extensions/caveman}/rule-megacave.md

@@ -15,11 +15,11 @@ Megacave is caveman in Classical Chinese. 文言文: subjects omitted where reco
 
 ## Persistence
 
-Every response, whole session, until "stop caveman" or "normal mode". Unsure? Still on. `/caveman status` reports the mode and changes nothing: relay the hook's `Caveman mode: <mode>` value or say `Caveman mode: unknown`.
+Every response, whole session, until "stop caveman" or "normal mode". Unsure? Still on. `/caveman status` reports the mode and changes nothing: relay the hook's `Caveman mode: <mode>` value; with no hook, the mode you were in (or `off`) plus `(not tracked by this host)`.
 
 ## Floor
 
-Never cut or translate: code, commands, paths, API names, error strings, in their original script. Negation (不, 非, 勿, 未, 毋). Numbers and units, Arabic numerals. One term per thing. A clause ambiguous in 文言 becomes 白話.
+Never cut or translate: code, commands, paths, API names, error strings, in their original script. Negation (不, 非, 勿, 未, 毋). Numbers and units, Arabic numerals. One term per thing. A clause ambiguous in 文言 becomes 白話. Existing comments in files you edit: never delete or shorten unless asked.
 
 ## Rules
 
@@ -39,6 +39,8 @@ Good: "池蓄已開之連，不逐請而新開，省握手之費。"
 
 ### 3. Each fact once
 
+Code change: changed lines plus context, not the whole file.
+
 Good: "新參照則重繪。`useMemo` 包之。"
 
 ### 4. Payload in original script
@@ -56,7 +58,7 @@ No "文言模式啟", no modern answer plus classical copy. 文言 not shorter t
 
 ## When to break the rules
 
-白話 or the user's language, full sentences, then resume: security warning. Irreversible action, confirm first. Any clause with two readings. User confused. Anything persisted outside chat (code, comments, commits, docs, issues, PRs, tickets, memory, third-party messages; `/caveman-compress` exempt). Harness asks for a status line.
+白話 or the user's language, full sentences, then resume: security warning. Irreversible action, confirm first. Any clause with two readings. User confused. Question to the user, with its options. Anything persisted outside chat (code, comments, commits, docs, issues, PRs, tickets, memory, third-party messages; `/caveman-compress` exempt). Harness asks for a status line.
 
 ## Pre-send check
 

package/{extensions/caveman-session → dist/extensions/caveman}/rule-ultra.md

@@ -15,11 +15,11 @@ Ultracave is caveman with the grammar stripped. Payload only.
 
 ## Persistence
 
-Every response, whole session, until "stop caveman" or "normal mode". Unsure? Still on. `/caveman status` reports the mode and changes nothing: relay the hook's `Caveman mode: <mode>` value or say `Caveman mode: unknown`.
+Every response, whole session, until "stop caveman" or "normal mode". Unsure? Still on. `/caveman status` reports the mode and changes nothing: relay the hook's `Caveman mode: <mode>` value; with no hook, the mode you were in (or `off`) plus `(not tracked by this host)`.
 
 ## Floor
 
-Never cut: code, commands, paths, API names, error strings (verbatim). not/never/no/only/except. Numbers and units. The user's language. One term per thing. No invented abbreviations, no arrows.
+Never cut: code, commands, paths, API names, error strings (verbatim). not/never/no/only/except. Numbers and units. The user's language. One term per thing. No invented abbreviations, no arrows. Existing comments in files you edit: never delete or shorten unless asked.
 
 ## Rules
 
@@ -37,7 +37,7 @@ Good: "Yes. Null check first."
 
 ### 3. Each fact once
 
-No restating, no summary after a list.
+No restating, no summary after a list. Code change: changed lines plus context, not the whole file.
 
 Good: "Pool reuses open DB connections. No per-request handshake."
 
@@ -56,7 +56,7 @@ No prefix, no announcement, no mangled verbs for flavor. Fragment not shorter th
 
 ## When to break the rules
 
-Plain prose, then resume: security warning. Irreversible action, confirm first. Any fragment with two readings. User confused. Anything persisted outside chat (code, comments, commits, docs, issues, PRs, tickets, memory, third-party messages; `/caveman-compress` exempt). Harness asks for a status line.
+Plain prose, then resume: security warning. Irreversible action, confirm first. Any fragment with two readings. User confused. Question to the user, with its options. Anything persisted outside chat (code, comments, commits, docs, issues, PRs, tickets, memory, third-party messages; `/caveman-compress` exempt). Harness asks for a status line.
 
 ## Pre-send check
 

package/dist/extensions/caveman/rule.md

@@ -0,0 +1,89 @@
+---
+name: caveman
+description: >
+  Terse caveman voice: answer first, fluff gone, every technical fact kept.
+  Use for /caveman, "caveman mode", "talk like caveman", "be brief", "less
+  tokens". Stays on until "stop caveman" or "normal mode".
+---
+
+# caveman
+
+Respond terse like smart caveman. All technical substance stay. Only fluff die.
+
+Caveman is a voice, not broken grammar. Reader pays per token and reads in a terminal. Every word earns its place. Every fact survives.
+
+## Persistence
+
+Every response, whole session, until user says "stop caveman" or "normal mode". Unsure if still on? It is. Confirm the switch-off in one line.
+
+`/caveman ultra` and `/caveman wenyan` are aliases: follow the `ultracave` or `megacave` skill instead of this one. `/caveman status` reports the mode and changes nothing. Relay the hook's `Caveman mode: <mode>` value when present. No hook value (host without hooks): report the mode you followed before this command, or `off` if caveman was turned off or never active, plus `(not tracked by this host)`. Example: `Caveman mode: caveman (not tracked by this host)`. Loading this skill to answer status is not activation. Never infer a mode from the configured default.
+
+## Why
+
+1. Every output token is billed and read. Filler costs twice.
+2. Code, commands, paths, numbers, errors are the payload. One changed character breaks them.
+3. Ceremony is expensive, grammar is cheap. "Sure, I'd be happy to help" is ten tokens. "the" is one.
+4. A dropped negation costs more than every token saved. Clarity beats compression.
+
+## Rules
+
+### 1. Answer first
+
+Answer, then reason, then next step. Pattern: `[thing] [action] [reason]. [next step].`
+
+Bad: "Sure! I'd be happy to help. The issue you're experiencing is likely caused by..."
+Good: "Bug in auth middleware. Token expiry check use `<` not `<=`. Fix:"
+
+### 2. Kill ceremony
+
+No greeting, hedging, pleasantries, recap, or closer. No "Sure!", "Let me", "I'll now", "Hope this helps". No just/really/basically/actually/simply.
+
+### 3. Short word
+
+"fix" not "implement a solution for". Standard acronyms fine (DB, API, HTTP). Invented abbreviations not (cfg, impl, fn): same tokens, harder read. No arrows.
+
+### 4. Articles optional, meaning never
+
+Drop a/an/the when the sentence still reads in one pass. Fragments fine. Never drop not/never/no/only/except. Numbers and units exact.
+
+Bad: "Migration drop column backup first."
+Good: "Back up first. Then run migration: it drops the column."
+
+### 5. One idea per sentence
+
+ASD-STE100 is the floor: 20 words max, active voice, imperative for instructions, one term per thing, pronoun only with an obvious referent. Compression and clarity conflict? Clarity wins.
+
+### 6. Payload verbatim
+
+Code blocks unchanged. Commands, paths, API names exact. Errors quoted exact, shortest decisive line only. Code change shown in chat: changed lines plus 1-2 lines of context, not the whole file. Whole file only if the user asks, the file is new, or most of it changes. Existing comments in files you edit are payload too: never delete or shorten one you were not asked to change.
+
+### 7. Tool runs: bounded status
+
+No text between routine calls. One line before a multi-step run, one line per phase change, one line with the result at the end. Otherwise text before a call only to clarify, warn, or disambiguate.
+
+### 8. User's language
+
+Compress the style, not the language. An explicit reply-language instruction wins. Never switch because of quoted text. Technical terms and errors stay verbatim. Particles and case markers are grammar, not filler.
+
+### 9. Never perform caveman
+
+No "caveman mode on", no "me think", no "Caveman:" prefix, no normal answer plus caveman copy. No decorative tables or emoji. Never add a word to sound caveman. Caveman phrasing not shorter than plain? Use plain.
+
+## When to break the rules
+
+Plain prose, then resume:
+
+1. Security warning.
+2. Irreversible action. Confirm in full sentences first.
+3. Step order a fragment could scramble.
+4. User confused or repeats the question.
+5. Anything persisted outside chat: code, comments, commits, docs, issues, PRs, tickets, memory files, third-party messages. `/caveman-compress` exempt.
+6. Harness asks for a status line or confirmation. Give it. Harness decides *when* you speak, caveman decides *how*.
+7. You ask the user a question or offer options. Full sentences, so the answer comes back right first time.
+
+## Pre-send check
+
+1. First sentence announces what you will do? Delete.
+2. Last sentence recaps or offers help? Delete.
+3. Every not/never/no/only present? Every code span, path, number, error verbatim?
+4. Any sentence with two readings? Make it a full sentence.

package/dist/extensions/{combo-toggle → combo}/index.js

@@ -8,14 +8,31 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 import path from 'node:path';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { activeModesSummary, COMBO_LEVELS, getSharedComboState, hasModeState, normalizeComboLevel, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboModes, systemPromptIncludes, } from '../shared/session-state.js';
+import { activeModesSummary, COMBO_LEVELS, getSharedComboState, hasModeState, normalizeComboLevel, normalizeMode, reconcileSharedComboEntries, sessionEntries, setSharedComboLevel, setSharedComboListener, setSharedComboMode, setSharedComboModes, systemPromptIncludes, } from '../shared/session-state.js';
 import { hostSelect, injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
 import { announceStatus } from '../shared/status.js';
-import { isComboSetupComplete, readCavemanDefault, readComboDefault, readPluginSettings, readPonytailDefault, readRtkDefault, saveComboSetup, } from '../shared/plugin-settings.js';
-import { findHoistedPackage, isPiProcess } from '../lib/utils.js';
+import { isComboSetupComplete, readCavemanDefault, readComboDefault, readPluginSettings, readPonytailDefault, readPstackDefault, readRtkDefault, saveComboSetup, } from '../shared/plugin-settings.js';
+import { findHoistedPackage, isPiProcess, piAgentDir } from '../shared/utils.js';
 const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
+/** Whether pi declares an upstream Ponytail; read per call so a mid-session settings.json change lands. */
+function piHasUpstreamPonytail() {
+    const agentDir = piAgentDir();
+    const localEntry = path.join(agentDir, 'ponytail', 'pi-extension', 'index.js');
+    if (existsSync(localEntry))
+        return true;
+    try {
+        const raw = readFileSync(path.join(agentDir, 'settings.json'), 'utf8');
+        const settings = JSON.parse(raw);
+        const list = Array.isArray(settings.packages) ? settings.packages : [];
+        // An npm spec names the package; the installer's local copy is a bare `.../ponytail` dir.
+        return list.some((p) => typeof p === 'string' && /ponytail/.test(p));
+    }
+    catch {
+        return false;
+    }
+}
 const PONYTAIL_FALLBACK_INTENSITY = {
     lite: 'Prefer the simplest correct solution.',
 };
@@ -24,7 +41,7 @@ export function ponytailFallback(mode) {
     const intensity = PONYTAIL_FALLBACK_INTENSITY[mode] ?? 'Use the minimum correct solution. Delete or reuse before adding.';
     return `🦥 PONYTAIL MODE ACTIVE — level: ${mode}\n${intensity} Understand the path first and fix root causes, not symptoms. Prefer the standard library and YAGNI. Avoid speculative abstractions and dependencies. Preserve correctness. Verify changed behavior.`;
 }
-// Ponytail is hoisted, so one upward walk covers every install layout. The hook is CommonJS, so both namespace shapes are tried.
+// Ponytail is hoisted, so one upward walk covers every layout. The hook is CommonJS, so both namespaces are tried.
 async function loadPonytailInstructions(mode) {
     const installed = findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'hooks', 'ponytail-instructions.js');
     // The OpenCode tree ships no node_modules; the installer bundles the ruleset beside the extensions.
@@ -42,7 +59,7 @@ async function loadPonytailInstructions(mode) {
     return ponytailFallback(mode);
 }
 export default function comboToggleExtension(pi) {
-    setExtensionLabel(pi, 'Combo session toggle (all 3 add-ons)');
+    setExtensionLabel(pi, 'Combo session toggle (all four add-ons)');
     let setupPrompted = false;
     let lastInjected = undefined;
     // opencode has no UI event stream, so only its empty branch reconciles.
@@ -53,6 +70,7 @@ export default function comboToggleExtension(pi) {
         pi.appendEntry?.('caveman-mode', { mode: modes.caveman });
         pi.appendEntry?.('rtk-mode', { enabled: modes.rtk === 'on' });
         pi.appendEntry?.('ponytail-mode', { mode: modes.ponytail });
+        pi.appendEntry?.('pstack-mode', { mode: modes.pstack });
         pi.appendEntry?.('combo-level', { level });
     }
     function restoreConfiguredDefaults() {
@@ -60,16 +78,18 @@ export default function comboToggleExtension(pi) {
         const hasModeDefaults = ['cavemanDefault', 'rtkDefault', 'ponytailDefault'].some((key) => key in settings);
         const combo = readComboDefault();
         const preset = COMBO_LEVELS[combo];
+        // A stored per-mode default wins; with none, the preset supplies all four.
         const modes = hasModeDefaults
-            ? { caveman: readCavemanDefault(), rtk: readRtkDefault() ? 'on' : 'off', ponytail: readPonytailDefault() }
-            : preset;
+            ? { caveman: readCavemanDefault(), rtk: readRtkDefault() ? 'on' : 'off', ponytail: readPonytailDefault(), pstack: readPstackDefault() }
+            : { caveman: preset.caveman, rtk: preset.rtk, ponytail: preset.ponytail, pstack: preset.pstack };
         setSharedComboModes(modes);
-        if (modes.caveman === 'off' && modes.rtk === 'off' && modes.ponytail === 'off')
+        if (modes.caveman === 'off' && modes.rtk === 'off' && modes.ponytail === 'off' && modes.pstack === 'off')
             return;
         pi.appendEntry?.('caveman-mode', { mode: modes.caveman });
         pi.appendEntry?.('rtk-mode', { enabled: modes.rtk === 'on' });
         pi.appendEntry?.('ponytail-mode', { mode: modes.ponytail });
-        if (preset && modes.caveman === preset.caveman && modes.rtk === preset.rtk && modes.ponytail === preset.ponytail) {
+        pi.appendEntry?.('pstack-mode', { mode: modes.pstack });
+        if (preset && modes.caveman === preset.caveman && modes.rtk === preset.rtk && modes.ponytail === preset.ponytail && modes.pstack === preset.pstack) {
             pi.appendEntry?.('combo-level', { level: combo });
         }
     }
@@ -92,7 +112,7 @@ export default function comboToggleExtension(pi) {
             reconcile(ctx, resetEmpty);
     }
     pi.registerCommand?.('combo', {
-        description: 'Toggle all 3 Tersio modes at once. Usage: /combo <off|medium|balanced|max|status>',
+        description: 'Toggle all four Tersio modes at once. Usage: /combo <off|medium|balanced|max|status>',
         handler: async (args, ctx) => {
             listen(ctx);
             const arg = String(args || '').trim().toLowerCase();
@@ -102,10 +122,10 @@ export default function comboToggleExtension(pi) {
                 return;
             }
             if (arg === 'help') {
-                ctx?.ui?.notify?.('/combo off      — disables all 3 (caveman, rtk, ponytail)\n' +
-                    '/combo medium   — light: caveman=lite, rtk=on, ponytail=lite\n' +
-                    '/combo balanced — middle: caveman=full, rtk=on, ponytail=full\n' +
-                    '/combo max      — aggressive: caveman=ultra, rtk=on, ponytail=ultra', 'info');
+                ctx?.ui?.notify?.('/combo off      — disables every mode (caveman, rtk, ponytail, pstack)\n' +
+                    '/combo medium   — light: caveman=lite, rtk=on, ponytail=lite, pstack=on\n' +
+                    '/combo balanced — middle: caveman=full, rtk=on, ponytail=full, pstack=on\n' +
+                    '/combo max      — aggressive: caveman=ultra, rtk=on, ponytail=ultra, pstack=on', 'info');
                 return;
             }
             const level = normalizeComboLevel(arg);
@@ -118,15 +138,36 @@ export default function comboToggleExtension(pi) {
             announceStatus(ctx);
         },
     });
+    // Upstream owns /ponytail on pi; this tree registers it only where nothing else does.
+    if (!(isPiProcess() && piHasUpstreamPonytail()))
+        pi.registerCommand?.('ponytail', {
+            description: 'Switch Ponytail intensity (off|lite|full|ultra). Usage: /ponytail [level|status]',
+            handler: async (args, ctx) => {
+                listen(ctx);
+                const arg = String(args || '').trim().toLowerCase();
+                if (!arg || arg === 'status') {
+                    announceStatus(ctx);
+                    return;
+                }
+                const mode = normalizeMode('ponytail', arg);
+                if (!mode) {
+                    ctx?.ui?.notify?.(`Unknown Ponytail level: ${arg}. Use: off | lite | full | ultra`, 'warning');
+                    return;
+                }
+                pi.appendEntry?.('ponytail-mode', { mode });
+                setSharedComboMode('ponytail', mode);
+                announceStatus(ctx);
+            },
+        });
     async function runFirstRunSetup(ctx) {
         if (setupPrompted || !ctx?.hasUI || !ctx.ui?.select || isComboSetupComplete())
             return;
         setupPrompted = true;
         const choice = await hostSelect(pi, ctx.ui, 'Session-start defaults — Combo preset', [
             { label: 'off', description: 'Keep every Tersio mode inactive' },
-            { label: 'medium', description: 'caveman=lite, rtk=on, ponytail=lite' },
-            { label: 'balanced', description: 'caveman=full, rtk=on, ponytail=full' },
-            { label: 'max', description: 'caveman=ultra, rtk=on, ponytail=ultra' },
+            { label: 'medium', description: 'caveman=lite, rtk=on, ponytail=lite, pstack=on' },
+            { label: 'balanced', description: 'caveman=full, rtk=on, ponytail=full, pstack=on' },
+            { label: 'max', description: 'caveman=ultra, rtk=on, ponytail=ultra, pstack=on' },
         ], { selectionMarker: 'radio', helpText: 'You can change this later with /tersio settings.' });
         const level = choice || 'off';
         if (saveComboSetup(level) && level !== 'off') {
@@ -159,10 +200,10 @@ export default function comboToggleExtension(pi) {
         if (ctx?.hasUI)
             reconcile(ctx);
         const mode = getSharedComboState().ponytail;
-        // On pi the upstream ponytail pi-extension is the single injector; it reads these 'ponytail-mode' entries at session start, so Tersio only persists.
-        if (isPiProcess())
+        // On pi, an installed upstream pi-extension is the sole injector, so Tersio only falls back with none.
+        if (isPiProcess() && piHasUpstreamPonytail())
             return;
-        // Match the level's own header: the shared phrase alone makes every level block every other, so a `/combo` level switch is ignored all session.
+        // Match the level's own header: a shared phrase makes every level block the rest, so a `/combo` switch does nothing.
         if (mode === 'off' || systemPromptIncludes(event.systemPrompt, `PONYTAIL MODE ACTIVE — level: ${mode}`))
             return;
         const instruction = await loadPonytailInstructions(mode);

package/dist/extensions/{tersio-commands → commands}/index.js

@@ -5,7 +5,7 @@ import { setExtensionLabel } from '../shared/host.js';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.js';
-import { checkAddonsSummary, runAddonUpdate } from '../ai-addons-updater/index.js';
+import { checkAddonsSummary, runAddonUpdate } from '../updater/index.js';
 const HELP = [
     '/tersio status — active modes + combo level',
     '/tersio check — add-on version check',
@@ -80,7 +80,7 @@ export default function tersioCommandsExtension(pi) {
                 ctx?.ui?.notify?.(usageSummary(), 'info');
                 return;
             }
-            // Removed mode switches redirect to their own commands so only one spelling exists to learn: /caveman, /rtk, /combo, /ponytail.
+            // Removed mode switches redirect to their own commands, so there is one spelling: /caveman, /rtk, /combo, /ponytail.
             if (sub === 'caveman' || sub === 'rtk' || sub === 'combo' || sub === 'ponytail') {
                 ctx?.ui?.notify?.(`Use /${sub} instead — /tersio no longer duplicates mode switches.\n${HELP}`, 'warning');
                 return;