@krtclcdy/tersio 1.0.2 → 1.0.4

package/extensions/combo-toggle/index.js

@@ -63,6 +63,16 @@ export default function comboToggleExtension(pi) {
         c.ui.setStatus("rtk", undefined);
         c.ui.setStatus("ponytail", undefined);
     }
+    // ponytail: same persistence as /combo — siblings (incl. upstream ponytail)
+    // restore from these entries, so the fallback must write them too or the
+    // preset evaporates on resume and ponytail never activates.
+    function persistPreset(level) {
+        const modes = COMBO_LEVELS[level];
+        pi.appendEntry?.("caveman-mode", { mode: modes.caveman });
+        pi.appendEntry?.("rtk-mode", { enabled: modes.rtk === "on" });
+        pi.appendEntry?.("ponytail-mode", { mode: modes.ponytail });
+        pi.appendEntry?.("combo-level", { level });
+    }
     function useState(state, ctx) {
         currentState = state;
         syncStatus(ctx);
@@ -99,12 +109,7 @@ export default function comboToggleExtension(pi) {
                 ctx?.ui?.notify?.(`Unknown combo level: ${arg}. Use: off | medium | balanced | max`, "warning");
                 return;
             }
-            const modes = COMBO_LEVELS[level];
-            // Persist per-extension state so they restore on session_start
-            pi.appendEntry?.("caveman-mode", { mode: modes.caveman });
-            pi.appendEntry?.("rtk-mode", { enabled: modes.rtk === "on" });
-            pi.appendEntry?.("ponytail-mode", { mode: modes.ponytail });
-            pi.appendEntry?.("combo-level", { level });
+            persistPreset(level);
             useState(setSharedComboLevel(level), ctx);
             ctx?.ui?.notify?.(`Combo ${level} applied: ${levelSummary(currentState)}`, "info");
             if (ctx?.reload)
@@ -122,6 +127,7 @@ export default function comboToggleExtension(pi) {
         if (getSharedComboState().level === "off" && !(ctx?.sessionManager?.getBranch?.() || ctx?.sessionManager?.getEntries?.() || []).length) {
             const fallback = readComboDefault();
             if (fallback !== "off") {
+                persistPreset(fallback);
                 useState(setSharedComboLevel(fallback), ctx);
                 ctx?.ui?.notify?.(`Combo default applied: ${fallback}`, "info");
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@krtclcdy/tersio",
-  "version": "1.0.2",
-  "description": "Amanai reward detector and three toggleable OMP extensions for terse replies, compact shell output, and minimal code decisions — with a manual updater and dry-run support.",
+  "version": "1.0.4",
+  "description": "Amanai reward detector and three toggleable OMP extensions for terse replies, compact shell output, and minimal code decisions \u2014 with a manual updater and dry-run support.",
   "keywords": [
     "omp",
     "tersio",
@@ -94,6 +94,18 @@
         "type": "boolean",
         "description": "RTK mode applied on session start when no session state exists",
         "default": false
+      },
+      "ponytailDefault": {
+        "type": "enum",
+        "description": "Ponytail mode applied on session start when no session state exists (follows combo preset unless overridden)",
+        "values": [
+          "off",
+          "lite",
+          "full",
+          "ultra",
+          "review"
+        ],
+        "default": "off"
       }
     }
   },

package/tersio.js

@@ -19,6 +19,14 @@ const { version: PACKAGE_VERSION } = createRequire(import.meta.url)("./package.j
 // Session-start mode defaults for fresh installs.
 const COMBO_DEFAULTS = { off: true, medium: true, balanced: true, max: true };
 const CAVEMAN_DEFAULTS = { off: true, lite: true, full: true, ultra: true, wenyan: true };
+// ponytail: Combo preset implies all three modes. Mirrors COMBO_LEVELS in
+// extensions/shared/session-state.ts (rtk as boolean here). Single source.
+const COMBO_PRESET_MODES = {
+    off: { caveman: "off", rtk: false, ponytail: "off" },
+    medium: { caveman: "lite", rtk: true, ponytail: "lite" },
+    balanced: { caveman: "full", rtk: true, ponytail: "full" },
+    max: { caveman: "ultra", rtk: true, ponytail: "ultra" },
+};
 function parseEnum(value, valid, flag) {
     if (value === undefined)
         return undefined;
@@ -84,9 +92,11 @@ Commands:
 
 Options:
   --scope user|project|both
-  --combo-default off|medium|balanced|max
-  --caveman-default off|lite|full|ultra|wenyan
-  --rtk-default on|off
+  --remove-ponytail (uninstall: also remove the Ponytail plugin)
+  --remove-rtk (uninstall: also remove the RTK binary)
+  --combo-default off|medium|balanced|max (implies caveman, rtk, ponytail)
+  --caveman-default off|lite|full|ultra|wenyan (override; default follows combo)
+  --rtk-default on|off (override; default follows combo)
   --yes, -y
   --dry-run
   --verbose
@@ -165,8 +175,8 @@ async function ensureExtensionInConfig(configPath, extensionPath, label, options
         console.log(`  [dry-run] would add ${label} to config.yml: ${normalizedPath}`);
         return true;
     }
-    // Handle "extensions: []" (empty YAML array)
-    const emptyArrayIdx = lines.findIndex((l) => /^\s*extensions\s*:\s*\[\s*\]\s*$/i.test(l));
+    // ponytail: omp ships "extensions: null"; appending list items under a null scalar breaks YAML parsing. Normalize null/~/[]/empty to a mapping key first.
+    const emptyArrayIdx = lines.findIndex((l) => /^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i.test(l));
     if (emptyArrayIdx !== -1) {
         lines[emptyArrayIdx] = "extensions:";
         lines.splice(emptyArrayIdx + 1, 0, line, "");
@@ -210,6 +220,8 @@ async function ensureExtensionAfterConfigEntry(configPath, extensionPath, afterP
             lines.push("extensions:", line, "");
         }
         else {
+            if (/^\s*extensions\s*:\s*(?:\[\s*\]|null|~)?\s*$/i.test(lines[extensionsIndex]))
+                lines[extensionsIndex] = "extensions:";
             lines.splice(extensionsIndex + 1, 0, line);
         }
     }
@@ -790,6 +802,8 @@ async function runUninstall(options = {}) {
     const extDir = path.join(HOME, ".omp", "agent", "extensions");
     const configPath = path.join(HOME, ".omp", "agent", "config.yml");
     const rtkBin = path.join(HOME, ".bun", "bin", IS_WINDOWS ? "rtk.exe" : "rtk");
+    const pluginsDir = path.join(HOME, ".omp", "plugins");
+    const ponytailPkgDir = path.join(pluginsDir, "node_modules", "@dietrichgebert", "ponytail");
     const targets = [
         path.join(extDir, "caveman-session"),
         path.join(extDir, "rtk-session"),
@@ -797,6 +811,8 @@ async function runUninstall(options = {}) {
         path.join(extDir, "combo-toggle"),
         path.join(extDir, "shared"),
         path.join(extDir, "amanai-reward"),
+        // Only consumed by ai-addons-updater (removed above); otherwise orphaned.
+        path.join(extDir, "lib"),
         // Legacy always-on combo helper; imports shared/session-state.js, so it
         // breaks with a module-not-found warning once the shared dir is removed.
         path.join(extDir, "aaa-combo-boot"),
@@ -805,6 +821,9 @@ async function runUninstall(options = {}) {
     for (const t of targets) {
         console.log(`  ${t}`);
     }
+    if (shouldRemovePonytail) {
+        console.log(`  ${ponytailPkgDir} (ponytail plugin package)`);
+    }
     if (shouldRemoveRtk) {
         console.log(`  ${rtkBin}`);
     }
@@ -851,8 +870,62 @@ async function runUninstall(options = {}) {
             }
         }
     }
+    // Remove the Ponytail plugin package the installer added (dep, files,
+    // lock entry); the config.yml entry was filtered above.
+    if (shouldRemovePonytail) {
+        const pluginsPkgPath = path.join(pluginsDir, "package.json");
+        const ponytailRaw = await readTextIfExists(pluginsPkgPath);
+        if (ponytailRaw) {
+            try {
+                const pkg = JSON.parse(ponytailRaw);
+                if (pkg.dependencies && "@dietrichgebert/ponytail" in pkg.dependencies) {
+                    if (shouldDryRun)
+                        console.log(`  [dry-run] would remove @dietrichgebert/ponytail from ${pluginsPkgPath}`);
+                    else {
+                        delete pkg.dependencies["@dietrichgebert/ponytail"];
+                        await fs.writeFile(pluginsPkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+                        console.log("  [write] Removed @dietrichgebert/ponytail from plugins/package.json");
+                    }
+                }
+            }
+            catch {
+                debug("Could not update plugins/package.json for ponytail");
+            }
+        }
+        try {
+            if (shouldDryRun)
+                console.log(`  [dry-run] would remove ${ponytailPkgDir}`);
+            else {
+                await fs.rm(ponytailPkgDir, { recursive: true, force: true });
+                console.log(`  [rm] ${ponytailPkgDir}`);
+                await fs.rm(path.dirname(ponytailPkgDir));
+                console.log(`  [rm] ${path.dirname(ponytailPkgDir)} (empty scope)`);
+            }
+        }
+        catch {
+            debug("Could not remove ponytail package dir (scope may hold other packages)");
+        }
+        const lockPath = path.join(pluginsDir, "omp-plugins.lock.json");
+        const lockRaw = await readTextIfExists(lockPath);
+        if (lockRaw) {
+            try {
+                const lock = JSON.parse(lockRaw);
+                if (lock.plugins && "@dietrichgebert/ponytail" in lock.plugins) {
+                    if (shouldDryRun)
+                        console.log(`  [dry-run] would remove @dietrichgebert/ponytail from ${lockPath}`);
+                    else {
+                        delete lock.plugins["@dietrichgebert/ponytail"];
+                        await fs.writeFile(lockPath, JSON.stringify(lock, null, 2) + "\n", "utf8");
+                        console.log(`  [write] Removed @dietrichgebert/ponytail from ${lockPath}`);
+                    }
+                }
+            }
+            catch {
+                debug("Could not update omp-plugins.lock.json for ponytail");
+            }
+        }
+    }
     // Remove our plugin registration from ~/.omp/plugins
-    const pluginsDir = path.join(HOME, ".omp", "plugins");
     const pluginsPkgPath = path.join(pluginsDir, "package.json");
     const pluginsPkgRaw = await readTextIfExists(pluginsPkgPath);
     if (pluginsPkgRaw) {
@@ -958,6 +1031,7 @@ function defaultProfile() {
         comboDefault: "off",
         cavemanDefault: "off",
         rtkDefault: false,
+        ponytailDefault: "off",
     };
 }
 function tty() {
@@ -965,29 +1039,51 @@ function tty() {
 }
 async function resolveProfile() {
     const profile = defaultProfile();
-    // Interactive prompt: only for a real user at a terminal, only when no
-    // default flags were given, and never for --apply-update runs.
+    // Single interactive prompt: the Combo preset implies all three modes.
+    // Only for a real user at a terminal, only when no default flags were
+    // given, and never for --apply-update runs.
     if (tty() && !profileFlagsGiven && !applyUpdate && (install || reinstall)) {
         const comboAnswer = (await ask("  Default Combo preset on session start? [off/medium/balanced/max] (off): ")).trim().toLowerCase();
         if (comboAnswer && comboAnswer in COMBO_DEFAULTS)
             profile.comboDefault = comboAnswer;
-        const cavemanAnswer = (await ask("  Default Caveman mode on session start? [off/lite/full/ultra/wenyan] (off): ")).trim().toLowerCase();
-        if (cavemanAnswer && cavemanAnswer in CAVEMAN_DEFAULTS)
-            profile.cavemanDefault = cavemanAnswer;
-        const rtkAnswer = (await ask("  Default RTK state on session start? [on/off] (off): ")).trim().toLowerCase();
-        if (rtkAnswer === "on" || rtkAnswer === "off")
-            profile.rtkDefault = rtkAnswer === "on";
-    }
-    // Explicit flags always win over the prompt.
+    }
+    // Explicit flags always win. Caveman/RTK flags override the Combo preset.
     if (comboDefaultFlag !== undefined)
         profile.comboDefault = comboDefaultFlag;
+    const preset = COMBO_PRESET_MODES[profile.comboDefault] ?? COMBO_PRESET_MODES.off;
+    profile.cavemanDefault = preset.caveman;
+    profile.rtkDefault = preset.rtk;
+    profile.ponytailDefault = preset.ponytail;
     if (cavemanDefaultFlag !== undefined)
         profile.cavemanDefault = cavemanDefaultFlag;
     if (rtkDefaultFlag !== undefined)
         profile.rtkDefault = rtkDefaultFlag === "on";
-    console.log(`  Profile: combo default=${profile.comboDefault} · caveman default=${profile.cavemanDefault} · rtk default=${profile.rtkDefault ? "on" : "off"}`);
+    console.log(`  Profile: combo default=${profile.comboDefault} (caveman=${profile.cavemanDefault} · rtk=${profile.rtkDefault ? "on" : "off"} · ponytail=${profile.ponytailDefault})`);
     return profile;
 }
+// ponytail: post-install guard. List entries under `extensions: null` break
+// OMP launch, so fail loudly here instead of at the next OMP start.
+async function validateConfigExtensions(agentDir, options) {
+    if (options.dryRun)
+        return;
+    const raw = await readTextIfExists(path.join(agentDir, "config.yml"));
+    if (!raw)
+        return;
+    const lines = raw.split("\n");
+    const keyIdx = lines.findIndex((l) => /^\s*extensions\s*:/i.test(l));
+    if (keyIdx === -1)
+        return;
+    const scalarNull = /^\s*extensions\s*:\s*(null|~|\[\s*\])\s*$/i.test(lines[keyIdx]);
+    const hasEntries = lines.slice(keyIdx + 1).some((l) => /^\s*-\s+\S/.test(l));
+    if (scalarNull && hasEntries) {
+        console.log("  [fail] config.yml lists extensions under `extensions: null` — OMP will fail to launch.");
+        console.log("  [hint] Replace the `extensions: null` line with `extensions:`, then reinstall.");
+        process.exitCode = 1;
+    }
+    else {
+        console.log("  [ok] config.yml extensions key valid");
+    }
+}
 // Persist the profile as omp plugin settings so `omp plugin config get`
 // reflects the choice and the extensions pick it up on session start.
 async function writePluginSettings(profile, options) {
@@ -1009,6 +1105,7 @@ async function writePluginSettings(profile, options) {
     settings.comboDefault = profile.comboDefault;
     settings.cavemanDefault = profile.cavemanDefault;
     settings.rtkDefault = profile.rtkDefault;
+    settings.ponytailDefault = profile.ponytailDefault;
     config.settings[PACKAGE_NAME] = settings;
     if (options.dryRun) {
         console.log(`  [dry-run] would write plugin settings (${PACKAGE_NAME}) to ${lockPath}`);
@@ -1120,6 +1217,7 @@ async function main() {
         await stepAmanaiReward(userExtDir, options, selfPlugin);
         if (selfPlugin)
             await writePluginSettings(profile, options);
+        await validateConfigExtensions(userDir, options);
     }
     if (scope === "2" || scope === "3") {
         console.log("\n--- Project-level install ---");