@krtclcdy/tersio 2.25.5 → 2.25.7

package/extensions/shared/brand-marks.ts

@@ -1,10 +1,4 @@
-// Brand mark catalog: names, not bytes. One list serves both consumers — the dashboard draws from
-// it at runtime, and the CLI export inlines the same URLs so a single-file dashboard keeps its
-// logos with the network off. Simple Icons files are CC0-1.0; the marks stay their owners'
-// property and the dashboard uses them nominatively, to name the service that served a request.
-// A vendor with no Simple Icons entry keeps its owner-hosted mark, one with no hosted mark is
-// drawn inline (`dashboard/app/src/lib/marks/inline.ts`), and bumping `SIMPLE_ICONS` once moves
-// every Simple Icons entry with it.
+// Brand mark catalog: names not bytes; Simple Icons files are CC0-1.0, marks remain their owners'.
 const SIMPLE_ICONS = "https://cdn.jsdelivr.net/npm/simple-icons@16/icons";
 
 /** Slug to mark URL. Only slugs named here resolve to a mark; the rest get a monogram. */
@@ -34,6 +28,8 @@ export const REMOTE_MARKS: Readonly<Record<string, string>> = {
   // Owner-hosted, nominative use.
   groq: "https://groq.com/favicon.svg",
   poolside: "https://poolside.ai/favicon/favicon.svg",
+  // AWS owns Kiro; Wikimedia hosts its vector, as AWS serves only a 16x16 ICO that cannot grow into a tile.
+  amazonaws: "https://upload.wikimedia.org/wikipedia/commons/5/5c/AWS_Simple_Icons_AWS_Cloud.svg",
   cerebras:
     "https://cdn.sanity.io/images/e4qjo92p/production/e7a55ae5ab7e2c4fdfd4e66a51f628d1f2f44207-967x967.png?w=256&h=256&fit=max",
   inclusionai: "https://cdn-avatars.huggingface.co/v1/production/uploads/662e1f9da266499277937d33/fyKuazRifqiaIO34xrhhm.jpeg",
@@ -48,14 +44,18 @@ export const REMOTE_MARKS: Readonly<Record<string, string>> = {
   magpie: "https://usemagpie.ai/favicon.png",
   gmicloud: "https://gmicloud.ai/favicon.ico",
   charmhyper: "https://github.com/charmbracelet.png?size=80",
+  // WorkBuddy's own favicon, a hashed asset on the Tencent CDN its page serves.
+  workbuddy:
+    "https://download.codebuddy.ai/web/workbuddy/913b2390aae396c66b937bd9143ae5259306d7d7/assets/logo.svg",
+  // Trae's own favicon: a dark tile carrying its green mark, so the tile matches the artwork.
+  trae: "https://lf16-web-neutral.traecdn.ai/obj/trae-ai-static/trae_website/favicon.png",
+  // Kiro's own icon, a purple tile with the mark drawn inside it.
+  kiro: "https://kiro.dev/icon.svg",
+  // Meituan's own icon: its yellow tile with the logotype.
+  meituan: "https://s3plus.meituan.net/v1/mss_e2821d7f0cfe4ac1bf9202ecf9590e67/cdn-prod/file:1040877d/favicon-mt.ico",
 };
 
-/**
- * Tile fill, not text. A mark whose tile carries its brand color reads as the brand, and a mark
- * whose logo already fills its own box never shows the fill. Values come from the brand (the
- * service's own page or its own asset), never from a guess; a slug absent here keeps the plain
- * panel and the theme ink.
- */
+/** Tile fill per slug from the brand's own page, never a guess; an absent slug keeps the plain panel. */
 export const MARK_BG: Readonly<Record<string, string>> = {
   // Simple Icons marks: the vendor's brand color, taken from its own brand page.
   anthropic: "#d97757",
@@ -80,8 +80,7 @@ export const MARK_BG: Readonly<Record<string, string>> = {
   instagram: "#e4405f",
   reddit: "#ff4500",
   linkedin: "#0a66c2",
-  // Owner-hosted marks: the tile matches the asset's own square, and a slug whose artwork already
-  // carries its own color takes a white tile so the art reads.
+  // Owner-hosted marks match the asset's own square; art that already carries color takes a white tile.
   groq: "#f43e01",
   poolside: "#4137ff",
   cerebras: "#ffffff",
@@ -90,18 +89,22 @@ export const MARK_BG: Readonly<Record<string, string>> = {
   stepfun: "#ffffff",
   kilo: "#f7f576",
   opencode: "#131010",
+  // The AWS cloud mark draws its own orange and its own white, so the tile stays plain white.
+  amazonaws: "#ffffff",
   // The mark's own artwork is white, so the tile is white and the glyph is black.
   openai: "#ffffff",
   commandcode: "#ffffff",
   gmicloud: "#ffffff",
   magpie: "#0b0b0c",
+  // WorkBuddy's mark is a full-bleed teal tile carrying its own white art.
+  workbuddy: "#01c886",
+  // The mark is a full-bleed tile, so the tile fill repeats the artwork's own background.
+  trae: "#000000",
+  kiro: "#9046ff",
+  meituan: "#ffd100",
 };
 
-/**
- * Glyph scale per slug, applied to the glyph box the tile clips. Simple Icons art fills its 24 box
- * by very different amounts, so the measured ink box decides the scale: a logo that runs to its
- * box edge shrinks and one with an invisible margin grows. One is the default.
- */
+/** Glyph scale per slug over the tile clip; the measured ink box decides, and one is the default. */
 export const MARK_SCALE: Readonly<Record<string, number>> = {
   kimi: 0.72,
   zdotai: 0.72,
@@ -119,21 +122,12 @@ export function luminance(hex: string): number {
   return 0.2126 * ch[0] + 0.7152 * ch[1] + 0.0722 * ch[2];
 }
 
-/**
- * The glyph color that stays legible on a tile fill. The cut sits at 0.35, which keeps white ink
- * on a brand color: Meta blue, DeepSeek blue, Xiaomi orange, Mistral orange, and Kimi blue all
- * carry a white logo, which is how their own brand sheets print them. Only a light neutral takes
- * black: Kilo yellow, StepFun teal, and Lightbend orange.
- */
+/** The ink legible on a tile fill: luminance above 0.35 takes black, else white. */
 export function contrastInk(hex: string): string {
   return luminance(hex) > 0.35 ? "#000000" : "#ffffff";
 }
 
-/**
- * Marks that carry their own color or their own background. Everything else is opaque black, so
- * it draws as an alpha mask filled with the chosen ink instead of an image. A slug whose asset is
- * a filled tile must draw as an image, or the mask paints one flat block and the logo vanishes.
- */
+/** Marks carrying their own color or background; a filled-tile asset must draw as an image, not a mask. */
 export const COLORED_MARKS: ReadonlySet<string> = new Set([
   "cerebras",
   "inclusionai",
@@ -144,12 +138,18 @@ export const COLORED_MARKS: ReadonlySet<string> = new Set([
   "magpie",
   "charmhyper",
   "stepfun",
-  // The ICO and the two inline PNGs are dark tiles with light art drawn inside them. The Groq
-  // favicon is one flat orange, so it draws as a mask instead: a masked glyph on a Groq-orange
-  // tile is a logo, and the same art as an image on the same orange tile is a blank tile.
+  // The ICO and inline PNGs are dark tiles with light art; flat-orange Groq draws as a mask instead.
   "gmicloud",
   "stealth",
   "cognition",
+  // A full-bleed teal tile with its own white art, so a mask would flatten both into one ink.
+  "workbuddy",
+  // Each is a full-bleed brand tile with its own ink, so a mask would flatten both into one color.
+  "trae",
+  "kiro",
+  "meituan",
+  // Carries its own orange and its own white, so a mask would flatten both into one ink.
+  "amazonaws",
 ]);
 
 /** The URL a mark comes from, or null when the name has no hosted mark. */

package/extensions/shared/carbon.ts

@@ -44,7 +44,7 @@ interface RegistryEntry {
   source: 'registry' | 'borrowed';
 }
 
-// Registry values verbatim from EcoLogits' model_repository; borrows cite the public param disclosure they stand in for (MoE active/total).
+// Verbatim from EcoLogits' model_repository; borrows cite the param disclosure they replace (MoE active/total).
 const TABLE: RegistryEntry[] = [
   { match: 'opus', active: 625.0, total: 2000, provider: 'anthropic', source: 'registry' },
   { match: 'sonnet', active: 137.5, total: 440, provider: 'anthropic', source: 'registry' },

package/extensions/shared/plugin-settings.ts

@@ -11,7 +11,7 @@ export function tersioSettingsFile(): string {
   return path.join(tersioHome(), 'settings.json');
 }
 
-// Older installs kept these as OMP plugin settings; still read so switching the store does not reset a user's defaults.
+// Older installs kept these as OMP plugin settings; still read so switching stores does not reset a user's defaults.
 function legacyOmpSettings(): Record<string, unknown> | null {
   const configHome = process.env.XDG_CONFIG_HOME || path.join(homeDir(), '.config');
   for (const p of [
@@ -39,7 +39,7 @@ function readSettingsFile(): Record<string, unknown> | null {
   }
 }
 
-// The stored settings; empty when the file is missing, corrupt, or empty.
+// The stored settings; {} when the file is missing or corrupt.
 export function readPluginSettings(): Record<string, unknown> {
   return readSettingsFile() ?? legacyOmpSettings() ?? {};
 }
@@ -47,6 +47,8 @@ export function readPluginSettings(): Record<string, unknown> {
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
 const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'megacave', 'megacave-lite', 'megacave-full', 'megacave-ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
 const PONYTAIL_MODES = new Set(['off', 'lite', 'full', 'ultra']);
+// Opt-in only: no combo preset writes this, so it never reaches a user who did not ask for it.
+const PSTACK_MODES = new Set(['off', 'on']);
 
 function readStringDefault(key: string, valid: Set<string>): string {
   const raw = readPluginSettings()[key];
@@ -70,15 +72,19 @@ export function readPonytailDefault(): string {
   return readStringDefault('ponytailDefault', PONYTAIL_MODES);
 }
 
+export function readPstackDefault(): string {
+  return readStringDefault('pstackDefault', PSTACK_MODES);
+}
+
 export function isComboSetupComplete(): boolean {
   return readPluginSettings().comboSetupComplete === true;
 }
 
 const COMBO_MODE_DEFAULTS = {
-  off: { cavemanDefault: 'off', rtkDefault: false, ponytailDefault: 'off' },
-  medium: { cavemanDefault: 'lite', rtkDefault: true, ponytailDefault: 'lite' },
-  balanced: { cavemanDefault: 'full', rtkDefault: true, ponytailDefault: 'full' },
-  max: { cavemanDefault: 'ultra', rtkDefault: true, ponytailDefault: 'ultra' },
+  off: { cavemanDefault: 'off', rtkDefault: false, ponytailDefault: 'off', pstackDefault: 'off' },
+  medium: { cavemanDefault: 'lite', rtkDefault: true, ponytailDefault: 'lite', pstackDefault: 'on' },
+  balanced: { cavemanDefault: 'full', rtkDefault: true, ponytailDefault: 'full', pstackDefault: 'on' },
+  max: { cavemanDefault: 'ultra', rtkDefault: true, ponytailDefault: 'ultra', pstackDefault: 'on' },
 } as const;
 
 export function saveComboSetup(level: string): boolean {

package/extensions/shared/pricing.ts

@@ -1,4 +1,4 @@
-// extensions/shared/pricing.ts — dynamic model pricing from LiteLLM. Exact id → provider-prefix strip → default, reported with known:false when unpriced.
+// pricing.ts — model pricing from LiteLLM. Exact id → prefix strip → default, known:false if unpriced.
 import fs from 'node:fs';
 import path from 'node:path';
 import { tersioDataPath } from './utils.ts';
@@ -13,18 +13,10 @@ export interface ModelPrice {
 // Sonnet-class default for unpriced models; always paired with known:false.
 export const DEFAULT_PRICE: ModelPrice = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 };
 
-/**
- * How a price was found, strongest first. `tail` and `default` are estimates.
- *
- * - `measured`: the host reported it. The only tier that can be zero without being a guess.
- * - `override`: the operator's `prices.local.json`, exact for the gateway it names.
- * - `exact`: the feed holds the id verbatim, or case-folded. `alias`: via `MODEL_ALIASES`.
- * - `tail`: the feed holds the bare name under some provider, which need not be the one billed.
- * - `default`: no match. `DEFAULT_PRICE`, an estimate by definition.
- */
+/** How a price was found, strongest first; `tail` and `default` are estimates. */
 export type PriceTier = 'measured' | 'override' | 'exact' | 'alias' | 'tail' | 'default';
 
-/** Tiers firm enough to call a price. `tail` and `default` are estimates, so they are not. */
+/** Tiers firm enough to call a price; `tail` and `default` are estimates. */
 export const PRICE_TIERS_FIRM: readonly PriceTier[] = ['measured', 'override', 'exact', 'alias'];
 
 export interface PriceHit {
@@ -35,7 +27,7 @@ export interface PriceHit {
 }
 
 const LITELLM_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
-// Readers use the file even when stale, and only one refresh runs per process; `tersio update` still forces a fresh fetch.
+// Readers use the file even when stale; one refresh per process. `tersio update` still forces a fresh fetch.
 const CACHE_TTL_MS = 7 * 24 * 3600 * 1000;
 let refreshInflight: Promise<boolean> | null = null;
 
@@ -45,11 +37,7 @@ export function pricesCachePath(): string {
   return tersioDataPath('prices.json', 'tersio-prices.json');
 }
 
-/**
- * The operator's own prices, merged over the feed and keyed exactly as the transcript spells a
- * model. A `*` prefix matches any gateway suffix. This is where a model the feed keys under a
- * different provider gets a real price.
- */
+/** Operator prices keyed as the transcript spells a model; a `*` prefix matches any gateway suffix. */
 export function pricesOverridePath(): string {
   const override = process.env.TERSIO_PRICES_OVERRIDE_FILE;
   if (override) return override;
@@ -79,7 +67,6 @@ function loadOverrides(stamp = overrideStamp()): { exact: Map<string, ModelPrice
     for (const [id, row] of Object.entries(parsed ?? {})) {
       const price = asPrice(row);
       if (!price) continue;
-      // A `*` prefix matches any gateway prefix, so one entry covers every spelling of a model.
       if (id.startsWith('*')) tails.push([id.slice(1).toLowerCase(), price]);
       else exact.set(id, price);
     }
@@ -94,7 +81,7 @@ export function pricesUrl(): string {
 
 export interface LivePrices {
   fetchedAt: number;
-  // Compact tuples [input, output, cacheRead, cacheWrite] per LiteLLM id — the full feed caches to ~1MB instead of multi-MB objects.
+  // Tuples [input, output, cacheRead, cacheWrite] per LiteLLM id — the full feed caches to ~1MB, not multi-MB objects.
   exact: Record<string, [number, number, number, number]>;
   deprecated?: string[];
 }
@@ -192,7 +179,7 @@ export function priceFor(model: string, live?: LivePrices | null): PriceHit {
   return resolvePrice(model, table, overrideStamp());
 }
 
-// Recent rows repeat a handful of models; the memo turns thousands of lookups into one per model. Cleared whenever the table identity changes.
+// Recent rows repeat a few models; the memo turns thousands of lookups into one per model. Cleared on table change.
 let memoTable: LivePrices | null | undefined;
 let memoStamp = 0;
 let memo = new Map<string, PriceHit>();
@@ -227,21 +214,18 @@ function resolvePrice(model: string, table: LivePrices | null, stamp = overrideS
     }
   }
 
-  // An alias goes through the same chain as any other id, so it still resolves when the feed keys
-  // it under a provider prefix.
+  // An alias runs the same chain, so it still resolves when the feed keys it under a provider prefix.
   const alias = MODEL_ALIASES.find((a) => a.id === model.toLowerCase());
   const id = alias?.feed ?? model;
   if (table) {
     const entries = priceEntries(table);
-    // 1. The id verbatim, then case-folded. Nothing is being guessed here.
+    // The id verbatim, then case-folded; nothing guessed.
     const hit = entries.find(([k]) => k === id) ?? entries.find(([k]) => k === id.toLowerCase());
     if (hit) return { price: hit[1], known: true, live: true, tier: alias ? 'alias' : 'exact' };
 
     const lower = id.toLowerCase();
     const tail = lower.split('/').pop() ?? lower;
-    // The bare model name under any provider, which need not be the provider that billed the row.
-    // Reported as tier `tail`, so a caller keeps it out of a firm total; `prices.local.json` fixes
-    // a specific case.
+    // Bare name under any provider (need not be the billing one); tier `tail` keeps it out of a firm total.
     const bare = entries.find(([k]) => {
       const lk = k.toLowerCase();
       return lk === tail || lk.endsWith(`/${tail}`);

package/extensions/shared/rtk-eligible.ts

@@ -0,0 +1,83 @@
+// Eligible command heads, taken from rtk's own contract rather than a hardcoded guess.
+// `rtk rewrite <probe>` prints a rewrite and exits 0 or 3 when rtk handles the command,
+// and exits 1 when no equivalent exists. Each probe below is a representative workload
+// command, because subcommand-scoped tools such as `gh` rewrite `gh pr list` but not `gh`.
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { normalizeRtkVersion, tersioDataPath } from './utils.ts';
+
+/** Verified against rtk 1.0.1; the drift test fails when rtk's set moves. */
+export const FALLBACK_ELIGIBLE_HEADS: readonly string[] = [
+  'rtk', 'git', 'gh', 'glab', 'docker', 'kubectl', 'psql', 'aws', 'bunx', 'npx',
+  'pytest', 'mypy', 'cat', 'grep', 'rg', 'find', 'tree', 'diff', 'ls', 'ast-grep',
+  'wget', 'prettier', 'playwright', 'prisma', 'jest', 'vitest', 'ctest', 'lint',
+  'wc', 'tsc', 'curl', 'cargo', 'npm', 'pnpm', 'bun', 'go', 'ruff', 'next',
+  'dotnet', 'oc', 'jq', 'make',
+];
+
+const PROBES: Record<string, string> = {
+  git: 'git log', gh: 'gh pr list', glab: 'glab mr list', docker: 'docker ps',
+  kubectl: 'kubectl get pods', psql: 'psql --version', aws: 'aws --version',
+  bunx: 'bunx --version', npx: 'npx --version', pytest: 'pytest --version',
+  mypy: 'mypy --version', cat: 'cat README.md', grep: 'grep rtk README.md',
+  rg: 'rg rtk README.md', find: 'find . -name x', tree: 'tree .', diff: 'diff a b',
+  ls: 'ls -la', 'ast-grep': 'ast-grep --version', wget: 'wget --version',
+  prettier: 'prettier --version', playwright: 'playwright --version', prisma: 'prisma --version',
+  jest: 'jest --version', vitest: 'vitest --version', ctest: 'ctest --version',
+  lint: 'lint .', wc: 'wc -l x', tsc: 'tsc --version', curl: 'curl --version',
+  cargo: 'cargo test', npm: 'npm run build', pnpm: 'pnpm run build', bun: 'bun run test',
+  go: 'go test ./...', ruff: 'ruff check .', next: 'next build', dotnet: 'dotnet build',
+  oc: 'oc get pods', jq: 'jq . x', make: 'make',
+};
+
+function probe(bin: string, command: string): boolean {
+  try {
+    const out = execFileSync(bin, ['rewrite', command], { encoding: 'utf8', timeout: 5000, windowsHide: true });
+    return out.trim().length > 0;
+  } catch (e) {
+    // Non-zero exit throws; exit 3 still prints a rewrite, exits 1 and 2 do not.
+    const err = e as { status?: number; stdout?: string | Buffer };
+    if (err.status !== 0 && err.status !== 3) return false;
+    return String(err.stdout ?? '').trim().length > 0;
+  }
+}
+
+/** One set of heads for this rtk build, read straight from its rewrite contract. */
+export function deriveEligibleHeads(bin: string): Set<string> {
+  const heads = new Set<string>(['rtk']);
+  for (const [head, command] of Object.entries(PROBES)) {
+    if (probe(bin, command)) heads.add(head);
+  }
+  return heads;
+}
+
+function rtkVersion(bin: string): string {
+  try {
+    return normalizeRtkVersion(execFileSync(bin, ['--version'], { encoding: 'utf8', timeout: 5000, windowsHide: true }));
+  } catch {
+    return '';
+  }
+}
+
+/**
+ * Heads rtk rewrites, cached per binary version so an upgrade re-derives once.
+ * Without a binary, or on any read failure, the verified fallback stands.
+ */
+export function eligibleHeads(bin: string | null): ReadonlySet<string> {
+  if (!bin) return new Set(FALLBACK_ELIGIBLE_HEADS);
+  const version = rtkVersion(bin);
+  const file = tersioDataPath('rtk-eligible.json', 'rtk-eligible.json');
+  try {
+    const cached = JSON.parse(fs.readFileSync(file, 'utf8')) as { version?: unknown; heads?: unknown };
+    if (cached.version === version && Array.isArray(cached.heads) && cached.heads.every((h) => typeof h === 'string')) {
+      return new Set(cached.heads as string[]);
+    }
+  } catch { /* derive below */ }
+  const heads = deriveEligibleHeads(bin);
+  try {
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, `${JSON.stringify({ version, heads: [...heads] })}\n`, 'utf8');
+  } catch { /* the cache is best-effort */ }
+  return heads;
+}

package/extensions/shared/rtk-gain.ts

@@ -1,8 +1,8 @@
-// Savings read from rtk history, never estimated; modes bench in docs/BENCHMARK.md.
-import { execFileSync } from 'node:child_process';
+// Savings read from rtk history, never estimated; modes bench in docs/BENCHMARK_GUIDE.md.
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { sqliteRead } from './sqlite.ts';
 
 export interface RtkCommandRow {
   command: string;
@@ -23,7 +23,7 @@ export interface RtkGain {
 
 const EMPTY: RtkGain = { commands: 0, saved: 0, input: 0, avgPct: 0, totalMs: 0, byCommand: [] };
 
-// The table shows one clipped cell, so bound the command before it crosses the sqlite3 CLI and lands in every /data.json poll.
+// The table shows one clipped cell, so bound the command before it reaches /data.json.
 const MAX_CMD_CHARS = 200;
 
 // A multi-line stored command would derail every row after it; flatten on read.
@@ -40,12 +40,7 @@ export function rtkDbPath(): string {
 }
 
 function query(db: string, sql: string): string[][] {
-  const out = execFileSync('sqlite3', ['-separator', '\t', db, sql], {
-    encoding: 'utf8',
-    timeout: 5000,
-    stdio: ['ignore', 'pipe', 'ignore'],
-  });
-  return out
+  return sqliteRead(db, sql)
     .split('\n')
     .filter((line) => line.trim())
     .map((line) => line.split('\t'));
@@ -54,7 +49,7 @@ function query(db: string, sql: string): string[][] {
 export function readRtkGain(limit = 10, cutoffMs?: number): RtkGain {
   try {
     if (!fs.existsSync(rtkDbPath())) return EMPTY;
-    // View-level cutoff only: rtk's own rows stay untouched. Timestamps that do not parse land on 0 and drop out of a filtered view.
+    // View-level cutoff only: rtk's rows stay untouched. Unparseable timestamps land on 0 and drop from filtered views.
     const where = cutoffMs && cutoffMs > 0
       ? `WHERE CAST(strftime('%s', timestamp) AS INTEGER) >= ${Math.floor(cutoffMs / 1000)}`
       : '';

package/extensions/shared/session-state.ts

@@ -3,32 +3,35 @@ import type { ComboLevel, ComboState, ExtensionCtx, SessionEntry } from './types
 
 const BRIDGE_KEY = Symbol.for('tersio/combo-session-state');
 
-// A verbatim sentence from omp's subagent prompt, so it can drift; read from the installed omp binary on 2026-10-01. pi has no built-in subagent prompt.
+// A verbatim sentence from omp's subagent prompt, so it can drift; read from the installed omp binary on 2026-10-01.
 export const OMP_SUBAGENT_MARKER = 'Worker agent: delegated tasks.';
 
+// Every level above off turns pstack on with the other three; off is the one level without it.
 export const COMBO_LEVELS: Record<string, Readonly<ComboState>> = Object.freeze({
-  off: Object.freeze({ level: 'off', caveman: 'off', rtk: 'off', ponytail: 'off' }),
-  medium: Object.freeze({ level: 'medium', caveman: 'lite', rtk: 'on', ponytail: 'lite' }),
-  balanced: Object.freeze({ level: 'balanced', caveman: 'full', rtk: 'on', ponytail: 'full' }),
-  max: Object.freeze({ level: 'max', caveman: 'ultra', rtk: 'on', ponytail: 'ultra' }),
+  off: Object.freeze({ level: 'off', caveman: 'off', rtk: 'off', ponytail: 'off', pstack: 'off' }),
+  medium: Object.freeze({ level: 'medium', caveman: 'lite', rtk: 'on', ponytail: 'lite', pstack: 'on' }),
+  balanced: Object.freeze({ level: 'balanced', caveman: 'full', rtk: 'on', ponytail: 'full', pstack: 'on' }),
+  max: Object.freeze({ level: 'max', caveman: 'ultra', rtk: 'on', ponytail: 'ultra', pstack: 'on' }),
 });
 
 const MODE_VALUES: Record<string, Set<string>> = {
   caveman: new Set(['off', 'lite', 'full', 'ultra', 'megacave', 'megacave-lite', 'megacave-full', 'megacave-ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']),
   rtk: new Set(['off', 'on']),
   ponytail: new Set(['off', 'lite', 'full', 'ultra']),
+  pstack: new Set(['off', 'on']),
 };
 
 // Upstream renamed wenyan to megacave and kept the old spelling as an alias.
 const CAVEMAN_LEGACY_PREFIX = /^wenyan/;
 
-type ModeName = 'caveman' | 'rtk' | 'ponytail';
+type ModeName = 'caveman' | 'rtk' | 'ponytail' | 'pstack';
 type Modes = Record<ModeName, string>;
 
 const MODE_ENTRY_TYPES: Record<string, ModeName> = {
   'caveman-mode': 'caveman',
   'rtk-mode': 'rtk',
   'ponytail-mode': 'ponytail',
+  'pstack-mode': 'pstack',
 };
 
 /** True when the branch carries Tersio's own mode state; a subagent starts without it. */
@@ -54,7 +57,7 @@ export function normalizeMode(name: ModeName, value: unknown): string | null {
 export function deriveLevel(modes: Modes | null | undefined): ComboLevel {
   for (const level of Object.keys(COMBO_LEVELS) as ComboLevel[]) {
     const preset = COMBO_LEVELS[level];
-    if (preset.caveman === modes?.caveman && preset.rtk === modes?.rtk && preset.ponytail === modes?.ponytail) return level;
+    if (preset.caveman === modes?.caveman && preset.rtk === modes?.rtk && preset.ponytail === modes?.ponytail && preset.pstack === modes?.pstack) return level;
   }
   return 'custom';
 }
@@ -72,6 +75,7 @@ function normalizedState(modes: Partial<Modes> | null | undefined, level: ComboL
     caveman: normalizeMode('caveman', modes?.caveman) || 'off',
     rtk: normalizeMode('rtk', modes?.rtk) || 'off',
     ponytail: normalizeMode('ponytail', modes?.ponytail) || 'off',
+    pstack: normalizeMode('pstack', modes?.pstack) || 'off',
   };
   return Object.freeze({ level: isKnownLevel(level) ? level : deriveLevel(state), ...state });
 }
@@ -122,7 +126,7 @@ export function normalizeComboLevel(value: unknown): ComboLevel | null {
 }
 
 
-// Last-wins scan for a custom session entry; skips entries whose value fails to parse so a corrupt write never shadows an older valid one.
+// Last-wins scan for a custom session entry; skips unparseable values so a corrupt write never shadows a valid one.
 export function lastCustomValue<T>(entries: SessionEntry[] | null | undefined, customType: string, pick: (data: SessionEntry['data']) => T | null | undefined): T | null {
   if (!Array.isArray(entries)) return null;
   for (let i = entries.length - 1; i >= 0; i -= 1) {
@@ -156,15 +160,16 @@ export function setSharedComboMode(name: ModeName, value: unknown): Readonly<Com
   const mode = normalizeMode(name, value);
   if (!mode) return getSharedComboState();
   const modes = { ...getSharedComboState(), [name]: mode } as Modes;
-  // Derive the level from the final triplet so a redundant same-value write cannot strand a matching preset at 'custom' and drop the combo bar.
+  // Derive the level from the final quartet, so a redundant same-value write cannot strand a preset at 'custom'.
   return publish(normalizedState(modes));
 }
 
-export function setSharedComboModes(modes: { caveman?: unknown; rtk?: unknown; ponytail?: unknown }): Readonly<ComboState> {
+export function setSharedComboModes(modes: { caveman?: unknown; rtk?: unknown; ponytail?: unknown; pstack?: unknown }): Readonly<ComboState> {
   return publish(normalizedState({
     caveman: normalizeMode('caveman', modes.caveman) || 'off',
     rtk: normalizeMode('rtk', modes.rtk) || 'off',
     ponytail: normalizeMode('ponytail', modes.ponytail) || 'off',
+    pstack: normalizeMode('pstack', modes.pstack) || 'off',
   }));
 }
 
@@ -185,13 +190,13 @@ export function reconcileSharedComboEntries(entries: SessionEntry[] | null | und
       if (mode) modes[name] = mode;
     }
   }
-  // The level reflects the final triplet, never the write order, so a preset entry followed by the same values reconciles back to the preset.
+  // The level reflects the final quartet, not write order, so a preset followed by the same values reconciles back.
   return publish(normalizedState(modes));
 }
 
 // One-line session-wide mode summary for change confirmations.
-export function activeModesSummary(state: { caveman: string; rtk: string; ponytail: string }): string {
-  return `caveman=${state.caveman.toUpperCase()}, rtk=${state.rtk.toUpperCase()}, ponytail=${state.ponytail.toUpperCase()}`;
+export function activeModesSummary(state: { caveman: string; rtk: string; ponytail: string; pstack: string }): string {
+  return `caveman=${state.caveman.toUpperCase()}, rtk=${state.rtk.toUpperCase()}, ponytail=${state.ponytail.toUpperCase()}, pstack=${state.pstack.toUpperCase()}`;
 }
 
 // Keyed registration drops stale closures; hosts offer no teardown hook.