@krtclcdy/tersio 2.25.1 → 2.25.3

package/extensions/combo-toggle/index.ts

@@ -13,15 +13,18 @@ import {
   sessionEntries,
   setSharedComboLevel,
   setSharedComboListener,
-  setSharedComboMode,
+  setSharedComboModes,
   systemPromptIncludes,
 } from '../shared/session-state.ts';
 import { hostSelect, injectPromptText, onHostEvent, setExtensionLabel } from '../shared/host.ts';
 import { announceStatus } from '../shared/status.ts';
 import {
   isComboSetupComplete,
+  readCavemanDefault,
   readComboDefault,
+  readPluginSettings,
   readPonytailDefault,
+  readRtkDefault,
   saveComboSetup,
 } from '../shared/plugin-settings.ts';
 import { findHoistedPackage, isPiProcess } from '../lib/utils.ts';
@@ -64,7 +67,8 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
 
   let setupPrompted = false;
   let lastInjected: string | undefined = undefined;
-
+  // opencode has no UI event stream, so only its empty branch reconciles.
+  const OPENCODE = pi.hostId === 'opencode';
 
   // Siblings restore from these entries, so the fallback must write them too.
   function persistPreset(level: string): void {
@@ -74,19 +78,38 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
     pi.appendEntry?.('ponytail-mode', { mode: modes.ponytail });
     pi.appendEntry?.('combo-level', { level });
   }
+  function restoreConfiguredDefaults(): void {
+    const settings = readPluginSettings();
+    const hasModeDefaults = ['cavemanDefault', 'rtkDefault', 'ponytailDefault'].some((key) => key in settings);
+    const combo = readComboDefault();
+    const preset = COMBO_LEVELS[combo];
+    const modes = hasModeDefaults
+      ? { caveman: readCavemanDefault(), rtk: readRtkDefault() ? 'on' : 'off', ponytail: readPonytailDefault() }
+      : preset;
+    setSharedComboModes(modes);
+    if (modes.caveman === 'off' && modes.rtk === 'off' && modes.ponytail === '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?.('combo-level', { level: combo });
+    }
+  }
+
 
-  function reconcile(ctx?: ExtensionCtx): Readonly<ComboState> {
-    if (!ctx?.hasUI) return getSharedComboState();
-    return reconcileSharedComboEntries(sessionEntries(ctx));
+  function reconcile(ctx?: ExtensionCtx, resetEmpty = false): Readonly<ComboState> {
+    if (!ctx?.hasUI && !(resetEmpty && OPENCODE)) return getSharedComboState();
+    const entries = sessionEntries(ctx);
+    if (!resetEmpty && entries.length === 0) return getSharedComboState();
+    return reconcileSharedComboEntries(entries);
   }
   function listen(ctx?: ExtensionCtx): void {
     if (!ctx?.hasUI) return;
     setSharedComboListener('combo', (state) => { announceStatus(ctx); return state; });
   }
-
-  function track(ctx?: ExtensionCtx): void {
+  function track(ctx?: ExtensionCtx, resetEmpty = false): void {
     listen(ctx);
-    if (ctx?.hasUI) reconcile(ctx);
+    if (ctx?.hasUI || (resetEmpty && OPENCODE)) reconcile(ctx, resetEmpty);
   }
 
   pi.registerCommand?.('combo', {
@@ -145,26 +168,11 @@ export default function comboToggleExtension(pi: ExtensionApi): void {
   }
 
   pi.on('session_start', async (_event, ctx) => {
-    track(ctx);
-    await runFirstRunSetup(ctx);
-    // The configured default applies only when no persisted mode state exists.
+    track(ctx, true);
+    if (!isComboSetupComplete() && ctx?.hasUI && ctx.ui?.select) await runFirstRunSetup(ctx);
+    // The configured defaults apply when a fresh session has no persisted mode state.
     const entries = sessionEntries(ctx);
-    const persisted = hasModeState(entries);
-    if (getSharedComboState().level === 'off' && !persisted) {
-      const fallback = readComboDefault();
-      if (fallback !== 'off') {
-        persistPreset(fallback);
-        setSharedComboLevel(fallback);
-      }
-    }
-    // No sibling restores a standalone ponytail default, so apply it here; skip it when the active preset already writes the same mode.
-    if (!entries.some((e) => e?.type === 'custom' && e.customType === 'ponytail-mode')) {
-      const ponytailFallback = readPonytailDefault();
-      if (ponytailFallback !== 'off' && ponytailFallback !== getSharedComboState().ponytail) {
-        pi.appendEntry?.('ponytail-mode', { mode: ponytailFallback });
-        setSharedComboMode('ponytail', ponytailFallback);
-      }
-    }
+    if (!hasModeState(entries) && (ctx?.hasUI || OPENCODE)) restoreConfiguredDefaults();
     // Announced last, so any default above is reflected.
     announceStatus(ctx);
   });

package/extensions/lib/utils.ts

@@ -27,7 +27,18 @@ export function homeDir(): string {
 }
 
 export const RTK_RELEASE_API = 'https://api.github.com/repos/rtk-ai/rtk/releases/latest';
-export const CAVEMAN_REMOTE_RULE = 'https://raw.githubusercontent.com/JuliusBrussee/caveman/main/skills/caveman/SKILL.md';
+export const CAVEMAN_REMOTE_ULTRA = 'https://raw.githubusercontent.com/JuliusBrussee/caveman/main/skills/ultracave/SKILL.md';
+export const CAVEMAN_REMOTE_MEGACAVE = 'https://raw.githubusercontent.com/JuliusBrussee/caveman/main/skills/megacave/SKILL.md';
+
+// A fetch that returns an error page or a truncated body must not reach the extension tree.
+export function ruleBodyProblem(text: string): string | null {
+  const trimmed = text.trim();
+  if (trimmed === '') return 'empty body';
+  if (/^\s*<(!doctype|html)/i.test(trimmed)) return 'HTML page, not markdown';
+  if (/^\s*404\b/im.test(trimmed)) return 'upstream 404 page';
+  if (trimmed.length < 800) return `truncated (${trimmed.length} chars)`;
+  return null;
+}
 
 export interface RtkPlatformSpec {
   triple: string;
@@ -82,6 +93,17 @@ export function rtkPlatformSpec(platform: string = process.platform, arch: strin
   return RTK_PLATFORM_SPECS[`${platform}/${arch}`] || null;
 }
 
+// Walk up to the nearest package.json; identical for the source and compiled trees.
+export function findPackageRoot(fromDir: string): string {
+  let dir = fromDir;
+  for (;;) {
+    if (existsSync(path.join(dir, 'package.json'))) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) throw new Error('package root not found');
+    dir = parent;
+  }
+}
+
 // The 3xx+location redirect rule shared by httpsGet/httpsDownload.
 function redirectNext(res: { statusCode?: number; headers: { location?: string } }, url: string): string | null {
   if (res.statusCode !== undefined && res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {

package/extensions/opencode/server.ts

@@ -7,6 +7,7 @@ import comboToggleExtension from '../combo-toggle/index.ts';
 import tersioCommandsExtension from '../tersio-commands/index.ts';
 import { getSharedComboState } from '../shared/session-state.ts';
 import { formatStatus } from '../shared/status.ts';
+import { resolveRtkBinary } from '../lib/utils.ts';
 import type { ExtensionApi, ExtensionCtx, InputEvent, SessionEntry, SystemPromptEvent } from '../shared/types.ts';
 
 interface CommandConfig {
@@ -27,10 +28,9 @@ interface ToolConfig {
   ) => Promise<{ isError: boolean; content: { type: string; text: string }[]; details: Record<string, unknown> }>;
 }
 
-// Plain object, not Plugin.define: define is an identity wrapper, and a value
-// import would force every install to vendor the whole @opencode dependency tree.
+// The npm name, so the plugin list reads the same as the OMP and pi installs.
 const plugin: Plugin.Plugin = {
-  id: 'tersio',
+  id: '@krtclcdy/tersio',
   async setup(ctx) {
     // Entries are scoped per session; an unseen ID restores on its first hook.
     const sessions = new Map<string, SessionEntry[]>();
@@ -40,7 +40,9 @@ const plugin: Plugin.Plugin = {
       const own = ((await ctx.storage.get(`entries:${sid}`)) as SessionEntry[] | undefined) ?? [];
       if (own.length) return own;
       // Pre-scoped installs kept one global list; adopt it once, then diverge.
+      // Clear it after adoption so it can never shadow saved defaults later.
       const legacy = ((await ctx.storage.get('entries')) as SessionEntry[] | undefined) ?? [];
+      if (legacy.length) void ctx.storage.set('entries', []).catch(() => {});
       return [...legacy];
     };
     const sessionEntriesOf = (sid: string): SessionEntry[] => {
@@ -194,7 +196,31 @@ const plugin: Plugin.Plugin = {
       if (sid) await ensureSession(sid);
       for (const handler of inputHandlers) void handler({ text: event.prompt.text, source: 'interactive' });
     });
+
+    // rtk has its own OpenCode plugin; doing this here keeps one entry in the plugin list.
+    await ctx.tool.hook('execute.before', async (event) => {
+      const tool = String(event.tool ?? '').toLowerCase();
+      if (tool !== 'bash' && tool !== 'shell') return;
+      const input = event.input as { command?: unknown } | null | undefined;
+      if (typeof input?.command !== 'string' || !input.command) return;
+      const rewritten = await rewriteCommand(input.command);
+      if (rewritten) input.command = rewritten;
+    });
   },
 };
 
+function rewriteCommand(command: string): Promise<string | null> {
+  const bin = resolveRtkBinary();
+  if (!bin) return Promise.resolve(null);
+  return new Promise((resolve) => {
+    execFile(bin, ['rewrite', command], { timeout: 5000 }, (error, stdout) => {
+      // A kill or timeout means untrustworthy output; pass the command through.
+      const err = error as { killed?: boolean; signal?: unknown } | null;
+      if (err && (err.killed || err.signal)) return resolve(null);
+      const out = String(stdout).trim();
+      resolve(out && out !== command ? out : null);
+    });
+  });
+}
+
 export default plugin;

package/extensions/shared/plugin-settings.ts

@@ -45,7 +45,7 @@ export function readPluginSettings(): Record<string, unknown> {
 }
 
 const COMBO_LEVELS = new Set(['off', 'medium', 'balanced', 'max']);
-const CAVEMAN_MODES = new Set(['off', 'lite', 'full', 'ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']);
+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']);
 
 function readStringDefault(key: string, valid: Set<string>): string {

package/extensions/shared/session-state.ts

@@ -14,11 +14,14 @@ export const COMBO_LEVELS: Record<string, Readonly<ComboState>> = Object.freeze(
 });
 
 const MODE_VALUES: Record<string, Set<string>> = {
-  caveman: new Set(['off', 'lite', 'full', 'ultra', 'wenyan', 'wenyan-lite', 'wenyan-full', 'wenyan-ultra']),
+  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']),
 };
 
+// Upstream renamed wenyan to megacave and kept the old spelling as an alias.
+const CAVEMAN_LEGACY_PREFIX = /^wenyan/;
+
 type ModeName = 'caveman' | 'rtk' | 'ponytail';
 type Modes = Record<ModeName, string>;
 
@@ -43,7 +46,9 @@ export function normalizeMode(name: ModeName, value: unknown): string | null {
   if (name === 'rtk' && typeof value === 'boolean') return value ? 'on' : 'off';
   const mode = String(value ?? '').trim().toLowerCase();
   if (!MODE_VALUES[name]?.has(mode)) return null;
-  return name === 'caveman' && mode === 'wenyan' ? 'wenyan-full' : mode;
+  if (name !== 'caveman') return mode;
+  const canonical = mode.replace(CAVEMAN_LEGACY_PREFIX, 'megacave');
+  return canonical === 'megacave' ? 'megacave-full' : canonical;
 }
 
 export function deriveLevel(modes: Modes | null | undefined): ComboLevel {
@@ -153,6 +158,14 @@ export function setSharedComboMode(name: ModeName, value: unknown): Readonly<Com
   return publish(normalizedState(modes));
 }
 
+export function setSharedComboModes(modes: { caveman?: unknown; rtk?: unknown; ponytail?: unknown }): Readonly<ComboState> {
+  return publish(normalizedState({
+    caveman: normalizeMode('caveman', modes.caveman) || 'off',
+    rtk: normalizeMode('rtk', modes.rtk) || 'off',
+    ponytail: normalizeMode('ponytail', modes.ponytail) || 'off',
+  }));
+}
+
 export function reconcileSharedComboEntries(entries: SessionEntry[] | null | undefined): Readonly<ComboState> {
   let modes: Modes = { ...COMBO_LEVELS.off };
   if (Array.isArray(entries)) {

package/extensions/shared/status.ts

@@ -17,6 +17,11 @@ export function formatStatus(state: StatusState): string {
   return `🧩 combo ${label}: 🪨caveman=${caveman.toUpperCase()} ⚡rtk=${rtk.toUpperCase()} 🦥ponytail=${ponytail.toUpperCase()}`;
 }
 
+// The string upstream's skill tells the model to relay for `/caveman status`.
+export function formatCavemanStatus(mode: string): string {
+  return `Caveman mode: ${mode && mode !== 'off' ? mode : 'unknown'}`;
+}
+
 // Stale ctx access throws, so never let it abort a mode restore.
 function statusUi(ctx: ExtensionCtx | undefined): UiApi | undefined {
   try {
@@ -34,7 +39,8 @@ let lastUi: UiApi | undefined;
 
 // Paint the host footer bar; same text on the same UI is skipped, a new ctx repaints it.
 export function announceStatus(ctx: ExtensionCtx | undefined): void {
-  const text = formatStatus(getSharedComboState());
+  const state = getSharedComboState();
+  const text = formatStatus(state);
   const ui = statusUi(ctx) ?? statusUi(remembered);
   if (statusUi(ctx)) remembered = ctx;
   if (!ui) return;
@@ -42,4 +48,5 @@ export function announceStatus(ctx: ExtensionCtx | undefined): void {
   lastText = text;
   lastUi = ui;
   ui.setStatus?.('tersio', text);
+  ui.setStatus?.('caveman', formatCavemanStatus(state.caveman));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "2.25.1",
+  "version": "2.25.3",
   "description": "✂️ Token saver and usage tracker for coding agents: terse Caveman replies, compact RTK shell output, lean Ponytail code calls, and a gain dashboard — one-command combo presets over one shared extension tree.",
   "keywords": [
     "token-saving",
@@ -21,10 +21,10 @@
   },
   "type": "module",
   "bin": {
-    "tersio": "tersio.js"
+    "tersio": "dist/tersio.js"
   },
   "exports": {
-    "./server": "./extensions/opencode/server.js"
+    "./server": "./dist/extensions/opencode/server.js"
   },
   "omp": {
     "name": "Tersio",
@@ -72,9 +72,9 @@
           "lite",
           "full",
           "ultra",
-          "wenyan-lite",
-          "wenyan-full",
-          "wenyan-ultra"
+          "megacave-lite",
+          "megacave-full",
+          "megacave-ultra"
         ],
         "default": "off"
       },
@@ -114,22 +114,23 @@
     }
   },
   "files": [
-    "tersio.js",
-    "cli/**/*.js",
+    "dist/**/*.js",
+    "dist/extensions/caveman-session/*.md",
     "dashboard/dist/**/*",
-    "extensions/**/*.js",
     "extensions/**/*.ts",
-    "extensions/caveman-session/rule.md"
+    "extensions/caveman-session/rule.md",
+    "extensions/caveman-session/rule-ultra.md",
+    "extensions/caveman-session/rule-megacave.md"
   ],
   "scripts": {
-    "clean": "rm -f tersio.js cli/*.js extensions/**/*.js && rm -rf dashboard/dist",
-    "build": "tsc && bun run build:dashboard",
+    "clean": "rm -rf dist dashboard/dist",
+    "build": "tsc && bun run build:dashboard && cp extensions/caveman-session/*.md dist/extensions/caveman-session/",
     "build:dashboard": "bun install --cwd dashboard/app --frozen-lockfile && bun run --cwd dashboard/app build",
     "prepublishOnly": "bun run build",
     "check": "tsc --noEmit",
     "verify": "bun install --frozen-lockfile && bun run build && bun run test",
-    "doctor": "node tersio.js --doctor",
-    "dry-run": "node tersio.js --dry-run --scope user --yes",
+    "doctor": "node dist/tersio.js --doctor",
+    "dry-run": "node dist/tersio.js --dry-run --scope user --yes",
     "lint": "oxlint cli extensions test tersio.ts",
     "lint:dashboard": "bun run --cwd dashboard/app lint",
     "lint:fix": "oxlint cli extensions test tersio.ts --fix",
@@ -141,6 +142,7 @@
   "devDependencies": {
     "@opencode/plugin": "^2.0.22",
     "@types/node": "^26.4.1",
+    "happy-dom": "^20.14.5",
     "oxlint": "^1.85.0",
     "typescript": "^7.0.2",
     "vitest": "^5.0.1"
@@ -148,6 +150,6 @@
   "dependencies": {
     "@clack/core": "^1.5.1",
     "@clack/prompts": "^1.8.0",
-    "@dietrichgebert/ponytail": "^4.10.0"
+    "@dietrichgebert/ponytail": "^4.12.0"
   }
 }

package/extensions/opencode/index.js

@@ -1,104 +0,0 @@
-// OpenCode plugin entry: maps its plugin API onto the shared ExtensionApi the mode extensions consume.
-import { execFile } from 'node:child_process';
-import { Plugin } from '@opencode/plugin';
-import cavemanSessionExtension from '../caveman-session/index.js';
-import rtkSessionExtension from '../rtk-session/index.js';
-import comboToggleExtension from '../combo-toggle/index.js';
-import tersioCommandsExtension from '../tersio-commands/index.js';
-export default Plugin.define({
-    id: 'tersio',
-    async setup(ctx) {
-        const entries = (await ctx.storage.get('entries')) ?? [];
-        const persist = () => { void ctx.storage.set('entries', entries).catch(() => { }); };
-        const stubCtx = () => ({
-            hasUI: false,
-            cwd: ctx.location.directory,
-            sessionManager: { getBranch: () => entries, getEntries: () => entries },
-        });
-        const commands = new Map();
-        const tools = new Map();
-        const beforeStart = [];
-        const inputHandlers = [];
-        const lifecycle = new Map();
-        const host = {
-            hostId: 'opencode',
-            setLabel() { },
-            registerCommand(name, config) { commands.set(name, config); },
-            registerTool(tool) { tools.set(tool.name, tool); },
-            appendEntry(type, data) { entries.push({ type: 'custom', customType: type, data }); persist(); },
-            exec: (cmd, args, opts) => new Promise((resolve) => {
-                execFile(cmd, args, { signal: opts?.signal, cwd: opts?.cwd }, (error, stdout, stderr) => {
-                    const code = error && typeof error.code === 'number' ? error.code : 0;
-                    resolve({ stdout: stdout ?? '', stderr: stderr ?? '', code, killed: !!error?.killed });
-                });
-            }),
-            cwd: ctx.location.directory,
-            on: (event, handler) => {
-                if (event === 'before_agent_start') {
-                    beforeStart.push(handler);
-                    return;
-                }
-                if (event === 'input') {
-                    inputHandlers.push(handler);
-                    return;
-                }
-                const list = lifecycle.get(event) ?? [];
-                list.push(handler);
-                lifecycle.set(event, list);
-            },
-        };
-        for (const extension of [cavemanSessionExtension, rtkSessionExtension, comboToggleExtension, tersioCommandsExtension])
-            extension(host);
-        // OpenCode has no session_start event surfaced to plugins, so restore once at setup.
-        for (const handler of lifecycle.get('session_start') ?? [])
-            await handler({}, stubCtx());
-        await ctx.command.transform((editor) => {
-            for (const [name, config] of commands) {
-                editor.add({
-                    name,
-                    description: config.description,
-                    execute: async (input) => {
-                        const text = typeof input.prompt?.text === 'string' ? input.prompt.text : '';
-                        const args = text.includes(' ') ? text.slice(text.indexOf(' ') + 1).trim() : '';
-                        await config.handler(args, stubCtx());
-                    },
-                });
-            }
-        });
-        await ctx.tool.transform((editor) => {
-            for (const tool of tools.values()) {
-                editor.add({
-                    name: tool.name,
-                    description: tool.description,
-                    input: tool.parameters,
-                    execute: async (input) => {
-                        const args = Array.isArray(input.args) ? (input.args) : [];
-                        const result = await tool.execute('t', { args }, undefined, undefined, stubCtx());
-                        return { content: result.content.map((part) => part.text).join('\n') };
-                    },
-                });
-            }
-        });
-        await ctx.session.hook('context', async (event) => {
-            const systemParts = event.system.map((part) => (part.type === 'text' ? part.text : '')).filter(Boolean);
-            for (const handler of beforeStart) {
-                const result = await handler({ systemPrompt: [...systemParts] }, stubCtx());
-                if (!result || typeof result !== 'object' || !('systemPrompt' in result))
-                    continue;
-                const parts = typeof result.systemPrompt === 'string'
-                    ? [result.systemPrompt]
-                    : Array.isArray(result.systemPrompt)
-                        ? result.systemPrompt
-                        : [];
-                for (const part of parts) {
-                    if (!systemParts.includes(part))
-                        event.system.push({ type: 'text', text: part });
-                }
-            }
-        });
-        await ctx.session.hook('prompt', (event) => {
-            for (const handler of inputHandlers)
-                void handler({ text: event.prompt.text, source: 'interactive' });
-        });
-    },
-});