@krtclcdy/tersio 2.24.1 → 2.25.0

package/extensions/ai-addons-updater/index.js

@@ -1,5 +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 SHA256 checksums with no signature, so checksum-only is the best available.
 import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import fs from 'node:fs/promises';
@@ -16,8 +15,7 @@ const RTK_BINARY = resolveRtkBinary();
 const CAVEMAN_LOCAL = path.join(EXTENSION_DIR, '..', 'caveman-session', 'rule.md');
 const HOST_NAME = isPiProcess() ? 'Pi' : 'OMP';
 const RELOAD_MSG = `Reminder: restart ${HOST_NAME} (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 a hoisted dependency, so the installed copy is found by walking up rather than by naming a host directory.
 function ponytailLocal() {
     return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');
 }
@@ -133,20 +131,76 @@ 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) {
-    // Bundled with tersio: `tersio update` pulls the copy with the CLI.
+    void pi;
+    const localPkg = ponytailLocal();
     let localVer = null;
     try {
-        localVer = parsePackageVersion(await readTextIfExists(ponytailLocal() ?? ''));
+        localVer = localPkg ? parsePackageVersion(await readTextIfExists(localPkg)) : null;
     }
     catch {
         localVer = null;
     }
-    void pi;
-    const m = dryRun
-        ? `Ponytail dry-run: bundled with tersio (local=${localVer || '—'}); run \`tersio update\` to refresh it.`
-        : `Ponytail is bundled with tersio (local=${localVer || '—'}); run \`tersio update\` to refresh it.\n${RELOAD_MSG}`;
-    return report(ctx, m, 'info');
+    if (!localPkg)
+        return report(ctx, 'Ponytail: package.json not found; reinstall with `tersio update`.', 'warning');
+    let meta;
+    try {
+        meta = await fetchJson('https://registry.npmjs.org/@dietrichgebert/ponytail/latest');
+    }
+    catch (e) {
+        return report(ctx, `Ponytail: cannot fetch npm metadata: ${e.message}`, 'warning');
+    }
+    const remoteVer = meta.version;
+    if (!remoteVer)
+        return report(ctx, 'Ponytail: npm metadata has no version.', 'warning');
+    if (localVer === remoteVer)
+        return report(ctx, `Ponytail up to date: local=${localVer} latest=${remoteVer}`, 'info');
+    if (!meta.dist?.tarball)
+        return report(ctx, 'Ponytail: npm metadata has no tarball.', 'warning');
+    if (dryRun)
+        return report(ctx, `Ponytail dry-run: would install ${remoteVer} over ${localVer || '—'} at ${path.dirname(localPkg)}.`, 'info');
+    const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'ponytail-update-'));
+    try {
+        const tarballPath = path.join(tmp, 'pkg.tgz');
+        notify(ctx, `Ponytail: downloading ${remoteVer}…`, 'info');
+        await httpsDownload(meta.dist.tarball, tarballPath);
+        if (meta.dist.shasum) {
+            const actual = createHash('sha1').update(await fs.readFile(tarballPath)).digest('hex');
+            if (actual !== meta.dist.shasum)
+                return report(ctx, `Ponytail: sha1 mismatch; expected ${meta.dist.shasum.slice(0, 12)}…, got ${actual.slice(0, 12)}…; not installing`, 'error');
+        }
+        const extractDir = path.join(tmp, 'out');
+        await fs.mkdir(extractDir, { recursive: true });
+        execFileSync('tar', ['xzf', tarballPath, '-C', extractDir], { encoding: 'utf8', shell: false });
+        const newPkgJson = await findFile(extractDir, 'package.json');
+        if (!newPkgJson)
+            return report(ctx, 'Ponytail: package.json not in tarball.', 'warning');
+        const newDir = path.dirname(newPkgJson);
+        const destDir = path.dirname(localPkg);
+        const backupDir = `${destDir}.bak`;
+        // fs.rename cannot cross filesystems (tmp vs home), so copy then verify.
+        await fs.rename(destDir, backupDir);
+        try {
+            await fs.cp(newDir, destDir, { recursive: true });
+            const written = parsePackageVersion(await readTextIfExists(path.join(destDir, 'package.json')));
+            if (written !== remoteVer)
+                throw new Error(`installed version ${written} !== ${remoteVer}`);
+        }
+        catch (e) {
+            await fs.rm(destDir, { recursive: true, force: true }).catch(() => { });
+            await fs.rename(backupDir, destDir).catch(() => { });
+            throw new Error(`${e.message}; restored backup`);
+        }
+        await fs.rm(backupDir, { recursive: true, force: true }).catch(() => { });
+        return report(ctx, `Ponytail updated → ${remoteVer} at ${destDir}\n${RELOAD_MSG}`, 'info');
+    }
+    catch (e) {
+        return report(ctx, `Ponytail update failed: ${e.message}`, 'warning');
+    }
+    finally {
+        fs.rm(tmp, { recursive: true, force: true }).catch(() => { });
+    }
 }
 async function updateRtk(ctx, dryRun = false) {
     let release;
@@ -192,14 +246,14 @@ async function updateRtk(ctx, dryRun = false) {
         const checks = await fs.readFile(checksPath, 'utf8');
         const expected = parseChecksum(checks, asset.name);
         if (!expected) {
-            const m = `RTK: checksums.txt has no entry for ${asset.name}`;
-            return report(ctx, m, 'warning');
+            const m = `RTK: checksums.txt has no entry for ${asset.name}; not installing`;
+            return report(ctx, m, 'error');
         }
         const archiveBuf = await fs.readFile(archivePath);
         const actual = createHash('sha256').update(archiveBuf).digest('hex').toLowerCase();
         if (actual !== expected) {
-            const m = `RTK: checksum mismatch! expected=${expected.slice(0, 12)}… actual=${actual.slice(0, 12)}…`;
-            return report(ctx, m, 'warning');
+            const m = `RTK: checksum mismatch! expected=${expected.slice(0, 12)}… actual=${actual.slice(0, 12)}…; not installing`;
+            return report(ctx, m, 'error');
         }
         notify(ctx, 'RTK: checksum verified.', 'info');
         const extractDir = path.join(tmp, 'extracted');

package/extensions/ai-addons-updater/index.ts

@@ -1,5 +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 SHA256 checksums with no signature, so checksum-only is the best available.
 
 import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
@@ -37,8 +36,7 @@ const CAVEMAN_LOCAL = path.join(EXTENSION_DIR, '..', 'caveman-session', 'rule.md
 const HOST_NAME = isPiProcess() ? 'Pi' : 'OMP';
 const RELOAD_MSG = `Reminder: restart ${HOST_NAME} (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 a hoisted dependency, so the installed copy is found by walking up rather than by naming a host directory.
 function ponytailLocal(): string | null {
   return findHoistedPackage('@dietrichgebert/ponytail', EXTENSION_DIR, 'package.json');
 }
@@ -59,7 +57,7 @@ interface AddonUpdaterPi {
   cwd?: string;
 }
 
-type NotifyLevel = 'info' | 'warning';
+type NotifyLevel = 'info' | 'warning' | 'error';
 
 function notify(ctx: AddonUpdaterCtx | undefined, msg: string, level: NotifyLevel): void {
   ctx?.ui?.notify?.(String(msg), level);
@@ -180,17 +178,62 @@ async function checkAddons(ctx: AddonUpdaterCtx): Promise<string> {
   return lines.join('\n');
 }
 
+// Ponytail is a hoisted dependency; replace its package dir from the npm tarball.
 async function updatePonytail(pi: AddonUpdaterPi, ctx: AddonUpdaterCtx, dryRun = false): Promise<string> {
-  // Bundled with tersio: `tersio update` pulls the copy with the CLI.
+  void pi;
+  const localPkg = ponytailLocal();
   let localVer: string | null = null;
+  try { localVer = localPkg ? parsePackageVersion(await readTextIfExists(localPkg)) : null; } catch { localVer = null; }
+  if (!localPkg) return report(ctx, 'Ponytail: package.json not found; reinstall with `tersio update`.', 'warning');
+
+  let meta: { version?: string; dist?: { tarball?: string; shasum?: string } };
   try {
-    localVer = parsePackageVersion(await readTextIfExists(ponytailLocal() ?? ''));
-  } catch { localVer = null; }
-  void pi;
-  const m = dryRun
-    ? `Ponytail dry-run: bundled with tersio (local=${localVer || '—'}); run \`tersio update\` to refresh it.`
-    : `Ponytail is bundled with tersio (local=${localVer || '—'}); run \`tersio update\` to refresh it.\n${RELOAD_MSG}`;
-  return report(ctx, m, 'info');
+    meta = await fetchJson('https://registry.npmjs.org/@dietrichgebert/ponytail/latest');
+  } catch (e) {
+    return report(ctx, `Ponytail: cannot fetch npm metadata: ${(e as Error).message}`, 'warning');
+  }
+  const remoteVer = meta.version;
+  if (!remoteVer) return report(ctx, 'Ponytail: npm metadata has no version.', 'warning');
+  if (localVer === remoteVer) return report(ctx, `Ponytail up to date: local=${localVer} latest=${remoteVer}`, 'info');
+  if (!meta.dist?.tarball) return report(ctx, 'Ponytail: npm metadata has no tarball.', 'warning');
+
+  if (dryRun) return report(ctx, `Ponytail dry-run: would install ${remoteVer} over ${localVer || '—'} at ${path.dirname(localPkg)}.`, 'info');
+
+  const tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'ponytail-update-'));
+  try {
+    const tarballPath = path.join(tmp, 'pkg.tgz');
+    notify(ctx, `Ponytail: downloading ${remoteVer}…`, 'info');
+    await httpsDownload(meta.dist.tarball, tarballPath);
+    if (meta.dist.shasum) {
+      const actual = createHash('sha1').update(await fs.readFile(tarballPath)).digest('hex');
+      if (actual !== meta.dist.shasum) return report(ctx, `Ponytail: sha1 mismatch; expected ${meta.dist.shasum.slice(0, 12)}…, got ${actual.slice(0, 12)}…; not installing`, 'error');
+    }
+    const extractDir = path.join(tmp, 'out');
+    await fs.mkdir(extractDir, { recursive: true });
+    execFileSync('tar', ['xzf', tarballPath, '-C', extractDir], { encoding: 'utf8', shell: false });
+    const newPkgJson = await findFile(extractDir, 'package.json');
+    if (!newPkgJson) return report(ctx, 'Ponytail: package.json not in tarball.', 'warning');
+    const newDir = path.dirname(newPkgJson);
+    const destDir = path.dirname(localPkg);
+    const backupDir = `${destDir}.bak`;
+    // fs.rename cannot cross filesystems (tmp vs home), so copy then verify.
+    await fs.rename(destDir, backupDir);
+    try {
+      await fs.cp(newDir, destDir, { recursive: true });
+      const written = parsePackageVersion(await readTextIfExists(path.join(destDir, 'package.json')));
+      if (written !== remoteVer) throw new Error(`installed version ${written} !== ${remoteVer}`);
+    } catch (e) {
+      await fs.rm(destDir, { recursive: true, force: true }).catch(() => { });
+      await fs.rename(backupDir, destDir).catch(() => { });
+      throw new Error(`${(e as Error).message}; restored backup`);
+    }
+    await fs.rm(backupDir, { recursive: true, force: true }).catch(() => { });
+    return report(ctx, `Ponytail updated → ${remoteVer} at ${destDir}\n${RELOAD_MSG}`, 'info');
+  } catch (e) {
+    return report(ctx, `Ponytail update failed: ${(e as Error).message}`, 'warning');
+  } finally {
+    fs.rm(tmp, { recursive: true, force: true }).catch(() => { });
+  }
 }
 
 async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string> {
@@ -240,14 +283,14 @@ async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string>
     const checks = await fs.readFile(checksPath, 'utf8');
     const expected = parseChecksum(checks, asset.name);
     if (!expected) {
-      const m = `RTK: checksums.txt has no entry for ${asset.name}`;
-      return report(ctx, m, 'warning');
+      const m = `RTK: checksums.txt has no entry for ${asset.name}; not installing`;
+      return report(ctx, m, 'error');
     }
     const archiveBuf = await fs.readFile(archivePath);
     const actual = createHash('sha256').update(archiveBuf).digest('hex').toLowerCase();
     if (actual !== expected) {
-      const m = `RTK: checksum mismatch! expected=${expected.slice(0, 12)}… actual=${actual.slice(0, 12)}…`;
-      return report(ctx, m, 'warning');
+      const m = `RTK: checksum mismatch! expected=${expected.slice(0, 12)}… actual=${actual.slice(0, 12)}…; not installing`;
+      return report(ctx, m, 'error');
     }
     notify(ctx, 'RTK: checksum verified.', 'info');
 

package/extensions/caveman-session/index.js

@@ -1,8 +1,9 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, statusUi, systemPromptIncludes } from '../shared/session-state.js';
+import { getSharedComboState, hasModeState, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, systemPromptIncludes } from '../shared/session-state.js';
 import { dirname, join } from 'node:path';
 import { injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.js';
+import { announceStatus } from '../shared/status.js';
 import { readCavemanDefault } from '../shared/plugin-settings.js';
 const CAVERN_DIR = dirname(fileURLToPath(import.meta.url));
 const RULE_PATH = join(CAVERN_DIR, 'rule.md');
@@ -16,16 +17,10 @@ function readFullRule() {
     }
 }
 const DEFAULT_MODE = 'off';
-const INSTRUCTIONS = {
-    lite: `Caveman lite active for this session.
-Respond concise. Drop pleasantries, filler, and hedging. Keep complete technical substance. Code, commands, paths, errors, commits, and PR text stay normal/exact.`,
-    full: () => `Caveman full active for this session.\n${readFullRule()}`,
-    ultra: `Caveman ultra active for this session.
-Maximum terse prose. Strip conjunctions only when meaning stays clear. State each fact once. Use no invented abbreviations or causal arrows. Keep code, commands, commits, PR text, paths, API names, numbers, units, and errors exact. Drop caveman for security warnings, irreversible actions, ambiguous multi-step sequences, or user confusion.`,
-    'wenyan-lite': `Caveman wenyan-lite active for this session. Use semi-classical terse prose. Keep grammar structure, user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-    'wenyan-full': `Caveman wenyan-full active for this session. Use maximum classical terseness where meaning stays clear. Use classical sentence patterns, verbs before objects, and optional omitted subjects. Keep user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-    'wenyan-ultra': `Caveman wenyan-ultra active for this session. Use extreme classical abbreviation while keeping a classical Chinese feel and meaning clear. Keep user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-};
+// Upstream ships one SKILL.md; the level is a directive inside it, so swap only the header.
+function buildInstruction(mode) {
+    return `Caveman ${mode} active for this session.\n${readFullRule()}`;
+}
 function resolveMode(entries, fallback = DEFAULT_MODE) {
     return lastCustomValue(entries, 'caveman-mode', (data) => normalizeMode('caveman', data?.mode)) ?? fallback;
 }
@@ -35,20 +30,7 @@ function isOffCommand(text) {
 }
 export default function cavemanSessionExtension(pi) {
     let currentMode = DEFAULT_MODE;
-    let isActive = false;
-    let lastCtx = undefined;
-    function syncStatus(ctx) {
-        lastCtx = paintableCtx(lastCtx, ctx);
-        const ui = statusUi(lastCtx);
-        if (!ui)
-            return;
-        // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.
-        if (isComboPresetActive() || currentMode === 'off') {
-            ui.setStatus('caveman', undefined);
-            return;
-        }
-        paintStatusBar(ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
-    }
+    let lastInjected = undefined;
     function setMode(mode, ctx) {
         const normalized = normalizeMode('caveman', mode);
         if (!normalized)
@@ -56,22 +38,15 @@ export default function cavemanSessionExtension(pi) {
         currentMode = normalized;
         pi.appendEntry?.('caveman-mode', { mode: normalized });
         setSharedComboMode('caveman', normalized);
-        syncStatus(ctx);
-        const active = activeModesSummary(getSharedComboState());
-        const msg = normalized === 'off'
-            ? `Caveman off. Active: ${active}.`
-            : `Caveman ${normalized} on — terse replies for this session. Active: ${active}.`;
-        ctx?.ui?.notify?.(msg, 'info');
+        announceStatus(ctx);
         return true;
     }
     setExtensionLabel(pi, 'Caveman session toggle');
     // Adopt a /tersio or /combo switch at once, so the next turn needs no reload.
     function syncFromShared(state) {
         const mode = normalizeMode('caveman', state.caveman);
-        if (mode) {
+        if (mode)
             currentMode = mode;
-            syncStatus();
-        }
     }
     setSharedComboListener('caveman', syncFromShared);
     pi.registerCommand?.('caveman', {
@@ -83,7 +58,7 @@ export default function cavemanSessionExtension(pi) {
                 return;
             }
             if (arg === 'status') {
-                ctx?.ui?.notify?.(`Caveman: ${currentMode}`, 'info');
+                announceStatus(ctx);
                 return;
             }
             if (!setMode(arg, ctx)) {
@@ -99,17 +74,18 @@ export default function cavemanSessionExtension(pi) {
     });
     function restoreMode(ctx) {
         const entries = sessionEntries(ctx);
-        // Derive the bridge here so bar suppression does not depend on load order.
-        reconcileSharedComboEntries(entries);
-        // Persisted session state wins; a fresh session falls back to the
-        // installer/user-configured default (off unless configured).
+        // 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".
         const persisted = resolveMode(entries, '');
-        currentMode = persisted || normalizeMode('caveman', readCavemanDefault()) || DEFAULT_MODE;
-        syncStatus(ctx);
+        const alreadyChosen = currentMode !== DEFAULT_MODE;
+        currentMode = persisted || (alreadyChosen ? currentMode : normalizeMode('caveman', readCavemanDefault())) || 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);
-        ctx?.ui?.notify?.(`Caveman loaded: ${currentMode}`, 'info');
     });
     onHostEvent(pi, 'session_branch', async (_event, ctx) => {
         restoreMode(ctx);
@@ -117,26 +93,23 @@ export default function cavemanSessionExtension(pi) {
     pi.on('session_tree', async (_event, ctx) => {
         restoreMode(ctx);
     });
-    pi.on('agent_start', async (_event, ctx) => {
-        isActive = true;
-        syncStatus(ctx);
+    onHostEvent(pi, 'session_switch', async (_event, ctx) => {
+        restoreMode(ctx);
     });
-    pi.on('agent_end', async (_event, ctx) => {
-        isActive = false;
-        syncStatus(ctx);
+    onHostEvent(pi, 'session_compact', async (_event, ctx) => {
+        restoreMode(ctx);
     });
     pi.on('before_agent_start', async (event) => {
         const mode = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().caveman : currentMode;
         if (!mode || mode === 'off')
             return;
-        const def = INSTRUCTIONS[mode];
-        if (!def)
-            return;
-        const instruction = typeof def === 'function' ? def() : def;
-        // Skip when already present, so a host that re-presents the mutated prompt
-        // cannot stack it; matching the whole instruction keeps upstream rule.md intact.
+        const instruction = buildInstruction(mode);
+        // Match the whole instruction so a re-presented prompt cannot stack it.
         if (systemPromptIncludes(event.systemPrompt, instruction))
             return;
-        return injectPromptText(pi, event, instruction);
+        // The previous level's block is replaced, not stacked on.
+        const stale = lastInjected;
+        lastInjected = instruction;
+        return injectPromptText(pi, event, instruction, stale);
     });
 }

package/extensions/caveman-session/index.ts

@@ -1,8 +1,9 @@
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { activeModesSummary, getSharedComboState, isComboPresetActive, isOmpSubagentPrompt, lastCustomValue, normalizeInputCommand, normalizeMode, paintStatusBar, paintableCtx, reconcileSharedComboEntries, sessionEntries, setSharedComboListener, setSharedComboMode, statusUi, systemPromptIncludes } from '../shared/session-state.ts';
+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 { readCavemanDefault } from '../shared/plugin-settings.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
@@ -17,16 +18,11 @@ function readFullRule(): string {
 }
 
 const DEFAULT_MODE = 'off';
-const INSTRUCTIONS: Record<string, string | (() => string)> = {
-  lite: `Caveman lite active for this session.
-Respond concise. Drop pleasantries, filler, and hedging. Keep complete technical substance. Code, commands, paths, errors, commits, and PR text stay normal/exact.`,
-  full: () => `Caveman full active for this session.\n${readFullRule()}`,
-  ultra: `Caveman ultra active for this session.
-Maximum terse prose. Strip conjunctions only when meaning stays clear. State each fact once. Use no invented abbreviations or causal arrows. Keep code, commands, commits, PR text, paths, API names, numbers, units, and errors exact. Drop caveman for security warnings, irreversible actions, ambiguous multi-step sequences, or user confusion.`,
-  'wenyan-lite': `Caveman wenyan-lite active for this session. Use semi-classical terse prose. Keep grammar structure, user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-  'wenyan-full': `Caveman wenyan-full active for this session. Use maximum classical terseness where meaning stays clear. Use classical sentence patterns, verbs before objects, and optional omitted subjects. Keep user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-  'wenyan-ultra': `Caveman wenyan-ultra active for this session. Use extreme classical abbreviation while keeping a classical Chinese feel and meaning clear. Keep user language, technical terms, code, commands, paths, API names, numbers, units, and errors exact. Drop caveman when clarity or safety needs normal prose.`,
-};
+
+// Upstream ships one SKILL.md; the level is a directive inside it, so swap only the header.
+function buildInstruction(mode: string): string {
+  return `Caveman ${mode} active for this session.\n${readFullRule()}`;
+}
 
 function resolveMode(entries: SessionEntry[] | null | undefined, fallback: string = DEFAULT_MODE): string {
   return lastCustomValue(entries, 'caveman-mode', (data) => normalizeMode('caveman', data?.mode)) ?? fallback;
@@ -39,20 +35,7 @@ function isOffCommand(text: unknown): boolean {
 
 export default function cavemanSessionExtension(pi: ExtensionApi): void {
   let currentMode = DEFAULT_MODE;
-  let isActive = false;
-  let lastCtx: ExtensionCtx | undefined = undefined;
-
-  function syncStatus(ctx?: ExtensionCtx): void {
-    lastCtx = paintableCtx(lastCtx, ctx);
-    const ui = statusUi(lastCtx);
-    if (!ui) return;
-    // Combo owns the bar when any preset is active; keep ours empty to avoid duplication.
-    if (isComboPresetActive() || currentMode === 'off') {
-      ui.setStatus('caveman', undefined);
-      return;
-    }
-    paintStatusBar(ui, 'caveman', '🪨', `caveman: ${currentMode.toUpperCase()}`, isActive);
-  }
+  let lastInjected: string | undefined = undefined;
 
   function setMode(mode: string, ctx?: ExtensionCtx): boolean {
     const normalized = normalizeMode('caveman', mode);
@@ -60,12 +43,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     currentMode = normalized;
     pi.appendEntry?.('caveman-mode', { mode: normalized });
     setSharedComboMode('caveman', normalized);
-    syncStatus(ctx);
-    const active = activeModesSummary(getSharedComboState());
-    const msg = normalized === 'off'
-      ? `Caveman off. Active: ${active}.`
-      : `Caveman ${normalized} on — terse replies for this session. Active: ${active}.`;
-    ctx?.ui?.notify?.(msg, 'info');
+    announceStatus(ctx);
     return true;
   }
 
@@ -74,10 +52,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
   // Adopt a /tersio or /combo switch at once, so the next turn needs no reload.
   function syncFromShared(state: { caveman: string }): void {
     const mode = normalizeMode('caveman', state.caveman);
-    if (mode) {
-      currentMode = mode;
-      syncStatus();
-    }
+    if (mode) currentMode = mode;
   }
   setSharedComboListener('caveman', syncFromShared);
   pi.registerCommand?.('caveman', {
@@ -89,7 +64,7 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
         return;
       }
       if (arg === 'status') {
-        ctx?.ui?.notify?.(`Caveman: ${currentMode}`, 'info');
+        announceStatus(ctx);
         return;
       }
       if (!setMode(arg, ctx)) {
@@ -105,18 +80,18 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
 
   function restoreMode(ctx?: ExtensionCtx): void {
     const entries = sessionEntries(ctx);
-    // Derive the bridge here so bar suppression does not depend on load order.
-    reconcileSharedComboEntries(entries);
-    // Persisted session state wins; a fresh session falls back to the
-    // installer/user-configured default (off unless configured).
+    // 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".
     const persisted = resolveMode(entries, '');
-    currentMode = persisted || normalizeMode('caveman', readCavemanDefault()) || DEFAULT_MODE;
-    syncStatus(ctx);
+    const alreadyChosen = currentMode !== DEFAULT_MODE;
+    currentMode = persisted || (alreadyChosen ? currentMode : normalizeMode('caveman', readCavemanDefault())) || 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);
-    ctx?.ui?.notify?.(`Caveman loaded: ${currentMode}`, 'info');
   });
 
   onHostEvent(pi, 'session_branch', async (_event, ctx) => {
@@ -127,25 +102,23 @@ export default function cavemanSessionExtension(pi: ExtensionApi): void {
     restoreMode(ctx);
   });
 
-  pi.on('agent_start', async (_event, ctx) => {
-    isActive = true;
-    syncStatus(ctx);
+  onHostEvent(pi, 'session_switch', async (_event, ctx) => {
+    restoreMode(ctx);
   });
 
-  pi.on('agent_end', async (_event, ctx) => {
-    isActive = false;
-    syncStatus(ctx);
+  onHostEvent(pi, 'session_compact', async (_event, ctx) => {
+    restoreMode(ctx);
   });
 
   pi.on('before_agent_start', async (event: SystemPromptEvent) => {
     const mode = isOmpSubagentPrompt(event.systemPrompt) ? getSharedComboState().caveman : currentMode;
     if (!mode || mode === 'off') return;
-    const def = INSTRUCTIONS[mode];
-    if (!def) return;
-    const instruction = typeof def === 'function' ? def() : def;
-    // Skip when already present, so a host that re-presents the mutated prompt
-    // cannot stack it; matching the whole instruction keeps upstream rule.md intact.
+    const instruction = buildInstruction(mode);
+    // Match the whole instruction so a re-presented prompt cannot stack it.
     if (systemPromptIncludes(event.systemPrompt, instruction)) return;
-    return injectPromptText(pi, event, instruction);
+    // The previous level's block is replaced, not stacked on.
+    const stale = lastInjected;
+    lastInjected = instruction;
+    return injectPromptText(pi, event, instruction, stale);
   });
 }