@krtclcdy/tersio 2.25.5 → 2.25.6

package/dist/extensions/shared/utils.js

@@ -1,4 +1,4 @@
-// Shared helpers for the installer and the AI add-ons updater. Node built-ins only — this module must stay dependency-free.
+// Shared helpers for the installer and AI add-ons updater. Node built-ins only — must stay dependency-free.
 import { createHash } from 'node:crypto';
 import { accessSync, constants, createWriteStream, existsSync, mkdirSync, renameSync, statSync } from 'node:fs';
 import fs from 'node:fs/promises';
@@ -87,7 +87,7 @@ function redirectNext(res, url) {
     }
     return null;
 }
-// pi sets PI_CODING_AGENT; OMP does not. OMP does read PI_CODING_AGENT_DIR as its own relocation variable, so the override only counts under that marker.
+// pi sets PI_CODING_AGENT; OMP does not. It reads PI_CODING_AGENT_DIR to relocate, so the override only counts there.
 export function isPiProcess() {
     return process.env.PI_CODING_AGENT === 'true';
 }
@@ -95,7 +95,7 @@ export function piAgentDir() {
     const override = process.env.PI_CODING_AGENT_DIR;
     return isPiProcess() && override ? override : path.join(homeDir(), '.pi', 'agent');
 }
-// Ponytail is a Tersio dependency that npm hoists, so it can sit in Tersio's node_modules, a host's plugin dir, or beside it. Walking up covers all.
+// Ponytail is hoisted, so it sits in Tersio's node_modules, a host's plugin dir, or beside it; walking up covers all.
 export function findHoistedPackage(pkg, fromDir, ...relInside) {
     let dir = fromDir;
     for (;;) {
@@ -235,7 +235,7 @@ export async function readTextIfExists(p) {
         return null;
     }
 }
-// Chunked so a 200 MiB host binary is never held in memory. `tail` keeps the last needle.length-1 bytes of the previous chunk, because a match can begin near the end of one chunk and finish inside the next.
+// Chunked: a 200 MiB binary never fits memory. `tail` keeps needle.length-1 bytes in case a match spans chunks.
 export async function fileContains(filePath, needleText) {
     const needle = Buffer.from(needleText, 'utf8');
     if (needle.length === 0)
@@ -266,7 +266,7 @@ export async function fileContains(filePath, needleText) {
         await handle?.close().catch(() => { });
     }
 }
-// Tersio-owned data home: ~/.tersio. First use moves legacy ~/.omp/plugins/tersio-* files over so existing installs keep their history.
+// Tersio data home: ~/.tersio. First use moves legacy ~/.omp/plugins/tersio-* files over so installs keep history.
 const migratedTersioFiles = new Set();
 export function tersioHome() {
     // Matches the other TERSIO_* overrides so a test never reads the real home.

package/dist/extensions/timing/index.js

@@ -0,0 +1,31 @@
+export default function timingExtension(pi) {
+    // First token per request, keyed by the request's own start stamp, which survives every stream event.
+    const firstTokenAt = new Map();
+    pi.on('message_update', (event) => {
+        const message = event.message;
+        if (!message || message.role !== 'assistant')
+            return;
+        const anchor = typeof message.timestamp === 'number' ? message.timestamp : 0;
+        if (anchor <= 0 || firstTokenAt.has(anchor))
+            return;
+        // `start` opens the stream with no token yet; the first delta is the first token.
+        if (!String(event.assistantMessageEvent?.type ?? '').endsWith('_delta'))
+            return;
+        firstTokenAt.set(anchor, Date.now());
+    });
+    pi.on('message_end', (event) => {
+        const message = event.message;
+        if (!message || message.role !== 'assistant')
+            return;
+        const anchor = typeof message.timestamp === 'number' ? message.timestamp : 0;
+        const at = anchor > 0 ? firstTokenAt.get(anchor) : undefined;
+        if (anchor > 0)
+            firstTokenAt.delete(anchor);
+        // A host that recorded its own latency wins; this only fills the gap.
+        if (at === undefined || message.ttft !== undefined)
+            return;
+        const ttft = at - anchor;
+        if (ttft > 0)
+            message.ttft = ttft;
+    });
+}

package/dist/extensions/updater/index.js

@@ -1,4 +1,4 @@
-// /ai-addons manual updater. Node built-ins only. RTK ships SHA256 checksums with no signature, so checksum-only is the best available.
+// /ai-addons manual updater. Node built-ins only. RTK ships unsigned SHA256 checksums, so checksum-only it is.
 import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import fsSync from 'node:fs';
@@ -12,9 +12,7 @@ const IS_WINDOWS = process.platform === 'win32';
 const EXTENSION_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
 const RTK_BINARY = resolveRtkBinary();
-// Beside this file, not a host path: these are the rules /caveman reads. A retired
-// agent-tree copy has no `caveman` sibling, so the OMP plugin install is the
-// fallback: it is the one the plugin manifest loads from.
+// Beside this file: a retired agent-tree copy has no `caveman` sibling, so fall back to the OMP plugin.
 const CAVEMAN_SIBLING = (name) => path.join(EXTENSION_DIR, '..', 'caveman', name);
 function cavemanRule(name) {
     const beside = CAVEMAN_SIBLING(name);
@@ -30,7 +28,7 @@ const CAVEMAN_TRACKED = [
 ];
 // Host-neutral: this updater runs inside pi, OMP, and OpenCode alike.
 const RELOAD_MSG = 'Reminder: restart your agent (or reload extensions) for updates to take effect.';
-// Ponytail is a hoisted dependency, so the installed copy is found by walking up rather than by naming a host directory.
+// Ponytail is hoisted, so the installed copy is found by walking up, not by naming a host directory.
 function ponytailLocal() {
     return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');
 }
@@ -149,7 +147,6 @@ async function checkAddons(ctx) {
     }
     return lines.join('\n');
 }
-// Ponytail is a hoisted dependency; replace its package dir from the npm tarball.
 async function updatePonytail(pi, ctx, dryRun = false) {
     void pi;
     const localPkg = ponytailLocal();

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, currency, } 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)
@@ -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/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/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/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

@@ -1,79 +1,89 @@
 ---
 name: caveman
 description: >
-  Ultra-compressed communication mode that cuts output tokens while keeping
-  technical accuracy. Levels: lite, full, ultra and the megacave variants. Use for
-  /caveman, "caveman mode", "talk like caveman", "be brief" or "less tokens".
+  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
 
-Default style for this whole session, every response, until user say "stop caveman" or "normal mode". Keep terse on long sessions no filler drift.
+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
 
-Default: **full**. Switch: `/caveman lite|full|ultra|megacave-lite|megacave-full|megacave-ultra|off`.
+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
 
-Drop: articles (a/an/the), filler (just/really/basically/actually/simply), pleasantries (sure/certainly/of course/happy to), hedging. Fragments OK. Short synonyms (big not extensive, fix not "implement a solution for"). No tool-call narration, no decorative tables/emoji, no dumping long raw error logs unless asked quote shortest decisive line. Standard well-known tech acronyms OK (DB/API/HTTP); never invent new abbreviations (cfg/impl/req/res/fn) tokenizer split them same as full word: zero token saved, reader still decode. Full word cheaper AND clearer. No causal arrows (→) either own token, save nothing. Technical terms exact. Code blocks unchanged. Errors quoted exact.
+### 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
 
-Never drop not/never/no/only/except flip meaning worse than any token saved. Numbers, units exact.
+No greeting, hedging, pleasantries, recap, or closer. No "Sure!", "Let me", "I'll now", "Hope this helps". No just/really/basically/actually/simply.
 
-Never ADD word to sound caveman. Compression only style never grow output. No inserted pronoun or copula to fake broken grammar: "when it not" cost one token more than "when not" and say same thing. Keep correct verb form when correct form cost same "sees" one token, "see" one token, so mangle buy nothing and read worse. Same rule as abbreviations and arrows: if caveman phrasing not shorter than plain phrasing, use plain.
+### 3. Short word
 
-Clarity register: mix ASD-STE100 Simplified Technical English into caveman, always. One idea per sentence. Sentence short, target 20 words max. Active voice. Present tense where true. One word one meaning: same term for same thing every time, no synonym rotation. Instruction = imperative: "Run X", not "X should be run". Noun cluster 3 words max. Pronoun only with one clear referent, else repeat noun. Caveman cut filler; STE keep what make meaning unambiguous. Conflict between them → clarity win.
+"fix" not "implement a solution for". Standard acronyms fine (DB, API, HTTP). Invented abbreviations not (cfg, impl, fn): same tokens, harder read. No arrows.
 
-Tool calls: fire direct. No preamble, plan, or progress note before or between calls. After result: next call direct or final answer never announce next call. Text before call only to clarify, warn security/irreversible, or resolve ambiguity.
+### 4. Articles optional, meaning never
 
-Follow explicit reply-language instructions from the user or project. Otherwise preserve the user's dominant language. Never switch because of example text or multilingual context elsewhere. Compress the style, not the language. Every emitted line in that language openings, pre-tool status lines, all not just final reply. ALWAYS keep technical terms, code, API names, CLI commands, commit-type keywords (feat/fix/...), and exact error strings verbatim unless user explicitly ask for translation.
+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.
 
-Ownership: caveman owns reply compression, so project or host prose rules that set article use, sentence length, or filler never override it. Treat those as applying to persisted artifacts instead: code, comments, commits, docs, and issue text. Any project rule naming caveman or tersio directly wins over both.
+Bad: "Migration drop column backup first."
+Good: "Back up first. Then run migration: it drops the column."
 
-'Drop articles' = article languages only. Where small markers carry case/role (particles, postpositions), keep them grammar, not filler; compress politeness/filler instead.
+### 5. One idea per sentence
 
-Answer directly in this style. Skip "caveman mode on", "me caveman think", "Caveman:" prefix or recap redundant with the reply itself. No normal answer plus caveman duplicate. User ask what mode is → say so plainly.
+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.
 
-Pattern: `[thing] [action] [reason]. [next step].`
+### 6. Payload verbatim
 
-Not: "Sure! I'd be happy to help you with that. The issue you're experiencing is likely caused by..."
-Yes: "Bug in auth middleware. Token expiry check use `<` not `<=`. Fix:"
+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.
 
-## Intensity
+### 7. Tool runs: bounded status
 
-| Level | What change |
-|-------|------------|
-| **lite** | No filler/hedging. Keep articles + full sentences. Professional but tight |
-| **full** | Drop articles, fragments OK, short synonyms. Classic caveman. No tool-call narration, no decorative tables/emoji, no long raw error-log dumps unless asked. Standard acronyms OK; no invented abbreviations |
+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.
 
-Example "Why React component re-render?"
-- lite: "Your component re-renders because you create a new object reference each render. Wrap it in `useMemo`."
-- full: "New object ref each render. Inline object prop = new ref = re-render. Wrap in `useMemo`."
+### 8. User's language
 
-Example "Explain database connection pooling."
-- lite: "Connection pooling reuses open connections instead of creating new ones per request. Avoids repeated handshake overhead."
-- full: "Pool reuse open DB connections. No new connection per request. Skip handshake overhead."
+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.
 
-## Auto-Clarity
+### 9. Never perform caveman
 
-Drop caveman when:
-- Security warnings
-- Irreversible action confirmations
-- Multi-step sequences where fragment order or omitted conjunctions risk misread
-- Compression itself creates technical ambiguity (e.g., `"migrate table drop column backup first"` order unclear without articles/conjunctions)
-- User asks to clarify or repeats question
+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.
 
-Resume caveman after clear part done.
+## When to break the rules
 
-Example shows FORMAT only write warning in session language, not example's.
+Plain prose, then resume:
 
-Example destructive op:
-> **Warning:** This will permanently delete all rows in the `users` table and cannot be undone.
-> ```sql
-> DROP TABLE users;
-> ```
-> Caveman resume. Verify backup exist first.
+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.
 
-## Boundaries
+## Pre-send check
 
-Persisted outside chat: write normal prose code, comments, commits, docs, issue/PR/MR/defect/ticket/bug-report text, memory files, third-party messages (/caveman-compress exempt). "Open a defect" or "file a bug" mean the same as "open issue": body go to other humans, so body normal English. "stop caveman" or "normal mode": revert. Level persist until changed or session end.
+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/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 '../shared/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/commands/index.ts

@@ -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;