@krtclcdy/tersio 2.20.1 → 2.22.0

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

@@ -12,7 +12,6 @@ import { CAVEMAN_REMOTE_RULE as CAVEMAN_REMOTE, RTK_RELEASE_API, fetchJson, find
 const IS_WINDOWS = process.platform === 'win32';
 const HOME = os.homedir();
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
-const PONYTAIL_NPM_SPEC = '@dietrichgebert/ponytail@latest';
 const PONYTAIL_LOCAL = path.join(HOME, '.omp', 'plugins', 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
 const RTK_BINARY = path.join(HOME, '.bun', 'bin', IS_WINDOWS ? 'rtk.exe' : 'rtk');
 const CAVEMAN_LOCAL = path.join(HOME, '.omp', 'agent', 'extensions', 'caveman-session', 'rule.md');
@@ -119,38 +118,22 @@ async function checkAddons(ctx) {
     return lines.join('\n');
 }
 async function updatePonytail(pi, ctx, dryRun = false) {
-    const pluginsDir = path.join(HOME, '.omp', 'plugins');
-    if (dryRun) {
-        const m = `Ponytail dry-run: would run \`npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund\` in ${pluginsDir}.`;
-        return report(ctx, m, 'info');
-    }
-    notify(ctx, 'Ponytail: ensuring plugin directory exists…', 'info');
-    try {
-        await fs.mkdir(pluginsDir, { recursive: true });
-    }
-    catch (e) {
-        const m = `Ponytail update failed: failed to create ${pluginsDir}: ${e.message}`;
-        return report(ctx, m, 'warning');
-    }
-    if (!pi.exec) {
-        const m = 'Ponytail update failed: extension host does not provide exec';
-        return report(ctx, m, 'warning');
-    }
-    notify(ctx, 'Ponytail: running npm install…', 'info');
-    let out = '';
+    // Bundled with tersio: no separate package to refresh. `tersio update`
+    // pulls the bundled copy with the CLI.
+    let localVer = null;
     try {
-        const r = await pi.exec('npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir });
-        out = [r.stdout, r.stderr].filter(Boolean).join('\n').trim();
-        if (r.code !== 0)
-            throw new Error(r.stderr || `npm exited ${r.code}`);
+        const raw = await readTextIfExists(PONYTAIL_LOCAL);
+        if (raw)
+            localVer = JSON.parse(raw).version ?? null;
     }
-    catch (e) {
-        const m = `Ponytail update failed: ${e.message}`;
-        return report(ctx, m, 'warning');
+    catch {
+        localVer = null;
     }
-    const m = `Ponytail update finished.${out ? `\n${out}` : ''}\n${RELOAD_MSG}`;
-    notify(ctx, 'Ponytail update finished. ' + RELOAD_MSG, 'info');
-    return m;
+    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');
 }
 async function updateRtk(ctx, dryRun = false) {
     let release;

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

@@ -29,7 +29,6 @@ const IS_WINDOWS = process.platform === 'win32';
 const HOME = os.homedir();
 
 const PONYTAIL_REMOTE = 'https://raw.githubusercontent.com/DietrichGebert/ponytail/main/package.json';
-const PONYTAIL_NPM_SPEC = '@dietrichgebert/ponytail@latest';
 const PONYTAIL_LOCAL = path.join(HOME, '.omp', 'plugins', 'node_modules', '@dietrichgebert', 'ponytail', 'package.json');
 const RTK_BINARY = path.join(HOME, '.bun', 'bin', IS_WINDOWS ? 'rtk.exe' : 'rtk');
 const CAVEMAN_LOCAL = path.join(HOME, '.omp', 'agent', 'extensions', 'caveman-session', 'rule.md');
@@ -165,35 +164,18 @@ async function checkAddons(ctx: AddonUpdaterCtx): Promise<string> {
 }
 
 async function updatePonytail(pi: AddonUpdaterPi, ctx: AddonUpdaterCtx, dryRun = false): Promise<string> {
-  const pluginsDir = path.join(HOME, '.omp', 'plugins');
-  if (dryRun) {
-    const m = `Ponytail dry-run: would run \`npm install ${PONYTAIL_NPM_SPEC} --save --no-audit --no-fund\` in ${pluginsDir}.`;
-    return report(ctx, m, 'info');
-  }
-  notify(ctx, 'Ponytail: ensuring plugin directory exists…', 'info');
-  try {
-    await fs.mkdir(pluginsDir, { recursive: true });
-  } catch (e) {
-    const m = `Ponytail update failed: failed to create ${pluginsDir}: ${(e as Error).message}`;
-    return report(ctx, m, 'warning');
-  }
-  if (!pi.exec) {
-    const m = 'Ponytail update failed: extension host does not provide exec';
-    return report(ctx, m, 'warning');
-  }
-  notify(ctx, 'Ponytail: running npm install…', 'info');
-  let out = '';
+  // Bundled with tersio: no separate package to refresh. `tersio update`
+  // pulls the bundled copy with the CLI.
+  let localVer: string | null = null;
   try {
-    const r = await pi.exec('npm', ['install', PONYTAIL_NPM_SPEC, '--save', '--no-audit', '--no-fund'], { cwd: pluginsDir });
-    out = [r.stdout, r.stderr].filter(Boolean).join('\n').trim();
-    if (r.code !== 0) throw new Error(r.stderr || `npm exited ${r.code}`);
-  } catch (e) {
-    const m = `Ponytail update failed: ${(e as Error).message}`;
-    return report(ctx, m, 'warning');
-  }
-  const m = `Ponytail update finished.${out ? `\n${out}` : ''}\n${RELOAD_MSG}`;
-  notify(ctx, 'Ponytail update finished. ' + RELOAD_MSG, 'info');
-  return m;
+    const raw = await readTextIfExists(PONYTAIL_LOCAL);
+    if (raw) localVer = (JSON.parse(raw) as { version?: string }).version ?? 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');
 }
 
 async function updateRtk(ctx: AddonUpdaterCtx, dryRun = false): Promise<string> {

package/extensions/lib/utils.js

@@ -1,9 +1,10 @@
 // Shared helpers for the installer and the AI add-ons updater.
 // Node built-ins only — this module must stay dependency-free.
 import { createHash } from 'node:crypto';
-import { createWriteStream } from 'node:fs';
+import { createWriteStream, existsSync, mkdirSync, renameSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import https from 'node:https';
+import os from 'node:os';
 import path from 'node:path';
 // Promise.withResolvers is Node 22+; the package supports Node 18+.
 // ponytail: swap for the built-in when engines bumps to >=22.
@@ -149,6 +150,30 @@ export async function readTextIfExists(p) {
         return null;
     }
 }
+// Tersio-owned data home: ~/.tersio (Windows: %USERPROFILE%\.tersio).
+// First use moves legacy ~/.omp/plugins/tersio-* files over, so existing
+// installs keep their history.
+const migratedTersioFiles = new Set();
+export function tersioHome() {
+    return path.join(os.homedir(), '.tersio');
+}
+export function tersioDataPath(name, legacy) {
+    const dest = path.join(tersioHome(), name);
+    if (!migratedTersioFiles.has(name)) {
+        migratedTersioFiles.add(name);
+        try {
+            if (!existsSync(dest)) {
+                const src = path.join(os.homedir(), '.omp', 'plugins', legacy);
+                if (existsSync(src)) {
+                    mkdirSync(tersioHome(), { recursive: true });
+                    renameSync(src, dest);
+                }
+            }
+        }
+        catch { /* best-effort; callers tolerate a missing file */ }
+    }
+    return dest;
+}
 export function normalizeRtkVersion(value) {
     return String(value || '').replace(/^rtk\s+/i, '').replace(/^v/i, '').trim();
 }

package/extensions/lib/utils.ts

@@ -2,9 +2,10 @@
 // Node built-ins only — this module must stay dependency-free.
 
 import { createHash } from 'node:crypto';
-import { createWriteStream } from 'node:fs';
+import { createWriteStream, existsSync, mkdirSync, renameSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import https from 'node:https';
+import os from 'node:os';
 import path from 'node:path';
 
 export interface HttpOptions {
@@ -157,6 +158,32 @@ export async function readTextIfExists(p: string): Promise<string | null> {
   try { return await fs.readFile(p, 'utf8'); } catch { return null; }
 }
 
+// Tersio-owned data home: ~/.tersio (Windows: %USERPROFILE%\.tersio).
+// First use moves legacy ~/.omp/plugins/tersio-* files over, so existing
+// installs keep their history.
+const migratedTersioFiles = new Set<string>();
+
+export function tersioHome(): string {
+  return path.join(os.homedir(), '.tersio');
+}
+
+export function tersioDataPath(name: string, legacy: string): string {
+  const dest = path.join(tersioHome(), name);
+  if (!migratedTersioFiles.has(name)) {
+    migratedTersioFiles.add(name);
+    try {
+      if (!existsSync(dest)) {
+        const src = path.join(os.homedir(), '.omp', 'plugins', legacy);
+        if (existsSync(src)) {
+          mkdirSync(tersioHome(), { recursive: true });
+          renameSync(src, dest);
+        }
+      }
+    } catch { /* best-effort; callers tolerate a missing file */ }
+  }
+  return dest;
+}
+
 export function normalizeRtkVersion(value: string | undefined): string {
   return String(value || '').replace(/^rtk\s+/i, '').replace(/^v/i, '').trim();
 }

package/extensions/shared/pricing.js

@@ -5,8 +5,8 @@
 // per-model table — list prices rot, the feed does not. Unknown models report
 // the default with known:false so the dashboard labels them honestly.
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
+import { tersioDataPath } from '../lib/utils.js';
 // Sonnet-class default for unpriced models; always paired with known:false.
 export const DEFAULT_PRICE = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2.5 };
 const LITELLM_URL = 'https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json';
@@ -18,7 +18,7 @@ export function pricesCachePath() {
     const override = process.env.TERSIO_PRICES_FILE;
     if (override)
         return override;
-    return path.join(os.homedir(), '.omp', 'plugins', 'tersio-prices.json');
+    return tersioDataPath('prices.json', 'tersio-prices.json');
 }
 export function pricesUrl() {
     return process.env.TERSIO_PRICES_URL || LITELLM_URL;

package/extensions/shared/pricing.ts

@@ -7,6 +7,7 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { tersioDataPath } from '../lib/utils.ts';
 
 export interface ModelPrice {
   input: number;
@@ -27,7 +28,7 @@ let refreshInflight: Promise<boolean> | null = null;
 export function pricesCachePath(): string {
   const override = process.env.TERSIO_PRICES_FILE;
   if (override) return override;
-  return path.join(os.homedir(), '.omp', 'plugins', 'tersio-prices.json');
+  return tersioDataPath('prices.json', 'tersio-prices.json');
 }
 
 export function pricesUrl(): string {

package/extensions/shared/usage-ledger.js

@@ -5,11 +5,12 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { tersioDataPath } from '../lib/utils.js';
 export function ledgerPath() {
     const override = process.env.TERSIO_USAGE_FILE;
     if (override)
         return override;
-    return path.join(os.homedir(), '.omp', 'plugins', 'tersio-usage.jsonl');
+    return tersioDataPath('usage.jsonl', 'tersio-usage.jsonl');
 }
 // Reset watermark: tersio-owned timestamp marking the last statistics reset.
 // Session transcripts and the RTK database are host/tool-owned and never
@@ -20,7 +21,7 @@ export function resetMarkerPath() {
     const override = process.env.TERSIO_RESET_FILE;
     if (override)
         return override;
-    return path.join(os.homedir(), '.omp', 'plugins', 'tersio-reset.json');
+    return tersioDataPath('reset.json', 'tersio-reset.json');
 }
 export function readResetWatermark() {
     try {

package/extensions/shared/usage-ledger.ts

@@ -5,6 +5,7 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { tersioDataPath } from '../lib/utils.ts';
 
 export type UsageKind = 'command' | 'toggle' | 'install' | 'update' | 'rtk-audit';
 
@@ -17,7 +18,7 @@ export interface UsageRow {
 export function ledgerPath(): string {
   const override = process.env.TERSIO_USAGE_FILE;
   if (override) return override;
-  return path.join(os.homedir(), '.omp', 'plugins', 'tersio-usage.jsonl');
+  return tersioDataPath('usage.jsonl', 'tersio-usage.jsonl');
 }
 
 // Reset watermark: tersio-owned timestamp marking the last statistics reset.
@@ -28,7 +29,7 @@ export function ledgerPath(): string {
 export function resetMarkerPath(): string {
   const override = process.env.TERSIO_RESET_FILE;
   if (override) return override;
-  return path.join(os.homedir(), '.omp', 'plugins', 'tersio-reset.json');
+  return tersioDataPath('reset.json', 'tersio-reset.json');
 }
 
 export function readResetWatermark(): number {

package/extensions/shared/usage-store.js

@@ -8,14 +8,14 @@
 // back to the live path. Never touches RTK's history.db or host transcripts.
 import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import { RECENT_LIMIT, canonicalModelId, classifySessionLine, codexSessionsDir, costOf, durOf, ingestSessionRow, newSessionAccum, sessionsDir, walkJsonl, } from './usage-ledger.js';
+import { tersioDataPath } from '../lib/utils.js';
 export function usageDbPath() {
     const override = process.env.TERSIO_USAGE_DB;
     if (override)
         return override;
-    return path.join(os.homedir(), '.omp', 'plugins', 'tersio-usage.db');
+    return tersioDataPath('usage.db', 'tersio-usage.db');
 }
 function esc(v) {
     return `'${v.replace(/'/g, "''")}'`;
@@ -129,8 +129,9 @@ function insertSql(file, r) {
         `${nullNum(r.d)},${r.cr},${r.cw},${nullNum(r.usd)},${esc(r.st)},` +
         `${nullNum(r.code)},${nullStr(r.note)},${esc(JSON.stringify(r.tools))});`;
 }
-// Incremental sync: unchanged transcripts are skipped via mtime+size, changed
-// ones are deleted and re-inserted, removed ones are dropped. True on success
+// Incremental sync: unchanged transcripts are skipped via mtime+size,
+// changed ones are deleted and re-inserted. Rows for deleted transcripts
+// are kept, so OMP session rotation never erases history. True on success
 // (including nothing-to-do), false when sqlite3 or disk is unavailable.
 export function syncUsageDb() {
     let db;
@@ -168,8 +169,7 @@ export function syncUsageDb() {
         if (!prev || prev.mtime !== entry.mtime || prev.size !== entry.size)
             changed.push(file);
     }
-    const removed = Object.keys(known).filter((p) => current[p] === undefined);
-    if (!changed.length && !removed.length)
+    if (!changed.length)
         return true;
     const chunks = [];
     let chunkBytes = 0;
@@ -193,7 +193,7 @@ export function syncUsageDb() {
             return true;
         return flush();
     };
-    for (const file of [...changed, ...removed]) {
+    for (const file of changed) {
         if (!push(`DELETE FROM messages WHERE file=${esc(file)};DELETE FROM files WHERE path=${esc(file)};`))
             return false;
     }

package/extensions/shared/usage-store.ts

@@ -22,12 +22,13 @@ import {
   sessionsDir,
   walkJsonl,
 } from './usage-ledger.ts';
+import { tersioDataPath } from '../lib/utils.ts';
 import type { RunStatus, SessionTokens } from './usage-ledger.ts';
 
 export function usageDbPath(): string {
   const override = process.env.TERSIO_USAGE_DB;
   if (override) return override;
-  return path.join(os.homedir(), '.omp', 'plugins', 'tersio-usage.db');
+  return tersioDataPath('usage.db', 'tersio-usage.db');
 }
 
 export interface StoredUsage {
@@ -172,8 +173,9 @@ function insertSql(file: string, r: StoredRow): string {
     `${nullNum(r.code)},${nullStr(r.note)},${esc(JSON.stringify(r.tools))});`;
 }
 
-// Incremental sync: unchanged transcripts are skipped via mtime+size, changed
-// ones are deleted and re-inserted, removed ones are dropped. True on success
+// Incremental sync: unchanged transcripts are skipped via mtime+size,
+// changed ones are deleted and re-inserted. Rows for deleted transcripts
+// are kept, so OMP session rotation never erases history. True on success
 // (including nothing-to-do), false when sqlite3 or disk is unavailable.
 export function syncUsageDb(): boolean {
   let db: string;
@@ -207,8 +209,7 @@ export function syncUsageDb(): boolean {
     const prev = known[file];
     if (!prev || prev.mtime !== entry.mtime || prev.size !== entry.size) changed.push(file);
   }
-  const removed = Object.keys(known).filter((p) => current[p] === undefined);
-  if (!changed.length && !removed.length) return true;
+  if (!changed.length) return true;
   const chunks: string[] = [];
   let chunkBytes = 0;
   const flush = (): boolean => {
@@ -228,7 +229,7 @@ export function syncUsageDb(): boolean {
     if (chunkBytes < 400_000) return true;
     return flush();
   };
-  for (const file of [...changed, ...removed]) {
+  for (const file of changed) {
     if (!push(`DELETE FROM messages WHERE file=${esc(file)};DELETE FROM files WHERE path=${esc(file)};`)) return false;
   }
   try {