@krtclcdy/tersio 2.24.0 → 2.25.0

package/cli/interactive.js

@@ -1,6 +1,6 @@
 // cli/interactive.ts — TTY layer: readline, Clack spinners, selects, task phases.
 import readline from 'node:readline';
-import { cancel as clackCancel, confirm as clackConfirm, select as clackSelect, spinner as clackSpinner, tasks as clackTasks } from '@clack/prompts';
+import { cancel as clackCancel, confirm as clackConfirm, log as clackLog, select as clackSelect, spinner as clackSpinner, tasks as clackTasks } from '@clack/prompts';
 import { execP } from './common.js';
 const RL = readline.createInterface({ input: process.stdin, output: process.stdout });
 let rlOpen = true;
@@ -26,13 +26,11 @@ function tty() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
 let spinnerDepth = 0;
-// Run async work under a TTY-only timer spinner. The spinner is cleared before
-// the caller prints its normal result line, preserving locked output shapes.
+// Run async work under a TTY-only timer spinner. The spinner is cleared before the caller prints its normal result line, preserving locked output shapes.
 async function withInteractiveSpinner(message, work) {
     if (!tty() || spinnerDepth > 0)
         return work(() => { });
-    // Clack manages stdin itself. Close the legacy question interface before its
-    // first use; non-interactive callers never reach this branch.
+    // Clack manages stdin itself. Close the legacy question interface before its first use; non-interactive callers never reach this branch.
     closeRL();
     const active = clackSpinner({ indicator: 'timer' });
     active.start(message);
@@ -49,26 +47,33 @@ async function askInteractiveChoice(message, options, initialValue) {
     if (!tty())
         return { status: 'unavailable' };
     closeRL();
-    const choice = await clackSelect({ message, options, initialValue });
-    if (typeof choice !== 'string') {
-        clackCancel('Aborted.');
-        return { status: 'cancelled' };
+    try {
+        const choice = await clackSelect({ message, options, initialValue });
+        if (typeof choice !== 'string') {
+            clackCancel('Aborted.');
+            return { status: 'cancelled' };
+        }
+        return { status: 'selected', value: choice };
+    }
+    finally {
     }
-    return { status: 'selected', value: choice };
 }
 async function askInteractiveConfirm(message, initialValue = true) {
     if (!tty())
         return { status: 'unavailable' };
     closeRL();
-    const answer = await clackConfirm({ message, initialValue });
-    if (typeof answer !== 'boolean') {
-        clackCancel('Aborted.');
-        return { status: 'cancelled' };
+    try {
+        const answer = await clackConfirm({ message, initialValue });
+        if (typeof answer !== 'boolean') {
+            clackCancel('Aborted.');
+            return { status: 'cancelled' };
+        }
+        return { status: 'confirmed', value: answer };
+    }
+    finally {
     }
-    return { status: 'confirmed', value: answer };
 }
-// Confirm a destructive run: a Clack dialog at a terminal, a plain prompt in a
-// pipe or script. False means the user declined or aborted.
+// Confirm a destructive run: a Clack dialog at a terminal, a plain prompt in a pipe or script. False means the user declined or aborted.
 async function confirmDestructive(message) {
     if (tty()) {
         closeRL();
@@ -93,17 +98,56 @@ async function confirmDestructive(message) {
     }
     return true;
 }
-// Run collecting work under one TTY-only Clack task. Callers print after the
-// task completes, keeping normal output out of the spinner animation.
+// Run collecting work under one TTY-only Clack task. Callers print after the task completes, keeping normal output out of the spinner animation.
 async function runInteractivePhase(title, collect) {
     if (!tty())
         return collect();
     closeRL();
     let result;
-    await clackTasks([{ title, task: async () => { result = await collect(); } }]);
+    try {
+        await clackTasks([{ title, task: async () => { result = await collect(); } }]);
+    }
+    finally {
+    }
+    return result;
+}
+const TAG_KIND = {
+    fail: 'error', warn: 'warn', hint: 'info', ok: 'success', note: 'message',
+    write: 'step', rm: 'step', migrate: 'step', skip: 'info', 'dry-run': 'info',
+};
+function sayTagged(line) {
+    const m = /^\s*\[([\w-]+)\]\s?([\s\S]*)$/.exec(line);
+    const kind = (m && TAG_KIND[m[1]]) || 'info';
+    if (tty() && m)
+        clackLog[kind](m[2]);
+    else
+        console.log(line);
+}
+// One live-updating task line instead of a spinner per step.
+async function withInteractiveTask(title, work) {
+    if (!tty())
+        return work(() => { });
+    closeRL();
+    let result;
+    const spin = clackSpinner();
+    spin.start(title);
+    try {
+        result = await work((message) => spin.message(message));
+        spin.stop('done');
+    }
+    catch (e) {
+        spin.error(shortSpinnerError(e));
+        throw e;
+    }
+    finally {
+    }
     return result;
 }
+function shortSpinnerError(e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return (msg.split('\n')[0] || 'failed').slice(0, 120);
+}
 async function execNetwork(label, cmd, args, opts = {}) {
     return withInteractiveSpinner(label, () => execP(cmd, args, opts));
 }
-export { ask, closeRL, tty, withInteractiveSpinner, execNetwork, askInteractiveChoice, askInteractiveConfirm, confirmDestructive, runInteractivePhase, };
+export { ask, closeRL, tty, withInteractiveSpinner, withInteractiveTask, execNetwork, sayTagged, askInteractiveChoice, askInteractiveConfirm, confirmDestructive, runInteractivePhase, };

package/cli/manifest.js

@@ -1,14 +1,17 @@
-// cli/manifest.ts — the one list of what an install writes into a host's
-// extension tree. The installer, `doctor --fix extensions`, the doctor's
-// per-host tree row, and the loadability test all read it, so none of them
-// can drift from what actually ships.
+// Single list of install writes, shared by installer, doctor, and tests.
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 export const EXT_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'extensions');
+/** Root entrypoint OpenCode resolves for the installed tree; re-exports the versioned entry beside it. Built by join so the path never reads as a relative import (repo-integrity scans literals). */
+const SERVER_SPEC = `./${['opencode', 'server.ts'].join('/')}`;
+export const OPENCODE_SERVER_SHIM = `// Generated by \`tersio install --host opencode\`: OpenCode resolves <pluginDir>/server.ts.
+export { default } from "${SERVER_SPEC}";
+`;
 /** Every file in the tree, as paths relative to the extensions directory. */
 export const TREE_FILES = [
     'shared/host.ts',
     'shared/session-state.ts',
+    'shared/status.ts',
     'shared/types.ts',
     'shared/plugin-settings.ts',
     'shared/usage-ledger.ts',
@@ -21,6 +24,7 @@ export const TREE_FILES = [
     'combo-toggle/index.ts',
     'tersio-commands/index.ts',
     'ai-addons-updater/index.ts',
+    'opencode/server.ts',
 ];
 export function sourcePath(relative) {
     return path.join(EXT_DIR, ...relative.split('/'));

package/cli/profile.js

@@ -1,14 +1,20 @@
-// cli/profile.ts — session-start defaults profile (combo/caveman/rtk/ponytail)
-// plus the display-currency default for usage/dashboard reports.
-// Stored in ~/.tersio/settings.json, which every host reads. Extracted from
-// cli/install.ts so both install and settings share it.
-import { existsSync, promises as fs } from 'node:fs';
+// cli/profile.ts — session-start defaults and the display-currency default,
+import { existsSync, promises as fs, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { CAVEMAN_DEFAULTS, COMBO_PRESET_MODES, PACKAGE_NAME, PONYTAIL_DEFAULTS, verbose, } from './common.js';
 import os from 'node:os';
 import { DEFAULT_CURRENCY, isCurrencyCode } from './currency.js';
 import { readTextIfExists } from '../extensions/lib/utils.js';
 import { tersioSettingsFile } from '../extensions/shared/plugin-settings.js';
+function readTextIfExistsSync(file) {
+    try {
+        return existsSync(file) ? readFileSync(file, 'utf8') : null;
+    }
+    catch {
+        return null;
+    }
+}
+export const BACKUP_SCHEDULES = new Set(['manual', 'daily', 'weekly', 'monthly']);
 function defaultProfile() {
     return {
         comboDefault: 'off',
@@ -16,18 +22,20 @@ function defaultProfile() {
         rtkDefault: false,
         ponytailDefault: 'off',
         currency: DEFAULT_CURRENCY,
+        backupSchedule: 'monthly',
+        subagentMarkers: [],
     };
 }
-// Stored profile: ~/.tersio/settings.json. An install that predates that file
-// kept the same values as OMP plugin settings, so seed from there once and
-// never lose a user's choice.
-async function storedProfile() {
+// Seed once from OMP plugin settings so a pre-~/.tersio install keeps its values. Sync: awaiting let piped stdin arrive before `ask()` attached, so a scripted answer was swallowed and a destructive confirm defaulted to abort.
+function storedProfileSync() {
     const base = defaultProfile();
-    const stored = (await readTextIfExists(tersioSettingsFile())) !== null
-        ? parseStored(await readTextIfExists(tersioSettingsFile()))
-        : parseStored(await readTextIfExists(legacyOmpLockPath()));
+    const stored = parseStored(readTextIfExistsSync(tersioSettingsFile()) ?? readTextIfExistsSync(legacyOmpLockPath()));
     if (!stored)
         return base;
+    applyStored(base, stored);
+    return base;
+}
+function applyStored(base, stored) {
     if (typeof stored.comboDefault === 'string' && stored.comboDefault in COMBO_PRESET_MODES)
         base.comboDefault = stored.comboDefault;
     if (typeof stored.cavemanDefault === 'string' && CAVEMAN_DEFAULTS.has(stored.cavemanDefault))
@@ -39,7 +47,16 @@ async function storedProfile() {
     if (typeof stored.currency === 'string' && isCurrencyCode(stored.currency.trim().toUpperCase())) {
         base.currency = stored.currency.trim().toUpperCase();
     }
-    return base;
+    if (typeof stored.backupSchedule === 'string' && BACKUP_SCHEDULES.has(stored.backupSchedule)) {
+        base.backupSchedule = stored.backupSchedule;
+    }
+    if (Array.isArray(stored.subagentMarkers)) {
+        // An empty marker would match every turn.
+        base.subagentMarkers = stored.subagentMarkers.filter((m) => typeof m === 'string' && m.trim() !== '');
+    }
+}
+async function storedProfile() {
+    return storedProfileSync();
 }
 function legacyOmpLockPath() {
     const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
@@ -63,8 +80,7 @@ function parseStored(raw) {
         return null;
     }
 }
-// Persist the profile where every host reads it. `omp plugin config get` no
-// longer reports it; `tersio settings` does.
+// Persist the profile where every host reads it. `omp plugin config get` no longer reports it; `tersio settings` does.
 async function writePluginSettings(profile, options) {
     const file = tersioSettingsFile();
     const values = {
@@ -75,6 +91,8 @@ async function writePluginSettings(profile, options) {
         rtkDefault: profile.rtkDefault,
         ponytailDefault: profile.ponytailDefault,
         currency: profile.currency,
+        backupSchedule: profile.backupSchedule,
+        ...(profile.subagentMarkers.length > 0 ? { subagentMarkers: profile.subagentMarkers } : {}),
     };
     if (options.dryRun) {
         if (verbose && !options.quiet)
@@ -88,4 +106,19 @@ async function writePluginSettings(profile, options) {
 function formatProfile(profile) {
     return `combo=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? 'on' : 'off'} · ponytail=${profile.ponytailDefault}) · currency=${profile.currency}`;
 }
-export { defaultProfile, formatProfile, storedProfile, writePluginSettings };
+export { defaultProfile, formatProfile, storedProfile, storedProfileSync, writePluginSettings };
+/** The status line the extensions print, read from the persisted profile. */
+export function formatCliStatus(profile) {
+    const { comboDefault, cavemanDefault, rtkDefault, ponytailDefault } = profile;
+    if (comboDefault === 'off' && cavemanDefault === 'off' && !rtkDefault && ponytailDefault === 'off') {
+        return '🧩 combo OFF';
+    }
+    const preset = COMBO_PRESET_MODES[comboDefault];
+    const isPreset = preset !== undefined
+        && preset.caveman === cavemanDefault
+        && preset.rtk === rtkDefault
+        && preset.ponytail === ponytailDefault;
+    const level = isPreset ? comboDefault.toUpperCase() : 'CUSTOM';
+    const rtk = rtkDefault ? 'ON' : 'OFF';
+    return `🧩 combo ${level}: 🪨caveman=${cavemanDefault.toUpperCase()} ⚡rtk=${rtk} 🦥ponytail=${ponytailDefault.toUpperCase()}`;
+}

package/cli/reset.js

@@ -1,10 +1,6 @@
-// cli/reset.ts — clear tersio-owned statistics: the usage ledger plus a reset
-// watermark that filters session-derived and RTK-metered rows out of every
-// derived view. Session transcripts (~/.omp/agent/sessions) and the RTK
-// database are host/tool-owned and are never touched; the watermark only
-// changes what tersio shows.
+// Clears tersio-owned stats only; transcripts and RTK data stay.
 import { dryRun, yes } from './common.js';
-import { confirmDestructive } from './interactive.js';
+import { confirmDestructive, sayTagged } from './interactive.js';
 import { clearUsageLedger, importSessionTokens, ledgerPath, markReset, readUsage, sessionsDir } from '../extensions/shared/usage-ledger.js';
 import { clearUsageDb, usageDbPath } from '../extensions/shared/usage-store.js';
 import { readRtkGain, rtkDbPath } from '../extensions/shared/rtk-gain.js';
@@ -29,7 +25,7 @@ async function runReset() {
     const cleared = clearUsageLedger();
     const dbCleared = clearUsageDb();
     const ts = markReset();
-    console.log(`[ok] reset — removed ${cleared} usage rows${dbCleared ? ' + usage.db' : ''}; statistics view starts at ${new Date(ts).toISOString()}`);
+    sayTagged(`[ok] reset — removed ${cleared} usage rows${dbCleared ? ' + usage.db' : ''}; statistics view starts at ${new Date(ts).toISOString()}`);
     return true;
 }
 export { runReset };

package/cli/rtk-wiring.js

@@ -1,9 +1,4 @@
-// cli/rtk-wiring.ts — wire the installed rtk binary into OMP.
-// `rtk init -g --agent omp` writes rtk's tool_call extension to
-// ~/.omp/agent/extensions/rtk.ts but does not register it, and OMP loads only
-// listed extensions, so we add the path to config.yml. Every rewritten bash
-// call then lands in rtk's history.db. Fail-open: a failed wire only downgrades
-// to manual `rtk` prefixing. No cli/common.ts import (argv side effects).
+// OMP loads only listed extensions, so register rtk's path; fail-open.
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -31,25 +26,39 @@ function execFileP(cmd, args, timeout) {
         });
     });
 }
-// Idempotent: rtk rewrites its file on every init run.
-export async function wireRtkOmp(rtkBin, options = {}) {
+async function runWire(rtkBin, spec, options) {
     if (!options.dryRun)
-        debugWire(options, 'Wiring rtk → OMP (bash tool_call rewrite)…');
+        debugWire(options, `Wiring rtk → ${spec.host} (${spec.mechanism} rewrite)…`);
     if (options.dryRun)
         return true;
-    const wired = await runRtkInit(rtkBin, options);
-    if (!wired)
+    try {
+        await tryRtkInit(rtkBin, spec.initArgs);
+    }
+    catch (e) {
+        console.log(`  [warn] could not wire rtk → ${spec.host}: ${shortWiringError(e)}`);
+        console.log(`  [hint] Manual: ${spec.hint}`);
+        return false;
+    }
+    return true;
+}
+export async function wireRtkOmp(rtkBin, options = {}) {
+    if (!(await runWire(rtkBin, { host: 'OMP', mechanism: 'bash tool_call', initArgs: ['init', '-g', '--agent', 'omp'], hint: 'rtk init -g --agent omp (needs rtk >= 0.49)' }, options)))
         return false;
     await ensureRtkInConfig(options);
     return true;
 }
+export async function wireRtkOpencode(rtkBin, options = {}) {
+    return runWire(rtkBin, { host: 'OpenCode', mechanism: 'tool.execute.before', initArgs: ['init', '-g', '--opencode'], hint: 'rtk init -g --opencode' }, options);
+}
+export async function wireRtkPi(rtkBin, options = {}) {
+    return runWire(rtkBin, { host: 'pi', mechanism: 'bash tool_call', initArgs: ['init', '-g', '--agent', 'pi'], hint: 'rtk init -g --agent pi' }, options);
+}
 // The rtk.ts path rtk init writes (OMP_AGENT_DIR inlined; see header note).
 function rtkExtensionPath() {
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
     return path.join(home, '.omp', 'agent', 'extensions', 'rtk.ts');
 }
-// Append rtk.ts after the existing entries (or create the key) so the wire
-// takes effect on the next OMP start.
+// Append rtk.ts after the existing entries (or create the key) so the wire takes effect on the next OMP start.
 export async function ensureRtkInConfig(options) {
     const home = process.env.HOME || process.env.USERPROFILE || os.homedir();
     const configPath = path.join(home, '.omp', 'agent', 'config.yml');
@@ -86,26 +95,14 @@ export async function ensureRtkInConfig(options) {
         console.log(`  [warn] could not register rtk in config.yml: ${e.message}`);
     }
 }
-async function runRtkInit(rtkBin, options) {
+async function tryRtkInit(rtkBin, initArgs) {
     try {
-        await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-        debugWire(options, 'rtk OMP extension wired');
-        return true;
+        await execFileP(rtkBin, initArgs, 30000);
+        return;
     }
-    catch (first) {
-        // A fresh binary can lose its first exec to macOS Gatekeeper, so settle and
-        // retry once before reporting failure.
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        try {
-            await execFileP(rtkBin, ['init', '-g', '--agent', 'omp'], 30000);
-            debugWire(options, 'rtk OMP extension wired');
-            return true;
-        }
-        catch (e) {
-            void first;
-            console.log(`  [warn] could not wire rtk → OMP: ${shortWiringError(e)}`);
-            console.log('  [hint] Manual: rtk init -g --agent omp (needs rtk >= 0.49)');
-            return false;
-        }
+    catch {
+        // A fresh binary can lose its first exec to macOS Gatekeeper: settle, then retry once.
     }
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await execFileP(rtkBin, initArgs, 30000);
 }

package/cli/settings.js

@@ -1,14 +1,10 @@
-// cli/settings.ts — view/edit session-start defaults (combo/caveman/rtk/ponytail)
-// plus the display-currency default for usage/dashboard reports.
-// Non-interactive: `tersio settings --combo-default balanced` (plus per-mode
-// override flags and --currency). Interactive: clack selects seeded from the
-// stored profile.
+// cli/settings.ts — view/edit session-start defaults and the display currency.
 import path from 'node:path';
-import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, } from './common.js';
+import { CAVEMAN_DEFAULTS, COMBO_DEFAULTS, COMBO_PRESET_MODES, OMP_PLUGINS_DIR, PACKAGE_NAME, PONYTAIL_DEFAULTS, cavemanDefaultFlag, comboDefaultFlag, currency, currencyGiven, diagScheduleFlag, dryRun, ponytailDefaultFlag, profileFlagsGiven, rtkDefaultFlag, settingArg, subagentMarkerFlags, subagentMarkersGiven, } from './common.js';
 import { CURRENCY_CODES } from './currency.js';
 import { textTable } from './usage.js';
-import { askInteractiveChoice, closeRL, tty } from './interactive.js';
-import { formatProfile, storedProfile, writePluginSettings } from './profile.js';
+import { ask, askInteractiveChoice, closeRL, tty } from './interactive.js';
+import { formatCliStatus, formatProfile, storedProfile, writePluginSettings } from './profile.js';
 import { readDiagSchedule, setDiagSchedule } from './dashboard.js';
 function applyFlags(base) {
     const next = { ...base };
@@ -24,6 +20,8 @@ function applyFlags(base) {
         next.rtkDefault = rtkDefaultFlag === 'on';
     if (ponytailDefaultFlag !== undefined)
         next.ponytailDefault = ponytailDefaultFlag;
+    if (subagentMarkersGiven)
+        next.subagentMarkers = subagentMarkerFlags;
     if (currencyGiven)
         next.currency = currency;
     return next;
@@ -44,6 +42,8 @@ async function askProfile(current) {
         rtkDefault: preset.rtk,
         ponytailDefault: preset.ponytail,
         currency: current.currency,
+        backupSchedule: current.backupSchedule,
+        subagentMarkers: current.subagentMarkers,
     };
     const caveman = await askInteractiveChoice('Caveman default', [...CAVEMAN_DEFAULTS].map((v) => ({
         value: v, label: v,
@@ -70,8 +70,26 @@ async function askProfile(current) {
     if (cur.status !== 'selected')
         return null;
     next.currency = cur.value;
+    const markers = await askSubagentMarkers(next.subagentMarkers);
+    if (markers === null)
+        return null;
+    next.subagentMarkers = markers;
     return next;
 }
+// One marker per line; an empty line ends the list. Null aborts.
+async function askSubagentMarkers(current) {
+    console.log('  Subagent prompt markers (one per line, empty line to finish).');
+    if (current.length > 0)
+        console.log(`  Current: ${current.join(' | ')}`);
+    const entered = [];
+    for (;;) {
+        const line = (await ask(`  marker ${entered.length + 1}: `)).trim();
+        if (line === '')
+            break;
+        entered.push(line);
+    }
+    return entered;
+}
 async function askDiagSchedule(current) {
     const picked = await askInteractiveChoice('Diagnosis auto-check', [
         { value: 'manual', label: 'manual', hint: 'check on open' },
@@ -83,12 +101,11 @@ async function askDiagSchedule(current) {
         return null;
     return picked.value;
 }
-const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis'];
+const SETTING_NAMES = ['combo', 'caveman', 'rtk', 'ponytail', 'currency', 'diagnosis', 'markers'];
 function settingsUsage() {
-    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--dry-run]');
+    console.log('  Usage: tersio settings [combo|caveman|rtk|ponytail|currency|diagnosis|markers] [--combo-default off|medium|balanced|max] [--caveman-default off|lite|full|ultra|wenyan-lite|wenyan-full|wenyan-ultra] [--rtk-default on|off] [--ponytail-default off|lite|full|ultra] [--currency USD|PHP|EUR|GBP|JPY|KRW|SGD|AUD|CAD|INR] [--diag-schedule manual|daily|weekly|monthly] [--subagent-marker <text>]... [--dry-run]');
 }
-// Single-setting jump: `tersio settings diagnosis` prompts only that value
-// instead of walking the whole chain. Returns false when aborted.
+// Single-setting jump: `tersio settings diagnosis` prompts only that value instead of walking the whole chain. Returns false when aborted.
 async function runSingleSetting(name, current, nextDiag) {
     const next = { ...current };
     let diag = nextDiag;
@@ -153,6 +170,13 @@ async function runSingleSetting(name, current, nextDiag) {
             diag = picked;
             break;
         }
+        case 'markers': {
+            const markers = await askSubagentMarkers(next.subagentMarkers);
+            if (markers === null)
+                return null;
+            next.subagentMarkers = markers;
+            break;
+        }
         default: {
             console.error(`[fail] Invalid setting: ${name}. Valid: ${SETTING_NAMES.join(', ')}`);
             process.exit(1);
@@ -162,15 +186,14 @@ async function runSingleSetting(name, current, nextDiag) {
 }
 function printSettingsTable(current) {
     console.log('\n=== Tersio Settings ===');
-    // Currency lives here no longer: the dashboard owns displaying and
-    // persisting it (its picker POSTs to /currency); settings can still set
-    // the stored default via --currency or the prompt below.
+    // The dashboard owns displaying currency; settings only sets the default.
     const rows = [
         ['combo', current.comboDefault, [...COMBO_DEFAULTS].join(' | ')],
         ['caveman', current.cavemanDefault, [...CAVEMAN_DEFAULTS].join(' | ')],
         ['rtk', current.rtkDefault ? 'on' : 'off', 'on | off'],
         ['ponytail', current.ponytailDefault, [...PONYTAIL_DEFAULTS].join(' | ')],
         ['diagnosis', readDiagSchedule(), 'manual | daily | weekly | monthly'],
+        ['markers', current.subagentMarkers.length === 0 ? 'default' : current.subagentMarkers.join(' | '), 'host subagent prompt text'],
     ];
     for (const l of textTable(['Setting', 'Current', 'Valid values'], rows, [false, false, false], 64)) {
         console.log(l);
@@ -206,7 +229,7 @@ async function runSettings() {
         next = single.profile;
         nextDiag = single.diag;
     }
-    else if (profileFlagsGiven || currencyGiven || diagScheduleFlag !== undefined) {
+    else if (profileFlagsGiven || currencyGiven || diagScheduleFlag !== undefined || subagentMarkersGiven) {
         next = applyFlags(current);
     }
     else if (tty()) {
@@ -237,6 +260,7 @@ async function runSettings() {
     }
     await writePluginSettings(next, {});
     setDiagSchedule(nextDiag);
+    console.log(`  ${formatCliStatus(next)}`);
     console.log(`  Defaults: ${formatProfile(next)} · diagnosis=${nextDiag}`);
     console.log('  Applies to fresh sessions only — anything persisted with /combo, /caveman, or /rtk wins.');
     console.log('  Currency applies to usage/dashboard reports; --currency overrides it per run.');