instar 0.28.102 → 0.28.104

package/dist/commands/jobMigrate.js

@@ -0,0 +1,292 @@
+/**
+ * jobMigrate — Phase 3 migration script for INSTAR-JOBS-AS-AGENTMD spec.
+ *
+ * Reads `.instar/jobs.json` and produces:
+ *   - `.instar/jobs/instar/<slug>.md` for default jobs whose body matched
+ *     the shipped template via normalized SHA-256
+ *   - `.instar/jobs/user/<slug>.md` for user-authored jobs and forked
+ *     defaults (body did not match the template, or slug not in the lock-file)
+ *   - `.instar/jobs/schedule/<slug>.json` per-slug manifests
+ *   - `.instar/jobs.json.pre-migrate-<ts>` rollback anchor
+ *
+ * Body match algorithm: normalize then sha256 (CRLF→LF, ZWSP/ZWNJ/ZWJ/BOM
+ * strip, trimEnd + single trailing newline, sha256). Near-miss is
+ * Levenshtein distance > 75% of max length — the operator gets a three-
+ * choice prompt (interactive) or `--default-action` value (non-interactive).
+ *
+ * `--abandon` writes `.instar/jobs/.migration-abandoned.json` and deletes
+ * `.instar/jobs/schedule/`, leaving `jobs.json` intact for full rollback.
+ *
+ * Idempotent. Safe to run multiple times. The release-cut gate refuses to
+ * delete `jobs.json` until `.instar/jobs/.migration-complete.json` exists.
+ *
+ * Spec: docs/specs/INSTAR-JOBS-AS-AGENTMD-SPEC.md §Migration script.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import crypto from 'node:crypto';
+import yaml from 'js-yaml';
+import { SafeFsExecutor } from '../core/SafeFsExecutor.js';
+const ZERO_WIDTH_RE = /[​-‍]/g;
+function normalize(s) {
+    return s.replace(/\r\n/g, '\n').replace(ZERO_WIDTH_RE, '').trimEnd() + '\n';
+}
+function sha256(s) {
+    return 'sha256:' + crypto.createHash('sha256').update(s).digest('hex');
+}
+function levenshtein(a, b) {
+    if (a === b)
+        return 0;
+    if (!a.length)
+        return b.length;
+    if (!b.length)
+        return a.length;
+    const matrix = Array.from({ length: a.length + 1 }, () => new Array(b.length + 1));
+    for (let i = 0; i <= a.length; i++)
+        matrix[i][0] = i;
+    for (let j = 0; j <= b.length; j++)
+        matrix[0][j] = j;
+    for (let i = 1; i <= a.length; i++) {
+        for (let j = 1; j <= b.length; j++) {
+            if (a[i - 1] === b[j - 1])
+                matrix[i][j] = matrix[i - 1][j - 1];
+            else
+                matrix[i][j] = 1 + Math.min(matrix[i - 1][j], matrix[i][j - 1], matrix[i - 1][j - 1]);
+        }
+    }
+    return matrix[a.length][b.length];
+}
+function nearMiss(a, b) {
+    const max = Math.max(a.length, b.length);
+    if (max === 0)
+        return false;
+    return levenshtein(normalize(a), normalize(b)) <= 0.25 * max;
+}
+function loadShippedDefaults(packageRoot) {
+    const map = new Map();
+    const candidates = [
+        path.join(packageRoot, 'dist', 'scaffold', 'templates', 'jobs', 'instar'),
+        path.join(packageRoot, 'src', 'scaffold', 'templates', 'jobs', 'instar'),
+    ];
+    for (const dir of candidates) {
+        if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory())
+            continue;
+        for (const f of fs.readdirSync(dir)) {
+            if (!f.endsWith('.md') || f === '.gitkeep')
+                continue;
+            const slug = path.basename(f, '.md');
+            if (map.has(slug))
+                continue;
+            const raw = fs.readFileSync(path.join(dir, f), 'utf-8');
+            const m = raw.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
+            if (!m)
+                continue;
+            let fm;
+            try {
+                fm = yaml.load(m[1], { schema: yaml.FAILSAFE_SCHEMA });
+            }
+            catch {
+                continue;
+            }
+            map.set(slug, { slug, body: m[2], frontmatter: fm ?? {} });
+        }
+        if (map.size > 0)
+            break;
+    }
+    return map;
+}
+function writeUserTemplate(userDir, slug, entry) {
+    fs.mkdirSync(userDir, { recursive: true });
+    const fm = {
+        name: entry.name,
+        description: entry.description,
+        schedule: entry.schedule,
+        priority: entry.priority,
+        expectedDurationMinutes: entry.expectedDurationMinutes,
+        model: entry.model,
+        enabled: entry.enabled !== false,
+    };
+    if (Array.isArray(entry.tags))
+        fm.tags = entry.tags;
+    if (entry.gate)
+        fm.gate = entry.gate;
+    if (typeof entry.telegramNotify === 'boolean')
+        fm.telegramNotify = entry.telegramNotify;
+    // User jobs default to minimal Read allowlist per spec §Trust Model.
+    fm.toolAllowlist = ['Read'];
+    const fmYaml = yaml.dump(fm, { lineWidth: -1, noRefs: true, quotingType: '"' }).trimEnd();
+    const body = (entry.execute && typeof entry.execute.value === 'string') ? entry.execute.value : '';
+    const content = `---\n${fmYaml}\n---\n${body.endsWith('\n') ? body : body + '\n'}`;
+    const target = path.join(userDir, `${slug}.md`);
+    fs.writeFileSync(target, content, 'utf-8');
+    return target;
+}
+function writeManifest(scheduleDir, slug, origin, entry) {
+    fs.mkdirSync(scheduleDir, { recursive: true });
+    const manifest = {
+        slug,
+        origin,
+        schedule: entry.schedule,
+        enabled: entry.enabled !== false,
+        execute: entry.execute && entry.execute.type === 'prompt' ? { type: 'agentmd' } : entry.execute,
+        manifestVersion: 1,
+    };
+    const target = path.join(scheduleDir, `${slug}.json`);
+    fs.writeFileSync(target, JSON.stringify(manifest, null, 2) + '\n', 'utf-8');
+    return target;
+}
+export function jobsMigrate(opts) {
+    const { agentStateDir, packageRoot } = opts;
+    const defaultAction = opts.defaultAction ?? 'fail';
+    const jobsJsonPath = path.join(agentStateDir, 'jobs.json');
+    const jobsRoot = path.join(agentStateDir, 'jobs');
+    const userDir = path.join(jobsRoot, 'user');
+    const scheduleDir = path.join(jobsRoot, 'schedule');
+    const instarDir = path.join(jobsRoot, 'instar');
+    const completedMarker = path.join(jobsRoot, '.migration-complete.json');
+    const abandonedMarker = path.join(jobsRoot, '.migration-abandoned.json');
+    const outcome = { status: 'completed', perEntry: [], errors: [] };
+    // ── Abandon path ────────────────────────────────────────────────────
+    if (opts.abandon) {
+        fs.mkdirSync(jobsRoot, { recursive: true });
+        if (fs.existsSync(scheduleDir)) {
+            SafeFsExecutor.safeRmSync(scheduleDir, { recursive: true, force: true, operation: 'jobsMigrate abandon: remove schedule/' });
+        }
+        if (fs.existsSync(instarDir)) {
+            SafeFsExecutor.safeRmSync(instarDir, { recursive: true, force: true, operation: 'jobsMigrate abandon: remove instar/' });
+        }
+        fs.writeFileSync(abandonedMarker, JSON.stringify({ abandonedAt: new Date().toISOString(), reason: 'operator-initiated abandon' }, null, 2), 'utf-8');
+        outcome.status = 'abandoned';
+        return outcome;
+    }
+    if (!fs.existsSync(jobsJsonPath)) {
+        outcome.errors.push(`No jobs.json at ${jobsJsonPath}; nothing to migrate.`);
+        outcome.status = 'aborted';
+        return outcome;
+    }
+    let rawJobs;
+    try {
+        rawJobs = JSON.parse(fs.readFileSync(jobsJsonPath, 'utf-8'));
+        if (!Array.isArray(rawJobs))
+            throw new Error('jobs.json root must be an array');
+    }
+    catch (err) {
+        outcome.errors.push(`Failed to parse jobs.json: ${err instanceof Error ? err.message : String(err)}`);
+        outcome.status = 'aborted';
+        return outcome;
+    }
+    const shipped = loadShippedDefaults(packageRoot);
+    // ── Dry-run / report path ───────────────────────────────────────────
+    if (opts.report) {
+        for (const entry of rawJobs) {
+            const slug = entry.slug;
+            const action = classifyEntry(entry, shipped);
+            const reason = action.kind === 'migrated-instar' ? undefined : action.reason;
+            outcome.perEntry.push({ slug, action: action.kind, reason });
+        }
+        outcome.status = 'reported';
+        return outcome;
+    }
+    // ── Write backup BEFORE any destructive write ───────────────────────
+    fs.mkdirSync(jobsRoot, { recursive: true });
+    const ts = new Date().toISOString().replace(/[:.]/g, '-');
+    const backupPath = path.join(agentStateDir, `jobs.json.pre-migrate-${ts}`);
+    fs.copyFileSync(jobsJsonPath, backupPath);
+    outcome.backupPath = backupPath;
+    // ── Per-entry migration ─────────────────────────────────────────────
+    for (const entry of rawJobs) {
+        const slug = entry.slug;
+        if (!slug || typeof slug !== 'string') {
+            outcome.errors.push(`Skipping entry without slug: ${JSON.stringify(entry).slice(0, 100)}`);
+            continue;
+        }
+        const classification = classifyEntry(entry, shipped);
+        try {
+            if (classification.kind === 'migrated-instar') {
+                // Body matched. Write per-slug manifest pointing at the instar template.
+                writeManifest(scheduleDir, slug, 'instar', entry);
+                outcome.perEntry.push({ slug, action: 'migrated-instar' });
+                continue;
+            }
+            if (classification.kind === 'near-miss-default') {
+                // Body did NOT match a shipped default. Apply --default-action.
+                if (defaultAction === 'fail') {
+                    outcome.errors.push(`Near-miss on default "${slug}": body does not match shipped template. ` +
+                        `Re-run with --default-action=fork|rename|skip.`);
+                    outcome.status = 'aborted';
+                    return outcome;
+                }
+                if (defaultAction === 'skip') {
+                    outcome.perEntry.push({ slug, action: 'skipped', reason: 'near-miss, --default-action=skip' });
+                    continue;
+                }
+                const targetSlug = defaultAction === 'rename' ? `${slug}-user` : slug;
+                const tgt = writeUserTemplate(userDir, targetSlug, entry);
+                writeManifest(scheduleDir, targetSlug, 'user', entry);
+                outcome.perEntry.push({
+                    slug: targetSlug,
+                    action: defaultAction === 'rename' ? 'renamed-user' : 'forked-user',
+                    reason: classification.reason,
+                    targetPath: tgt,
+                });
+                continue;
+            }
+            if (classification.kind === 'kept-user' || classification.kind === 'forked-user') {
+                const tgt = writeUserTemplate(userDir, slug, entry);
+                writeManifest(scheduleDir, slug, 'user', entry);
+                outcome.perEntry.push({
+                    slug,
+                    action: classification.kind === 'kept-user' ? 'kept-user' : 'forked-user',
+                    reason: classification.reason,
+                    targetPath: tgt,
+                });
+                continue;
+            }
+            // Non-prompt entries (skill, script) — leave them in jobs.json.
+            outcome.perEntry.push({ slug, action: 'skipped', reason: classification.reason });
+        }
+        catch (err) {
+            outcome.errors.push(`${slug}: ${err instanceof Error ? err.message : String(err)}`);
+            outcome.perEntry.push({ slug, action: 'failed' });
+        }
+    }
+    // ── Completion marker (operator confirms via dashboard before jobs.json delete) ──
+    // We do NOT write .migration-complete.json automatically — that's the
+    // operator's job via the Dashboard "Confirm migration complete" button.
+    // The release-cut gate refuses to delete jobs.json until this marker exists.
+    // Remove abandonment marker if present (a new migrate run is a re-attempt).
+    if (fs.existsSync(abandonedMarker)) {
+        SafeFsExecutor.safeUnlinkSync(abandonedMarker, { operation: 'jobsMigrate clear abandonment marker on re-run' });
+    }
+    if (fs.existsSync(completedMarker)) {
+        // operator may run migrate multiple times; the completion marker should
+        // be recreated by the Dashboard, not by the script.
+    }
+    return outcome;
+}
+function classifyEntry(entry, shipped) {
+    if (!entry.execute || entry.execute.type !== 'prompt') {
+        return { kind: 'skipped', reason: `execute.type=${entry.execute?.type ?? 'absent'} — only prompt-type entries migrate to agentmd` };
+    }
+    const shippedDefault = shipped.get(entry.slug);
+    if (!shippedDefault) {
+        // Slug not in the shipped defaults → user job.
+        return { kind: 'kept-user', reason: 'slug not in shipped defaults' };
+    }
+    const entryBody = entry.execute.value ?? '';
+    if (sha256(normalize(entryBody)) === sha256(normalize(shippedDefault.body))) {
+        return { kind: 'migrated-instar' };
+    }
+    // Slug matches a shipped default but body differs. The --default-action
+    // flag drives the resolution (fork | rename | skip | fail). The
+    // Levenshtein distance is informational only for the operator-facing
+    // report — it doesn't change the routing.
+    const dist = levenshtein(normalize(entryBody), normalize(shippedDefault.body));
+    const maxLen = Math.max(entryBody.length, shippedDefault.body.length);
+    const pct = maxLen ? Math.round((dist / maxLen) * 100) : 100;
+    return {
+        kind: 'near-miss-default',
+        reason: `body differs from shipped default (~${pct}% changed by Levenshtein)`,
+    };
+}
+//# sourceMappingURL=jobMigrate.js.map

package/dist/commands/jobMigrate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jobMigrate.js","sourceRoot":"","sources":["../../src/commands/jobMigrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAyB3D,MAAM,aAAa,GAAG,SAAS,CAAC;AAEhC,SAAS,SAAS,CAAC,CAAS;IAC1B,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;AAC9E,CAAC;AAED,SAAS,MAAM,CAAC,CAAS;IACvB,OAAO,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,WAAW,CAAC,CAAS,EAAE,CAAS;IACvC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACtB,IAAI,CAAC,CAAC,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC,MAAM,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC,MAAM,CAAC;IAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,CAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;QAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;;gBAC1D,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,CAAS;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,GAAG,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC;AAC/D,CAAC;AAQD,SAAS,mBAAmB,CAAC,WAAmB;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,EAA0B,CAAC;IAC9C,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC;KACzE,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QACrE,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,UAAU;gBAAE,SAAS;YACrD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC5B,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACzD,IAAI,CAAC,CAAC;gBAAE,SAAS;YACjB,IAAI,EAA2B,CAAC;YAChC,IAAI,CAAC;gBACH,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,CAA4B,CAAC;YACpF,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YACD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC;YAAE,MAAM;IAC1B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,IAAY,EAAE,KAAU;IAClE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,MAAM,EAAE,GAA4B;QAClC,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;QACtD,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;KACjC,CAAC;IACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACpD,IAAI,KAAK,CAAC,IAAI;QAAE,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACrC,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,SAAS;QAAE,EAAE,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;IACxF,qEAAqE;IACrE,EAAE,CAAC,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1F,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACnG,MAAM,OAAO,GAAG,QAAQ,MAAM,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IACnF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;IAChD,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,WAAmB,EAAE,IAAY,EAAE,MAAyB,EAAE,KAAU;IAC7F,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAA4B;QACxC,IAAI;QACJ,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,OAAO,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;QAChC,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO;QAC/F,eAAe,EAAE,CAAC;KACnB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,OAAO,CAAC,CAAC;IACtD,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAuB;IACjD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC5C,MAAM,aAAa,GAAkB,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAC;IACxE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IAEzE,MAAM,OAAO,GAAqB,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAEpF,uEAAuE;IACvE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,cAAc,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,uCAAuC,EAAE,CAAC,CAAC;QAC/H,CAAC;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,qCAAqC,EAAE,CAAC,CAAC;QAC3H,CAAC;QACD,EAAE,CAAC,aAAa,CACd,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,4BAA4B,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EACxG,OAAO,CACR,CAAC;QACF,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,YAAY,uBAAuB,CAAC,CAAC;QAC5E,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;QAC3B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAc,CAAC;IACnB,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;QAC3B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAEjD,uEAAuE;IACvE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;YACxB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7E,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAsD,EAAE,MAAM,EAAE,CAAC,CAAC;QACjH,CAAC;QACD,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC;QAC5B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,uEAAuE;IACvE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;IAC3E,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC1C,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;IAEhC,uEAAuE;IACvE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3F,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAErD,IAAI,CAAC;YACH,IAAI,cAAc,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBAC9C,yEAAyE;gBACzE,aAAa,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAClD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YAED,IAAI,cAAc,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAChD,gEAAgE;gBAChE,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;oBAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,yBAAyB,IAAI,2CAA2C;wBACxE,gDAAgD,CACjD,CAAC;oBACF,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;oBAC3B,OAAO,OAAO,CAAC;gBACjB,CAAC;gBACD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;oBAC7B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC,CAAC;oBAC/F,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;gBACtE,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC1D,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBACtD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACpB,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa;oBACnE,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG;iBAChB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,IAAI,cAAc,CAAC,IAAI,KAAK,WAAW,IAAI,cAAc,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACjF,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACpD,aAAa,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAChD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACpB,IAAI;oBACJ,MAAM,EAAE,cAAc,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa;oBACzE,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG;iBAChB,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,gEAAgE;YAChE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;QACpF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,oFAAoF;IACpF,sEAAsE;IACtE,wEAAwE;IACxE,6EAA6E;IAE7E,4EAA4E;IAC5E,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACnC,cAAc,CAAC,cAAc,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,gDAAgD,EAAE,CAAC,CAAC;IAClH,CAAC;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACnC,wEAAwE;QACxE,oDAAoD;IACtD,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AASD,SAAS,aAAa,CAAC,KAAU,EAAE,OAAoC;IACrE,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,QAAQ,gDAAgD,EAAE,CAAC;IACtI,CAAC;IACD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,+CAA+C;QAC/C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAC;IACvE,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IACrC,CAAC;IACD,wEAAwE;IACxE,gEAAgE;IAChE,qEAAqE;IACrE,0CAA0C;IAC1C,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7D,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,uCAAuC,GAAG,2BAA2B;KAC9E,CAAC;AACJ,CAAC"}

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkQH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAw4CD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8nKtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAmQH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAw4CD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAusKtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -26,6 +26,7 @@ import { TelegramAdapter, TOPIC_STYLE, selectTopicEmoji } from '../messaging/Tel
 import { RelationshipManager } from '../core/RelationshipManager.js';
 import { ClaudeCliIntelligenceProvider } from '../core/ClaudeCliIntelligenceProvider.js';
 import { AnthropicIntelligenceProvider } from '../core/AnthropicIntelligenceProvider.js';
+import { selectIntelligenceProvider } from '../core/selectIntelligenceProvider.js';
 import { FeedbackManager } from '../core/FeedbackManager.js';
 import { FeedbackAnomalyDetector } from '../monitoring/FeedbackAnomalyDetector.js';
 import { DispatchManager } from '../core/DispatchManager.js';
@@ -1815,48 +1816,33 @@ export async function startServer(options) {
         _topicResumeMap = new TopicResumeMap(config.stateDir, config.sessions.projectDir, config.sessions.tmuxPath);
         _projectDir = config.sessions.projectDir;
         // Shared intelligence provider — lightweight LLM for internal classification tasks.
-        // Priority: Claude CLI subscription (zero extra cost, default) → Anthropic API (explicit opt-in)
-        // Components that need LLM intelligence (Sentinel, TelegramAdapter, etc.) share this.
-        //
-        // Rationale: Instar must not depend on an API key. The subscription path is the default so
-        // every agent gets LLM-gated features out of the box. Users who prefer direct API access can
-        // set `intelligenceProvider: "anthropic-api"` in config.json.
-        let sharedIntelligence;
-        const explicitIntelligenceProvider = config.intelligenceProvider;
-        let intelligenceSource = 'none';
-        if (explicitIntelligenceProvider === 'anthropic-api') {
-            try {
-                const apiProvider = AnthropicIntelligenceProvider.fromEnv();
-                if (apiProvider) {
-                    sharedIntelligence = apiProvider;
-                    intelligenceSource = 'Anthropic API (explicit opt-in)';
-                }
-                else {
-                    console.log(pc.yellow('  intelligenceProvider: "anthropic-api" set but ANTHROPIC_API_KEY not found — falling back to Claude CLI'));
-                }
-            }
-            catch { /* no API key available */ }
-        }
-        if (!sharedIntelligence) {
-            try {
-                sharedIntelligence = new ClaudeCliIntelligenceProvider(config.sessions.claudePath);
-                intelligenceSource = 'Claude CLI subscription';
-            }
-            catch { /* CLI not available */ }
-        }
-        if (!sharedIntelligence && explicitIntelligenceProvider !== 'anthropic-api') {
-            // Last resort: if user has API key but didn't explicitly opt in, use it rather than
-            // leaving the agent flying blind. We prefer subscription, but degrading to heuristics
-            // is worse than using whatever LLM is available.
-            try {
-                const apiProvider = AnthropicIntelligenceProvider.fromEnv();
-                if (apiProvider) {
-                    sharedIntelligence = apiProvider;
-                    intelligenceSource = 'Anthropic API (CLI unavailable — last resort)';
-                }
-            }
-            catch { /* no API key available */ }
-        }
+        // Subscription-by-default: API mode requires BOTH `intelligenceProvider: "anthropic-api"`
+        // AND `intelligenceProviderConfirmed: true`. The selection logic lives in a separate
+        // pure function so the safety rules are unit-testable.
+        const apiOpts = config;
+        const selection = selectIntelligenceProvider({
+            intelligenceProvider: apiOpts.intelligenceProvider,
+            intelligenceProviderConfirmed: apiOpts.intelligenceProviderConfirmed,
+            anthropicApiKey: process.env['ANTHROPIC_API_KEY'],
+            claudePath: config.sessions.claudePath,
+            buildClaude: (claudePath) => new ClaudeCliIntelligenceProvider(claudePath),
+            buildAnthropic: (apiKey) => new AnthropicIntelligenceProvider(apiKey),
+        });
+        const sharedIntelligence = selection.provider ?? undefined;
+        for (const w of selection.warnings)
+            console.log(pc.yellow(`  ${w}`));
+        if (selection.apiModeActive) {
+            console.log(pc.yellow('  ┌─────────────────────────────────────────────────────────────────────┐'));
+            console.log(pc.yellow('  │ BILLING: Anthropic API mode is ACTIVE — per-call charges apply      │'));
+            console.log(pc.yellow('  │ To switch back to subscription, unset intelligenceProvider in config│'));
+            console.log(pc.yellow('  └─────────────────────────────────────────────────────────────────────┘'));
+        }
+        const intelligenceSourceLabel = {
+            'anthropic-api-confirmed': 'Anthropic API (explicit opt-in, confirmed)',
+            'claude-cli': 'Claude CLI subscription',
+            'none': 'none',
+        };
+        const intelligenceSource = intelligenceSourceLabel[selection.source];
         _sharedIntelligence = sharedIntelligence ?? null;
         if (sharedIntelligence) {
             console.log(pc.gray(`  Intelligence: ${intelligenceSource}`));
@@ -3048,6 +3034,16 @@ export async function startServer(options) {
                 impact: 'Knowledge graph unavailable. Migration, semantic search, and entity-relationship queries disabled.',
             });
         }
+        // Pre-prompt memory recall (OpenClaw import T2.2). Bounded synchronous
+        // recall pass that runs before UserPromptSubmit injects context. Default
+        // off; opt in via config.promptBuildRecall.enabled.
+        const promptRecallCfg = config.promptBuildRecall;
+        if (promptRecallCfg?.enabled && semanticMemory) {
+            const { PromptBuildRecall, DEFAULT_PROMPT_BUILD_RECALL_CONFIG } = await import('../core/PromptBuildRecall.js');
+            const recall = new PromptBuildRecall({ semanticMemory }, { ...DEFAULT_PROMPT_BUILD_RECALL_CONFIG, ...promptRecallCfg });
+            globalThis.__instarPromptBuildRecall = recall;
+            console.log(pc.green('  Pre-prompt memory recall enabled'));
+        }
         // WorkingMemoryAssembler is initialized after activitySentinel (see below)
         // so it can wire episodicMemory from the sentinel.
         let workingMemory;
@@ -4096,6 +4092,23 @@ export async function startServer(options) {
             }, 10_000);
         });
         console.log(pc.green('  Compaction auto-resume wired (PreCompact hook event)'));
+        // Pre-compaction memory flush — write durable facts before compaction
+        // collapses working memory. Off by default; enable via config.preCompactionFlush.
+        // See docs/specs/OPENCLAW-IMPORT-PRE-COMPACTION-FLUSH-SPEC.md.
+        const preCompactFlushCfg = config.preCompactionFlush;
+        if (preCompactFlushCfg?.enabled) {
+            const { PreCompactionFlush, DEFAULT_PRE_COMPACTION_FLUSH_CONFIG } = await import('../core/PreCompactionFlush.js');
+            const flush = new PreCompactionFlush({
+                intelligence: sharedIntelligence ?? null,
+                projectDir: config.projectDir,
+            }, { ...DEFAULT_PRE_COMPACTION_FLUSH_CONFIG, ...preCompactFlushCfg });
+            hookEventReceiver.on('PreCompact', (payload) => {
+                flush.handle(payload).catch(() => {
+                    /* handle() owns its audit; never throws. */
+                });
+            });
+            console.log(pc.green('  Pre-compaction memory flush enabled'));
+        }
         // Trigger 2: Watchdog 'compaction-idle' polling — report to sentinel.
         if (watchdog) {
             watchdog.on('compaction-idle', (sessionName) => {
@@ -6090,6 +6103,39 @@ export async function startServer(options) {
                 toneGate: messagingToneGate ?? null,
             });
         }
+        // Tier-2 live-mode wire-up (SELF-HEALING-REMEDIATOR-V2-SPEC §A57).
+        //
+        // When `config.remediator.enabled === true`, construct the full F-1..F-8
+        // dispatch graph and register it with the DegradationReporter via the
+        // F-3 `setRemediator()` hook. Default is OFF — the legacy alert path
+        // + in-line healers (NativeModuleHealer.openWithHeal, supervisor
+        // preflightSelfHeal) remain the safety net regardless of Remediator
+        // state. See upgrades/side-effects/tier2-degradation-reporter-live-wire.md.
+        {
+            const remediatorEnabled = config
+                .remediator?.enabled === true;
+            if (remediatorEnabled) {
+                try {
+                    const { bootstrapRemediator } = await import('../remediation/RemediatorBootstrap.js');
+                    const machineIdForRemediator = coordinator.identity?.machineId ?? os.hostname();
+                    const bootstrapResult = await bootstrapRemediator({
+                        stateDir: config.stateDir,
+                        machineId: machineIdForRemediator,
+                        autonomyProfile: config.autonomyProfile,
+                    });
+                    if (bootstrapResult.disabled) {
+                        console.log(pc.yellow(`  Remediator live-mode requested but disabled: ${bootstrapResult.reason} — legacy alert path active.`));
+                    }
+                    else {
+                        degradationReporter.setRemediator(bootstrapResult.remediator);
+                        console.log(pc.green(`  Remediator live-mode active (runbooks: ${bootstrapResult.registeredRunbookIds.join(', ') || 'none'}).`));
+                    }
+                }
+                catch (err) {
+                    console.error(pc.red(`  Remediator bootstrap failed: ${err instanceof Error ? err.message : String(err)}. Legacy alert path active.`));
+                }
+            }
+        }
         // Periodic housekeeping — calls orphaned cleanup methods every 6 hours.
         // These methods exist on their respective classes but were never scheduled.
         const HOUSEKEEPING_INTERVAL_MS = 6 * 60 * 60 * 1000;