@krtclcdy/tersio 2.25.4 → 2.25.6

package/dist/probe-catalog188.js

@@ -0,0 +1,44 @@
+// Throwaway: the current omp catalog's real rates for the fifteen models in the screenshot.
+import { readFileSync } from "node:fs";
+const root = process.env.HOME + "/.bun/install/global/node_modules/@oh-my-pi/pi-catalog/src";
+const catalog = JSON.parse(readFileSync(root + "/models.json", "utf8"));
+const wanted = [
+    "space-bunny",
+    "muse-spark-1.3-contributor",
+    "glm-5.3-flash",
+    "qwen38-flash-next",
+    "muse-spark-1.2-contributor",
+    "qwen3.8-27b",
+    "m3",
+    "ox-alpha",
+    "deepseek-v4-flash",
+    "ling-3.0-flash-sante",
+    "qwen3.6-35b-a3b-fp8",
+    "mimo-v2.6-flash",
+    "deepseek-v4.1-flash",
+    "step-5-preview",
+    "ling-3.1-flash",
+    "longcat-2.5-preview",
+];
+const hits = new Map();
+for (const [provider, models] of Object.entries(catalog)) {
+    if (!models || typeof models !== "object")
+        continue;
+    for (const [id, row] of Object.entries(models)) {
+        const bare = id.toLowerCase().split("/").pop();
+        if (!wanted.includes(bare))
+            continue;
+        const list = hits.get(bare) ?? [];
+        list.push({ key: provider + "/" + id, cost: row.cost, status: row.pricingStatus });
+        hits.set(bare, list);
+    }
+}
+for (const w of wanted) {
+    const list = hits.get(w) ?? [];
+    console.log("\n" + w.toUpperCase() + (list.length === 0 ? "  -- NOT IN CATALOG --" : "  -- " + list.length + " rows --"));
+    for (const h of list) {
+        const c = h.cost;
+        const zero = c && c.input === 0 && c.output === 0 && c.cacheRead === 0 && c.cacheWrite === 0;
+        console.log("   " + h.key.padEnd(50) + (zero ? "FREE ($0)" : "in=" + c?.input + " out=" + c?.output) + " status=" + JSON.stringify(h.status));
+    }
+}

package/dist/tersio.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 // Install Tersio add-ons on any OMP device; see help for commands.
-import { PACKAGE_BIN, PACKAGE_VERSION, applyUpdate, commandArg, dashboard, dashboardExport, dashboardOpen, dashboardPort, doctor, reset, settings, showHelp, showVersion, uninstall, unknownCommand, update, usage, } from './cli/common.js';
+import { PACKAGE_BIN, PACKAGE_VERSION, applyUpdate, commandArg, dashboard, dashboardExport, dashboardOpen, dashboardPort, doctor, reinstall, reset, settings, showHelp, showVersion, uninstall, unknownCommand, update, usage, currency, } from './cli/common.js';
 import { closeRL } from './cli/interactive.js';
-import { runInstall } from './cli/install.js';
+import { runInstall, runReinstall } from './cli/install.js';
 import { runDoctor } from './cli/doctor.js';
 import { runLatestUpdate } from './cli/update.js';
 import { runUninstall } from './cli/uninstall.js';
@@ -15,6 +15,7 @@ function printHelp() {
 
 Commands:
   install      Install the add-ons for one agent (--host omp|pi|opencode, or ask at a terminal)
+  reinstall    Refresh one agent's install: pick it, reinstall, then verify (--host picks without asking)
   update       Refresh the CLI and add-ons (RTK binary, Caveman rule, Ponytail; --host limits to one agent)
   doctor       Check the current installation (--fix repairs, --dry-run previews)
   usage        Ledger-backed usage + savings report
@@ -26,7 +27,7 @@ Commands:
   help         Show this help
 
 Options:
-  --fix (doctor: repairs all; --fix=<scope> repairs one of extensions, registrations, rtk, ponytail, cli)
+  --fix (doctor: repairs all; --fix=<scope> repairs one of extensions, registrations, rtk, ponytail, cli, service)
   --scope user (legacy; accepted and ignored — user scope is the only scope)
   --host omp|pi|opencode (install|uninstall|update: target agent; a terminal asks instead)
   --keep-ponytail (uninstall: keep the bundled Ponytail copy — removed by default)
@@ -79,7 +80,7 @@ async function main() {
         return;
     }
     if (dashboard) {
-        await runDashboard({ port: dashboardPort, open: dashboardOpen, exportFile: dashboardExport });
+        await runDashboard({ port: dashboardPort, open: dashboardOpen, exportFile: dashboardExport, currency });
         closeRL();
         return;
     }
@@ -97,6 +98,10 @@ async function main() {
         closeRL();
         return;
     }
+    if (reinstall) {
+        await runReinstall();
+        return;
+    }
     await runInstall();
 }
 main().catch((e) => { closeRL(); console.error(e); process.exitCode = 1; });

package/extensions/{caveman-session → caveman}/index.ts

@@ -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.ts';
 import { dirname, join } from 'node:path';
 import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.ts';
-import { announceStatus } from '../shared/status.ts';
+import { announceStatus, formatCavemanStatus } from '../shared/status.ts';
 import { readCavemanDefault } from '../shared/plugin-settings.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
@@ -71,6 +71,8 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
       }
       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)) {
@@ -88,7 +90,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     const entries = sessionEntries(ctx);
     // 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/{dist/extensions/caveman-session → 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/{dist/extensions/caveman-session → 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/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/extensions/{combo-toggle → combo}/index.ts

@@ -1,7 +1,7 @@
 // /combo session toggle: off | medium | balanced | max.
 
 import path from 'node:path';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import {
   activeModesSummary,
@@ -9,10 +9,12 @@ import {
   getSharedComboState,
   hasModeState,
   normalizeComboLevel,
+  normalizeMode,
   reconcileSharedComboEntries,
   sessionEntries,
   setSharedComboLevel,
   setSharedComboListener,
+  setSharedComboMode,
   setSharedComboModes,
   systemPromptIncludes,
 } from '../shared/session-state.ts';
@@ -24,14 +26,31 @@ import {
   readComboDefault,
   readPluginSettings,
   readPonytailDefault,
+  readPstackDefault,
   readRtkDefault,
   saveComboSetup,
 } from '../shared/plugin-settings.ts';
-import { findHoistedPackage, isPiProcess } from '../lib/utils.ts';
+import { findHoistedPackage, isPiProcess, piAgentDir } from '../shared/utils.ts';
 import type { ComboState, ExtensionApi, ExtensionCtx, SystemPromptEvent } from '../shared/types.ts';
 
 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(): boolean {
+  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) as { packages?: unknown };
+    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: Record<string, string> = {
   lite: 'Prefer the simplest correct solution.',
 };
@@ -43,7 +62,7 @@ export function ponytailFallback(mode: string): string {
 }
 
 
-// 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: string): Promise<string> {
   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.
@@ -63,7 +82,7 @@ async function loadPonytailInstructions(mode: string): Promise<string> {
 }
 
 export default function comboToggleExtension(pi: ExtensionApi): void {
-  setExtensionLabel(pi, 'Combo session toggle (all 3 add-ons)');
+  setExtensionLabel(pi, 'Combo session toggle (all four add-ons)');
 
   let setupPrompted = false;
   let lastInjected: string | undefined = undefined;
@@ -76,6 +95,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     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(): void {
@@ -83,15 +103,17 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     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') return;
+    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 });
     }
   }
@@ -113,7 +135,7 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
   }
 
   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();
@@ -126,10 +148,10 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
 
       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',
+          '/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;
@@ -150,14 +172,35 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     },
   });
 
+  // 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?: ExtensionCtx): Promise<void> {
     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') {
@@ -189,9 +232,9 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
   pi.on<SystemPromptEvent>('before_agent_start', async (event, ctx) => {
     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()) 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.
+    // 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: 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);
     // The previous level's block is replaced, not stacked on.

package/extensions/{tersio-commands → commands}/index.ts

@@ -9,7 +9,7 @@ import { setExtensionLabel } from '../shared/host.ts';
 import os from 'node:os';
 import path from 'node:path';
 import { appendUsage, readUsage } from '../shared/usage-ledger.ts';
-import { checkAddonsSummary, runAddonUpdate } from '../ai-addons-updater/index.ts';
+import { checkAddonsSummary, runAddonUpdate } from '../updater/index.ts';
 import type { ExtensionApi, ExtensionCtx } from '../shared/types.ts';
 
 const HELP = [
@@ -88,7 +88,7 @@ export default function tersioCommandsExtension(pi: ExtensionApi): void {
         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;

package/extensions/pstack/index.ts

@@ -0,0 +1,128 @@
+// /pstack session mode: injects the pstack rigor body. Every preset above off turns it on.
+
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { getSharedComboState, hasModeState, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, systemPromptIncludes } from '../shared/session-state.ts';
+import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.ts';
+import { announceStatus } from '../shared/status.ts';
+import { readPstackDefault } from '../shared/plugin-settings.ts';
+import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
+
+const PSTACK_DIR = dirname(fileURLToPath(import.meta.url));
+const RULE_FILE = 'rule.md';
+const DEFAULT_MODE = 'off';
+
+// The body is immutable for the process, so read it once; reinstalling needs a restart.
+let cachedInstruction: string | undefined;
+
+function buildInstruction(): string {
+  if (cachedInstruction) return cachedInstruction;
+  // Fail loud: a missing body would otherwise read to the model as an active mode.
+  let body: string;
+  try { body = readFileSync(join(PSTACK_DIR, RULE_FILE), 'utf8'); } catch {
+    return `pstack mode requested, but ${RULE_FILE} is missing. Run: tersio doctor --fix extensions`;
+  }
+  cachedInstruction = `pstack mode active for this session.\n${body}`;
+  return cachedInstruction;
+}
+
+function resolveMode(entries: SessionEntry[] | null | undefined, fallback: string = DEFAULT_MODE): string {
+  return lastCustomValue(entries, 'pstack-mode', (data) => normalizeMode('pstack', data?.mode)) ?? fallback;
+}
+
+// The shared off phrase; every mode honours it, so one word clears the session.
+function isOffCommand(text: unknown): boolean {
+  return normalizeInputCommand(text) === 'normal mode';
+}
+
+export default function pstackSessionExtension(pi: ExtensionApi): void {
+  let currentMode = DEFAULT_MODE;
+  let lastInjected: string | undefined = undefined;
+
+  function setMode(mode: string, ctx?: ExtensionCtx): boolean {
+    const normalized = normalizeMode('pstack', mode);
+    if (!normalized) return false;
+    currentMode = normalized;
+    pi.appendEntry?.('pstack-mode', { mode: normalized });
+    setSharedComboMode('pstack', normalized);
+    announceStatus(ctx);
+    return true;
+  }
+
+  setExtensionLabel(pi, 'pstack rigor mode');
+
+  // Adopt a /tersio or /combo switch at once, so the next turn needs no reload.
+  function syncFromShared(state: { pstack: string }): void {
+    const mode = normalizeMode('pstack', state.pstack);
+    if (mode) currentMode = mode;
+  }
+  setSharedComboListener('pstack', syncFromShared);
+
+  pi.registerCommand?.('pstack', {
+    description: 'Toggle the pstack rigor mode for this session',
+    handler: async (args, ctx) => {
+      const arg = String(args || '').trim().toLowerCase();
+      if (!arg || arg === 'on') {
+        setMode('on', ctx);
+        return;
+      }
+      if (arg === 'status') {
+        announceStatus(ctx);
+        return;
+      }
+      if (!setMode(arg, ctx)) {
+        ctx?.ui?.notify?.('Usage: /pstack [on|off|status]', 'warning');
+      }
+    },
+  });
+
+  onHostEvent<InputEvent>(pi, 'input', async (event) => {
+    if (event?.source === 'extension') return;
+    if (currentMode !== 'off' && isOffCommand(event?.text)) setMode('off');
+  });
+
+  function restoreMode(ctx?: ExtensionCtx): void {
+    const entries = sessionEntries(ctx);
+    // 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, then the configured default. `off` is the start value, not unset.
+    const persisted = resolveMode(entries, '');
+    const alreadyChosen = currentMode !== DEFAULT_MODE;
+    currentMode = persisted || (alreadyChosen ? currentMode : normalizeMode('pstack', readPstackDefault())) || DEFAULT_MODE;
+    announceStatus(ctx);
+  }
+
+  // Start, resume, and branch all land here, so every session type shows it.
+  pi.on('session_start', async (_event, ctx) => {
+    restoreMode(ctx);
+  });
+
+  onHostEvent(pi, 'session_branch', async (_event, ctx) => {
+    restoreMode(ctx);
+  });
+
+  pi.on('session_tree', async (_event, ctx) => {
+    restoreMode(ctx);
+  });
+
+  onHostEvent(pi, 'session_switch', async (_event, ctx) => {
+    restoreMode(ctx);
+  });
+
+  onHostEvent(pi, 'session_compact', async (_event, ctx) => {
+    restoreMode(ctx);
+  });
+
+  pi.on('before_agent_start', async (event: SystemPromptEvent) => {
+    const mode = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().pstack : currentMode;
+    if (!mode || mode === 'off') return;
+    const instruction = buildInstruction();
+    // Match the whole instruction, so a re-presented prompt cannot stack it.
+    if (systemPromptIncludes(event.systemPrompt, instruction)) return;
+    // The previous block is replaced, not stacked on.
+    const stale = lastInjected;
+    lastInjected = instruction;
+    return injectPromptText(pi, event, { text: instruction, staleMarker: stale, sectionTag: 'pstack' });
+  });
+}