zelari-code 1.25.0 → 1.27.0

package/dist/cli/tools/krakenLive.js

@@ -0,0 +1,109 @@
+/**
+ * krakenLive — in-process live tentacle tracker for StatusBar / Desktop (K10).
+ *
+ * Complements file radio (.zelari/radio): this is ephemeral, per process,
+ * ideal for "tentacles 1 running · 2 done" chips during a parent turn.
+ */
+function store() {
+    const g = globalThis;
+    if (!g.__zelariKrakenLive)
+        g.__zelariKrakenLive = [];
+    return g.__zelariKrakenLive;
+}
+function nextId() {
+    const g = globalThis;
+    g.__zelariKrakenLiveSeq = (g.__zelariKrakenLiveSeq ?? 0) + 1;
+    return `t${g.__zelariKrakenLiveSeq}`;
+}
+/** Clear finished tentacles (keep running). Call on new parent turn if desired. */
+export function resetKrakenLive(opts = {}) {
+    const g = globalThis;
+    if (opts.keepRunning) {
+        g.__zelariKrakenLive = store().filter((t) => t.status === 'running');
+    }
+    else {
+        g.__zelariKrakenLive = [];
+    }
+}
+export function krakenTentacleStart(info) {
+    const id = nextId();
+    const row = {
+        id,
+        agent: info.agent,
+        description: info.description.slice(0, 80),
+        status: 'running',
+        startedAt: Date.now(),
+        model: info.model,
+        worktree: info.worktree ?? null,
+        ...(info.graphId ? { graphId: info.graphId } : {}),
+        ...(info.nodeId ? { nodeId: info.nodeId } : {}),
+    };
+    const list = store();
+    list.push(row);
+    if (list.length > 40) {
+        list.splice(0, list.length - 40);
+    }
+    return id;
+}
+export function krakenTentacleEnd(id, info) {
+    const row = store().find((t) => t.id === id);
+    if (!row)
+        return;
+    row.status = info.ok ? 'done' : 'error';
+    row.endedAt = Date.now();
+    row.durationMs = info.durationMs ?? row.endedAt - row.startedAt;
+    row.ok = info.ok;
+    if (info.model)
+        row.model = info.model;
+    if (info.detail)
+        row.detail = info.detail.slice(0, 160);
+}
+export function listKrakenLive() {
+    return [...store()];
+}
+/** One-line chip for StatusBar: "tentacles 1↑ 2✓" or null if empty. */
+export function formatKrakenLiveSummary(list = store()) {
+    if (list.length === 0)
+        return null;
+    const running = list.filter((t) => t.status === 'running').length;
+    const done = list.filter((t) => t.status === 'done').length;
+    const err = list.filter((t) => t.status === 'error').length;
+    const parts = [];
+    if (running)
+        parts.push(`${running}↑`);
+    if (done)
+        parts.push(`${done}✓`);
+    if (err)
+        parts.push(`${err}✗`);
+    if (parts.length === 0)
+        return null;
+    return `tentacles ${parts.join(' ')}`;
+}
+/** Multi-line block for slash / desktop panel. */
+export function formatKrakenLiveStatus(list = store(), limit = 12) {
+    if (list.length === 0) {
+        return 'Kraken live: no tentacles in this process yet.';
+    }
+    const slice = list.slice(-limit);
+    const lines = slice.map((t) => {
+        const flag = t.status === 'running' ? '…' : t.status === 'done' ? '✓' : '✗';
+        const ms = t.durationMs != null ? ` ${t.durationMs}ms` : '';
+        const model = t.model ? ` [${t.model}]` : '';
+        return `${flag} ${t.agent} "${t.description}"${model}${ms}`;
+    });
+    const summary = formatKrakenLiveSummary(list);
+    return [`Kraken live (${summary ?? list.length}):`, ...lines].join('\n');
+}
+/** Desktop-friendly rows (JSON-serializable). */
+export function krakenLiveForUi(list = store()) {
+    return list.map((t) => ({
+        id: t.id,
+        agent: t.agent,
+        description: t.description,
+        status: t.status,
+        ...(t.model ? { model: t.model } : {}),
+        ...(t.durationMs != null ? { durationMs: t.durationMs } : {}),
+        ...(t.ok != null ? { ok: t.ok } : {}),
+    }));
+}
+//# sourceMappingURL=krakenLive.js.map

package/dist/cli/tools/krakenLive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"krakenLive.js","sourceRoot":"","sources":["../../../src/cli/tools/krakenLive.ts"],"names":[],"mappings":"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"}

package/dist/cli/tools/krakenModel.js

@@ -0,0 +1,115 @@
+/**
+ * krakenModel — cheap/strong model routing for Kraken tentacles (K5 + auto-pick).
+ *
+ * Priority per tentacle:
+ *   1. Kind-specific env (ZELARI_KRAKEN_EXPLORE_MODEL / _VERIFY_ / _GENERAL_)
+ *   2. Shared ZELARI_KRAKEN_SUB_MODEL (general only if GENERAL_USES_SUB=1)
+ *   3. Auto-pick cheap model from discovered list (explore/verify) when enabled
+ *   4. Parent model
+ *
+ * Auto-pick (no manual env required for cheap tentacles):
+ *   - Default ON for explore/verify when no explicit model env is set
+ *   - Disable with ZELARI_KRAKEN_AUTO_MODEL=0
+ *   - Uses model discovery cache via getDiscoveredModelIds(provider) (async path)
+ *   - Heuristic: mini|fast|flash|lite|small|haiku|air|nano|instant|...
+ */
+/** Heuristic: model ids that look cheaper / faster than flagship. */
+const CHEAP_RE = /mini|fast|flash|lite|small|haiku|air|nano|instant|quick|turbo|low|3\.5|4o-mini|grok-3-mini|glm-4-flash|glm-4\.5-flash|gemini-.*-flash|claude-.*-haiku|deepseek-chat/i;
+/** Flagship-ish ids we should not auto-select as "cheap". */
+const FLAGSHIP_RE = /opus|ultra|reason|thinking|pro(?!-mini)|heavy|max(?!-)/i;
+export function isCheapModelId(id) {
+    if (!id)
+        return false;
+    if (FLAGSHIP_RE.test(id) && !/mini|fast|flash|lite|haiku/i.test(id))
+        return false;
+    return CHEAP_RE.test(id);
+}
+/**
+ * Pick a cheaper model from candidates, different from parent when possible.
+ * Prefers ids with mini/flash/fast; stable sort by score then name.
+ */
+export function pickCheapModel(parentModel, candidates) {
+    const parent = parentModel.trim();
+    const uniq = [...new Set(candidates.map((c) => c.trim()).filter(Boolean))];
+    const cheap = uniq.filter((id) => isCheapModelId(id));
+    if (cheap.length === 0)
+        return null;
+    const score = (id) => {
+        let s = 0;
+        if (/mini/i.test(id))
+            s += 5;
+        if (/flash/i.test(id))
+            s += 4;
+        if (/fast/i.test(id))
+            s += 3;
+        if (/lite|haiku|nano|air/i.test(id))
+            s += 3;
+        if (/small|instant|quick/i.test(id))
+            s += 2;
+        if (id === parent)
+            s -= 10;
+        s -= Math.min(id.length, 40) / 100;
+        return s;
+    };
+    cheap.sort((a, b) => score(b) - score(a) || a.localeCompare(b));
+    const notParent = cheap.find((id) => id !== parent);
+    return notParent ?? cheap[0] ?? null;
+}
+export function isKrakenAutoModelEnabled(env = process.env) {
+    const v = (env.ZELARI_KRAKEN_AUTO_MODEL ?? '1').trim().toLowerCase();
+    if (v === '0' || v === 'false' || v === 'no' || v === 'off')
+        return false;
+    return true;
+}
+/** Resolve model id for a tentacle given the parent/active model. */
+export function resolveKrakenSubModel(agent, parentModel, env = process.env, opts = {}) {
+    const kindKey = agent === 'explore'
+        ? 'ZELARI_KRAKEN_EXPLORE_MODEL'
+        : agent === 'verify'
+            ? 'ZELARI_KRAKEN_VERIFY_MODEL'
+            : 'ZELARI_KRAKEN_GENERAL_MODEL';
+    const specific = env[kindKey]?.trim();
+    if (specific)
+        return specific;
+    const shared = env.ZELARI_KRAKEN_SUB_MODEL?.trim();
+    if (shared) {
+        if (agent === 'general' && !env.ZELARI_KRAKEN_GENERAL_MODEL) {
+            if (env.ZELARI_KRAKEN_GENERAL_USES_SUB === '1')
+                return shared;
+            return parentModel;
+        }
+        return shared;
+    }
+    // Auto-pick cheap model for explore/verify (not general — keep strong writer).
+    if ((agent === 'explore' || agent === 'verify') &&
+        isKrakenAutoModelEnabled(env) &&
+        opts.candidates &&
+        opts.candidates.length > 0) {
+        const picked = pickCheapModel(parentModel, opts.candidates);
+        if (picked)
+            return picked;
+    }
+    return parentModel;
+}
+/**
+ * Async resolve that loads discovery cache (ESM). Prefer this from toolRegistry.
+ */
+export async function resolveKrakenSubModelAsync(agent, parentModel, env = process.env, opts = {}) {
+    let candidates = [];
+    if (opts.provider) {
+        try {
+            const mod = await import('../modelDiscovery.js');
+            const ids = mod.getDiscoveredModelIds(opts.provider);
+            if (Array.isArray(ids))
+                candidates = ids;
+        }
+        catch {
+            candidates = [];
+        }
+    }
+    return resolveKrakenSubModel(agent, parentModel, env, {
+        provider: opts.provider,
+        candidates,
+    });
+}
+//# sourceMappingURL=krakenModel.js.map

package/dist/cli/tools/krakenModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"krakenModel.js","sourceRoot":"","sources":["../../../src/cli/tools/krakenModel.ts"],"names":[],"mappings":"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"}

package/dist/cli/tools/krakenRadio.js

@@ -0,0 +1,95 @@
+/**
+ * krakenRadio — lightweight parent↔tentacle progress bus (Fractal-inspired).
+ *
+ * File-backed JSONL under `.zelari/radio/<sessionId>.jsonl`.
+ * No SQLite. Best-effort; never throws to callers of append.
+ *
+ * @since Kraken v1.x slice 2
+ */
+import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync } from 'node:fs';
+import path from 'node:path';
+function radioDir(cwd) {
+    return path.join(cwd, '.zelari', 'radio');
+}
+function radioPath(cwd, sessionId) {
+    const safe = (sessionId || 'default').replace(/[^a-zA-Z0-9._-]/g, '_').slice(0, 80);
+    return path.join(radioDir(cwd), `${safe}.jsonl`);
+}
+/** Append one radio event (best-effort, sync — sub-agent exit path). */
+export function appendKrakenRadio(cwd, sessionId, event) {
+    try {
+        const dir = radioDir(cwd);
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        const row = {
+            ts: event.ts ?? new Date().toISOString(),
+            kind: event.kind,
+            agent: event.agent,
+            description: event.description,
+            ...(event.thoroughness !== undefined ? { thoroughness: event.thoroughness } : {}),
+            ...(event.detail !== undefined ? { detail: event.detail } : {}),
+            ...(event.model !== undefined ? { model: event.model } : {}),
+            ...(event.worktree !== undefined ? { worktree: event.worktree } : {}),
+            ...(event.durationMs !== undefined ? { durationMs: event.durationMs } : {}),
+            ...(event.ok !== undefined ? { ok: event.ok } : {}),
+        };
+        appendFileSync(radioPath(cwd, sessionId), `${JSON.stringify(row)}\n`, 'utf8');
+    }
+    catch {
+        // never break the agent loop for telemetry
+    }
+}
+/** Read recent radio events (newest last). */
+export function readKrakenRadio(cwd, sessionId, limit = 50) {
+    try {
+        const file = radioPath(cwd, sessionId);
+        if (!existsSync(file))
+            return [];
+        const lines = readFileSync(file, 'utf8').split(/\r?\n/).filter(Boolean);
+        const slice = lines.slice(-Math.max(1, limit));
+        const out = [];
+        for (const line of slice) {
+            try {
+                out.push(JSON.parse(line));
+            }
+            catch {
+                // skip bad lines
+            }
+        }
+        return out;
+    }
+    catch {
+        return [];
+    }
+}
+/** List session radio files under .zelari/radio. */
+export function listKrakenRadioSessions(cwd) {
+    try {
+        const dir = radioDir(cwd);
+        if (!existsSync(dir))
+            return [];
+        return readdirSync(dir)
+            .filter((f) => f.endsWith('.jsonl'))
+            .map((f) => f.replace(/\.jsonl$/, ''));
+    }
+    catch {
+        return [];
+    }
+}
+/** Human-readable status block for slash / doctor. */
+export function formatKrakenRadioStatus(cwd, sessionId, limit = 12) {
+    const events = readKrakenRadio(cwd, sessionId, limit);
+    if (events.length === 0) {
+        return `Kraken radio: no events yet for session "${sessionId}" (path .zelari/radio/).`;
+    }
+    const lines = events.map((e) => {
+        const flag = e.ok === false ? '✗' : e.ok === true ? '✓' : '·';
+        const ms = e.durationMs != null ? ` ${e.durationMs}ms` : '';
+        const model = e.model ? ` [${e.model}]` : '';
+        const wt = e.worktree ? ` wt=${path.basename(e.worktree)}` : '';
+        const detail = e.detail ? ` — ${e.detail.slice(0, 120)}` : '';
+        return `${flag} ${e.ts.slice(11, 19)} ${e.kind} ${e.agent} "${e.description}"${model}${wt}${ms}${detail}`;
+    });
+    return [`Kraken radio (last ${events.length}) session=${sessionId}:`, ...lines].join('\n');
+}
+//# sourceMappingURL=krakenRadio.js.map

package/dist/cli/tools/krakenRadio.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"krakenRadio.js","sourceRoot":"","sources":["../../../src/cli/tools/krakenRadio.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3F,OAAO,IAAI,MAAM,WAAW,CAAC;AA8B7B,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,SAAiB;IAC/C,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpF,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAC;AACnD,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,iBAAiB,CAC/B,GAAW,EACX,SAAiB,EACjB,KAAqD;IAErD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAqB;YAC5B,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACxC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpD,CAAC;QACF,cAAc,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChF,CAAC;IAAC,MAAM,CAAC;QACP,2CAA2C;IAC7C,CAAC;AACH,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,SAAiB,EACjB,KAAK,GAAG,EAAE;IAEV,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAuB,EAAE,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAqB,CAAC,CAAC;YACjD,CAAC;YAAC,MAAM,CAAC;gBACP,iBAAiB;YACnB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,uBAAuB,CAAC,GAAW;IACjD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,EAAE,CAAC;QAChC,OAAO,WAAW,CAAC,GAAG,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,uBAAuB,CACrC,GAAW,EACX,SAAiB,EACjB,KAAK,GAAG,EAAE;IAEV,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,4CAA4C,SAAS,0BAA0B,CAAC;IACzF,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9D,MAAM,EAAE,GAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,OAAO,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,WAAW,IAAI,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAC5G,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,sBAAsB,MAAM,CAAC,MAAM,aAAa,SAAS,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7F,CAAC"}

package/dist/cli/tools/krakenWorktree.js

@@ -0,0 +1,245 @@
+/**
+ * krakenWorktree — opt-in git worktree isolation for Kraken general tentacles (K7).
+ *
+ * Enable with ZELARI_KRAKEN_WORKTREE=1 (or "true").
+ *
+ * Flow:
+ *   1. git worktree add <repo>/.zelari/worktrees/kraken-<id> -b kraken/<id>
+ *   2. Run sub-agent with cwd = worktree path
+ *   3. On success (default): squash-merge branch into parent HEAD, then cleanup
+ *      - ZELARI_KRAKEN_WORKTREE_AUTO_MERGE=0 → skip merge (still cleanup unless KEEP)
+ *      - ZELARI_KRAKEN_WORKTREE_KEEP=1 → never merge/cleanup (manual)
+ *   4. On merge conflict: keep worktree + branch, report error in footer
+ *
+ * Windows: Git for Windows worktree. Paths are absolute.
+ */
+import { execFile } from 'node:child_process';
+import { existsSync, mkdirSync, rmSync } from 'node:fs';
+import path from 'node:path';
+import { promisify } from 'node:util';
+import { randomBytes } from 'node:crypto';
+const execFileAsync = promisify(execFile);
+export function isKrakenWorktreeEnabled(env = process.env) {
+    const v = (env.ZELARI_KRAKEN_WORKTREE ?? '').trim().toLowerCase();
+    return v === '1' || v === 'true' || v === 'yes' || v === 'on';
+}
+export function shouldKeepWorktree(env = process.env) {
+    const v = (env.ZELARI_KRAKEN_WORKTREE_KEEP ?? '').trim().toLowerCase();
+    return v === '1' || v === 'true' || v === 'yes' || v === 'on';
+}
+/**
+ * Auto-merge after a successful general tentacle.
+ * Default ON when worktree is enabled and KEEP is off.
+ * Set ZELARI_KRAKEN_WORKTREE_AUTO_MERGE=0 to disable.
+ */
+export function isKrakenWorktreeAutoMergeEnabled(env = process.env) {
+    if (shouldKeepWorktree(env))
+        return false;
+    const v = (env.ZELARI_KRAKEN_WORKTREE_AUTO_MERGE ?? '1').trim().toLowerCase();
+    if (v === '0' || v === 'false' || v === 'no' || v === 'off')
+        return false;
+    return true;
+}
+async function git(cwd, args) {
+    try {
+        const { stdout, stderr } = await execFileAsync('git', ['-C', cwd, ...args], {
+            maxBuffer: 16 * 1024 * 1024,
+            windowsHide: true,
+        });
+        return { ok: true, stdout: stdout ?? '', stderr: stderr ?? '', code: 0 };
+    }
+    catch (err) {
+        const e = err;
+        return {
+            ok: false,
+            stdout: e.stdout ?? '',
+            stderr: e.stderr ?? e.message ?? String(err),
+            code: typeof e.code === 'number' ? e.code : 1,
+        };
+    }
+}
+/** Resolve git toplevel for worktree add. */
+export async function resolveGitRoot(cwd) {
+    const r = await git(cwd, ['rev-parse', '--show-toplevel']);
+    if (!r.ok)
+        return null;
+    const root = r.stdout.trim();
+    return root || null;
+}
+/**
+ * Create an isolated worktree for a general tentacle.
+ * Returns null if git unavailable or worktree add fails (caller falls back to shared cwd).
+ */
+export async function createKrakenWorktree(cwd, label) {
+    const repoRoot = await resolveGitRoot(cwd);
+    if (!repoRoot)
+        return null;
+    const head = await git(repoRoot, ['rev-parse', 'HEAD']);
+    const baseSha = head.ok ? head.stdout.trim() : undefined;
+    const id = `${Date.now().toString(36)}-${randomBytes(3).toString('hex')}`;
+    const slug = (label ?? 'task')
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-|-$/g, '')
+        .slice(0, 24) || 'task';
+    const branch = `kraken/${slug}-${id}`;
+    const wtRoot = path.join(repoRoot, '.zelari', 'worktrees');
+    const wtPath = path.join(wtRoot, `kraken-${id}`);
+    try {
+        if (!existsSync(wtRoot))
+            mkdirSync(wtRoot, { recursive: true });
+    }
+    catch {
+        return null;
+    }
+    const add = await git(repoRoot, ['worktree', 'add', '-b', branch, wtPath, 'HEAD']);
+    if (!add.ok) {
+        const add2 = await git(repoRoot, ['worktree', 'add', wtPath, 'HEAD']);
+        if (!add2.ok)
+            return null;
+        return { id, branch: 'HEAD', path: wtPath, repoRoot, baseSha };
+    }
+    return { id, branch, path: wtPath, repoRoot, baseSha };
+}
+/**
+ * Commit dirty files inside the worktree (best-effort).
+ */
+export async function commitWorktreeChanges(handle, message) {
+    const st = await git(handle.path, ['status', '--porcelain']);
+    if (!st.ok)
+        return { ok: false, committed: false, detail: st.stderr || 'status failed' };
+    if (st.stdout.trim()) {
+        const add = await git(handle.path, ['add', '-A']);
+        if (!add.ok)
+            return { ok: false, committed: false, detail: add.stderr || 'add failed' };
+        const msg = message.slice(0, 200) || `kraken tentacle ${handle.id}`;
+        const commit = await git(handle.path, [
+            'commit',
+            '-m',
+            msg,
+            '--author',
+            'Kraken Tentacle <kraken@zelari.local>',
+        ]);
+        if (!commit.ok) {
+            const st2 = await git(handle.path, ['status', '--porcelain']);
+            if (st2.ok && !st2.stdout.trim()) {
+                return { ok: true, committed: false, detail: 'clean after add' };
+            }
+            return { ok: false, committed: false, detail: commit.stderr || 'commit failed' };
+        }
+        return { ok: true, committed: true, detail: 'committed in worktree' };
+    }
+    return { ok: true, committed: false, detail: 'worktree clean' };
+}
+/**
+ * Squash-merge tentacle branch into the parent repo HEAD, then optionally cleanup.
+ */
+export async function mergeKrakenWorktree(handle, opts = {}, env = process.env) {
+    if (!handle.branch || handle.branch === 'HEAD') {
+        return {
+            ok: false,
+            merged: false,
+            committed: false,
+            message: 'worktree has no named branch to merge',
+        };
+    }
+    const commitMsg = (opts.message ?? `kraken: merge ${handle.branch}`).slice(0, 200);
+    const pre = await commitWorktreeChanges(handle, commitMsg);
+    if (!pre.ok) {
+        return {
+            ok: false,
+            merged: false,
+            committed: false,
+            message: `pre-merge commit failed: ${pre.detail}`,
+        };
+    }
+    const range = handle.baseSha
+        ? `${handle.baseSha}..${handle.branch}`
+        : handle.branch;
+    const log = await git(handle.repoRoot, ['log', '--oneline', range]);
+    const ahead = log.ok ? log.stdout.trim() : '';
+    if (!ahead && !pre.committed) {
+        if (opts.cleanup !== false && !shouldKeepWorktree(env)) {
+            await cleanupKrakenWorktree(handle, env);
+        }
+        return {
+            ok: true,
+            merged: false,
+            committed: false,
+            message: 'no changes to merge (worktree empty)',
+        };
+    }
+    const merge = await git(handle.repoRoot, ['merge', '--squash', handle.branch]);
+    if (!merge.ok) {
+        const conflict = /conflict/i.test(merge.stderr) || /conflict/i.test(merge.stdout);
+        if (conflict) {
+            await git(handle.repoRoot, ['reset', '--merge']);
+        }
+        return {
+            ok: false,
+            merged: false,
+            committed: false,
+            conflict: true,
+            message: `merge conflict or failed: ${(merge.stderr || merge.stdout).trim().slice(0, 300)}`,
+        };
+    }
+    const stParent = await git(handle.repoRoot, ['status', '--porcelain']);
+    let committed = false;
+    if (stParent.ok && stParent.stdout.trim()) {
+        const c = await git(handle.repoRoot, ['commit', '-m', commitMsg]);
+        if (!c.ok) {
+            return {
+                ok: false,
+                merged: true,
+                committed: false,
+                message: `squash staged but commit failed: ${c.stderr.slice(0, 200)}`,
+            };
+        }
+        committed = true;
+    }
+    if (opts.cleanup !== false && !shouldKeepWorktree(env)) {
+        await cleanupKrakenWorktree(handle, env);
+    }
+    return {
+        ok: true,
+        merged: true,
+        committed,
+        message: committed
+            ? `squash-merged ${handle.branch} into HEAD`
+            : `squash-merge ${handle.branch} (no parent commit — already applied?)`,
+    };
+}
+/**
+ * Remove worktree + delete branch (best-effort).
+ * Skipped when ZELARI_KRAKEN_WORKTREE_KEEP=1.
+ */
+export async function cleanupKrakenWorktree(handle, env = process.env) {
+    if (shouldKeepWorktree(env))
+        return;
+    await git(handle.repoRoot, ['worktree', 'remove', '--force', handle.path]);
+    try {
+        if (existsSync(handle.path)) {
+            rmSync(handle.path, { recursive: true, force: true });
+        }
+    }
+    catch {
+        // ignore
+    }
+    await git(handle.repoRoot, ['worktree', 'prune']);
+    if (handle.branch.startsWith('kraken/')) {
+        await git(handle.repoRoot, ['branch', '-D', handle.branch]);
+    }
+}
+/** One-line status for task result footer. */
+export function formatWorktreeFooter(handle, opts = {}) {
+    const merge = opts.merge;
+    if (merge) {
+        const flag = merge.ok ? 'ok' : merge.conflict ? 'CONFLICT' : 'fail';
+        return `worktree merge [${flag}]: ${merge.message} (branch=${handle.branch})`;
+    }
+    if (opts.kept) {
+        return `worktree kept: branch=${handle.branch} path=${handle.path} (merge manually, then git worktree remove)`;
+    }
+    return `worktree used: branch=${handle.branch} path=${handle.path}`;
+}
+//# sourceMappingURL=krakenWorktree.js.map

package/dist/cli/tools/krakenWorktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"krakenWorktree.js","sourceRoot":"","sources":["../../../src/cli/tools/krakenWorktree.ts"],"names":[],"mappings":"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"}