@nanonets/graft 0.24.0 → 0.25.0

package/dist/skills/update-gate.js

@@ -0,0 +1,357 @@
+/**
+ * The update gate (phase 2 design 4.11, P29, R4, R14): 1a's dual consent for
+ * `trail skills update <name> --offer <id>`, the one command that changes a
+ * skill Trail kept. An agent can never change a skill without the person's
+ * typed yes to the offer that showed that exact change.
+ *
+ * The PreToolUse half (`checkSkillsUpdate`) denies, or writes a receipt and
+ * lets the command run. The CLI half (`cliUpdate`) never trusts the receipt:
+ * it re-decides from the transcript under the session lock (the same
+ * `decide`), plans the change again, and writes only when the plan still
+ * gives the `proposalSha` the person saw from the file it was computed from
+ * (`baseHash`). Every new or changed step is read again in the transcript at
+ * its offsets and must show it ran as stored and worked (R4), so no step
+ * comes from a run sheet the agent edited or from text it only read.
+ *
+ * A file the person changed by hand is never written: the change goes beside
+ * it as a proposal (4.6). Loaded only for an update command (the save gate
+ * imports it lazily), and never loads the CLI or telemetry.
+ */
+import { createHash } from 'node:crypto';
+import { lstatSync, readdirSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join, relative, isAbsolute, sep } from 'node:path';
+import { skillsGate, withSkillSession } from '../trace/skill-session.js';
+import { joinCarriedSheet, readRunSheet } from '../trace/runs.js';
+import { classifyFor } from './offer-answers.js';
+import { CLAUDE_DIALECT, dialectFor } from '../trace/dialect.js';
+import { flatLine } from '../notes/flatten.js';
+import { readJsonSafe, trailPath, withLock, writePrivate } from '../util/private-fs.js';
+import { hookError } from '../claude/skills-hook-util.js';
+import { skillsOn } from './settings.js';
+import { hostFacts } from './host-facts.js';
+import { codexSandboxRefusal } from './codex-sandbox.js';
+import { endsWithLine } from './offer-words.js';
+import { offerLinesOf } from './offer-lines.js';
+import { receiptPath, receiptTranscriptOk, receiptTranscriptRead, typedLineStillThere } from './receipts.js';
+import { dialectUse, personLine, ranAndWorked, replyBefore } from './save-verify.js';
+import { parseSkillsUpdate, SKILLS_UPDATE_RE } from './save-parse.js';
+import { bashCommand, tailCalls, tamperInTail } from './save-gate.js';
+import { listAllPersonal } from './store.js';
+import { writeNewVersion, writeProposal } from './versions.js';
+import { replan } from './update-plan.js';
+export { parseSkillsUpdate, SKILLS_UPDATE_RE as UPDATE_RE } from './save-parse.js';
+export { foldInputFor, proposalShaOf, replan } from './update-plan.js';
+/** An update receipt older than this is stale (4.11 CLI step 1). */
+const FRESH_MS = 30 * 60_000;
+const AHEAD_MS = 5_000;
+const SKEW_MS = 5_000;
+const CMD_MAX = 64 * 1024;
+const NOT = 'trail · not changed: ';
+export const UPDATE_DENY = {
+    flags: `${NOT}\`trail skills update\` takes only the skill's name and --offer <id>, and runs on its own.`,
+    tooLong: `${NOT}that command is too long for Trail to read, so it changes nothing.`,
+    noOffer: `${NOT}there is no change offer with that id in this session, so there is nothing the person said yes to.`,
+    noYes: `${NOT}the person didn't say yes to this change.`,
+    subagent: `${NOT}only the main session can change a skill.`,
+    noPerson: `${NOT}this session runs without a person at the keyboard (headless, CI or a scratch folder), so Trail changes nothing from it.`,
+    busy: `${NOT}Trail was busy. Run the same command again.`,
+    transcript: `${NOT}Trail couldn't find this conversation where Claude Code keeps it, so it can't check that the person said yes.`,
+};
+const one = (t, max = 60) => flatLine(t, max);
+export const changedDeny = (name) => `${NOT}${one(name)} changed since Trail showed this, so nothing changed. The person can see it with: trail skills show ${one(name)}`;
+const nameDeny = (name, id) => `${NOT}the offer was for the skill ${one(name)}. Run: trail skills update ${one(name)} --offer ${one(id, 40)}`;
+const splitDeny = (name, runId) => `${NOT}that offer keeps the steps as a new skill. Run: trail skills add ${one(name)} --run ${one(runId, 40)}`;
+const neverRanDeny = (cmds) => `${NOT}these steps never ran here and worked: ${cmds.map((c) => one(c, 80)).join('; ')}.`;
+const tamperDeny = (what) => `${NOT}this session changed Trail's own files (${one(what, 120)}), so Trail can't trust its record of what was offered.`;
+/**
+ * The person's yes to this offer, as `classifyFor` reads it for the offer's moment (4.10): 1a's yes words for an
+ * update; for drift its own word `replace` and 1a's yes words but not the keep or save ones ("keep it" there means leave it).
+ */
+const isYes = (moment, afterShow) => (t) => classifyFor(moment, t, afterShow) === 'yes';
+/** The steps of `next` that aren't steps of `base` (the new or changed ones), with the calls they were copied from. */
+const changedSteps = (base, next) => next.steps.filter((s) => !base.steps.some((b) => b.cmd === s.cmd));
+/** 4.11 steps 1, 3, 4, 5b and 6, both halves. Tamper (step 5) is read by each half from the transcript's tail. */
+function decide(cmd, ctx, st) {
+    const env = ctx.env;
+    if (ctx.subagent)
+        return { deny: UPDATE_DENY.subagent };
+    if (!ctx.fold || !ctx.learn)
+        return { deny: UPDATE_DENY.noPerson };
+    if (!cmd)
+        return { deny: UPDATE_DENY.flags };
+    if (st.tampered)
+        return { deny: tamperDeny(st.tampered) };
+    const po = st.pendingOffer;
+    if (!po || po.offerId !== cmd.offerId || (po.moment !== 'update' && po.moment !== 'drift') || !po.fold)
+        return { deny: UPDATE_DENY.noOffer };
+    if (po.fold.op === 'split')
+        return { deny: splitDeny(po.name, po.runId) };
+    if (cmd.name !== po.name)
+        return { deny: nameDeny(po.name, po.offerId) };
+    const fold = po.fold;
+    const sheet = readRunSheet(po.runId, env);
+    if (!sheet || sheet.session !== ctx.sessionHash)
+        return { deny: UPDATE_DENY.noOffer };
+    const tx = ctx.transcriptPath;
+    if (!tx || !po.shownAt || !po.yes)
+        return { deny: UPDATE_DENY.noYes };
+    const ta = po.typedAfter;
+    const entry = ta[0]?.answer === 'show' ? ta[1] : ta[0];
+    if (!entry || entry.answer !== 'yes' || entry.sha !== po.yes.typedSha)
+        return { deny: UPDATE_DENY.noYes };
+    const afterShow = entry !== ta[0];
+    // 4.16: every read of the transcript goes through the host's dialect (a Codex typed line counts by its keyed hash).
+    const use = dialectUse(ctx.host, st);
+    const p = personLine(tx, entry.offset, entry.sha, isYes(po.moment, afterShow), env, undefined, use);
+    // A yes typed before the offer was shown is no yes to it.
+    if (!p || !(p.at + SKEW_MS >= Date.parse(po.shownAt)))
+        return { deny: UPDATE_DENY.noYes };
+    // D72, R11: the agent's reply right before the yes ended with the offer's own line 2, after "show me" too (c3's show
+    // directive asks line 2 again after the diff, never 1a's Keep it?).
+    const lines = offerLinesOf(po, tx, env, use);
+    const notice = po.channel === 'notice' && hostFacts(env, ctx.host).offerChannel === 'notice';
+    if (!lines || (!notice && !endsWithLine(replyBefore(tx, entry.offset, env, use) ?? '', lines[1])))
+        return { deny: UPDATE_DENY.noYes };
+    // 6 (P29, R14): the same change, from the same file.
+    const plan = replan(fold.skillId, po.runId, fold.op, env, { st });
+    if (!plan || plan.baseHash !== fold.baseHash || plan.proposalSha !== fold.proposalSha)
+        return { deny: changedDeny(po.name) };
+    // 5b (R4): every new or changed step ran here, as stored, and worked, read again in the transcript.
+    const joined = joinCarriedSheet(sheet, (id) => readRunSheet(id, env));
+    const byId = new Map(joined.calls.map((c) => [c.id, c]));
+    const units = changedSteps(plan.base, plan.next).map((s) => ({ ids: s.from ?? [], text: s.cmd }));
+    // A check the old version didn't have (drift's replace takes the fresh compile's), as 1a's add gate reads one (step 7).
+    const checkCall = joined.checkIndex === null ? null : joined.calls[joined.checkIndex] ?? null;
+    if (plan.next.check && !plan.next.checkIsStep && plan.next.check !== plan.base.check)
+        units.push({ ids: checkCall ? [checkCall.id] : [], text: plan.next.check });
+    const bad = units.filter((u) => !u.ids.length || !u.ids.every((id) => ranAndWorked(byId.get(id), tx, joined.job, use, env)));
+    if (bad.length)
+        return { deny: neverRanDeny(bad.slice(0, 3).map((u) => u.text)) };
+    return { po: po, typed: p.typed, plan };
+}
+/* -------------------------------------------------------------- the receipts */
+const updateReceiptPath = (session, env) => receiptPath(session, env).replace(/\.json$/, '.update.json');
+const str = (v) => typeof v === 'string';
+const OPS = new Set(['update', 'extend', 'replace']);
+function asUpdateReceipt(v) {
+    if (!v || typeof v !== 'object' || Array.isArray(v))
+        return null;
+    const r = v;
+    if (r.v !== 1 || r.kind !== 'update' || !str(r.session) || !str(r.transcriptPath) || !str(r.toolUseId) || !str(r.host))
+        return null;
+    if (!str(r.offerId) || !str(r.skillId) || !str(r.name) || !str(r.runId) || !OPS.has(r.op) || !str(r.baseHash) || !str(r.proposalSha) || !str(r.at))
+        return null;
+    if (!r.typed || typeof r.typed !== 'object' || typeof r.typed.offset !== 'number' || !str(r.typed.lineSha))
+        return null;
+    return r.usedAt === null || str(r.usedAt) ? r : null;
+}
+function readUpdateReceipt(path) {
+    try {
+        if (!lstatSync(path).isFile())
+            return null;
+    }
+    catch {
+        return null;
+    }
+    return asUpdateReceipt(readJsonSafe(path));
+}
+/** The unused update receipt for this offer and name, under 30 minutes old (any session's file; the newest). */
+export function findUpdateReceipt(offerId, name, now, env) {
+    let names;
+    try {
+        names = readdirSync(trailPath(env, 'receipts'));
+    }
+    catch {
+        return null;
+    }
+    let best = null;
+    for (const n of names) {
+        if (!n.endsWith('.update.json'))
+            continue;
+        const r = readUpdateReceipt(join(trailPath(env, 'receipts'), n));
+        if (!r || r.usedAt !== null || r.offerId !== offerId || r.name !== name)
+            continue;
+        const age = now.getTime() - Date.parse(r.at);
+        if (Number.isNaN(age) || age > FRESH_MS || age < -AHEAD_MS)
+            continue;
+        if (!best || Date.parse(r.at) > Date.parse(best.at))
+            best = r;
+    }
+    return best;
+}
+function markUpdateReceiptUsed(r, now, env) {
+    const path = updateReceiptPath(r.session, env);
+    withLock(path, () => {
+        const cur = readUpdateReceipt(path);
+        if (!cur || cur.toolUseId !== r.toolUseId || cur.at !== r.at || cur.usedAt !== null)
+            return;
+        writePrivate(path, `${JSON.stringify({ ...cur, usedAt: now.toISOString() }, null, 2)}\n`);
+    }, 1000);
+}
+/** The receipt as 1a's transcript checks read one: tier A always (updates are tier A only), so another host's is refused. */
+const asReceipt = (r) => ({ ...r, tier: 'A' });
+/* ----------------------------------------------------------- PreToolUse half */
+/** 4.11's PreToolUse half: a deny with the reason, or null after writing the receipt (the call runs). */
+export function checkSkillsUpdate(input, ctx, st, _fold) {
+    const command = input?.tool_input?.command;
+    if (typeof command !== 'string' || !SKILLS_UPDATE_RE.test(command))
+        return null;
+    if (command.length > CMD_MAX)
+        return { permissionDecision: 'deny', reason: UPDATE_DENY.tooLong };
+    const cmd = parseSkillsUpdate(command);
+    const tx = ctx.transcriptPath;
+    const tampered = cmd && tx && !ctx.subagent && ctx.learn ? tamperInTail(tailCalls(tx, dialectFor(ctx.host) ?? CLAUDE_DIALECT, ctx.env), tx, ctx.env) : null;
+    if (tampered)
+        return { permissionDecision: 'deny', reason: tamperDeny(tampered) };
+    const d = decide(cmd, ctx, st);
+    if ('deny' in d)
+        return { permissionDecision: 'deny', reason: d.deny };
+    const r = {
+        v: 1, kind: 'update', session: ctx.sessionId, transcriptPath: tx ?? '', toolUseId: typeof input?.tool_use_id === 'string' ? input.tool_use_id : '',
+        host: ctx.host, offerId: d.po.offerId, skillId: d.po.fold.skillId, name: d.po.name, runId: d.po.runId, op: d.po.fold.op,
+        baseHash: d.plan.baseHash, proposalSha: d.plan.proposalSha, typed: d.typed, at: ctx.now.toISOString(), usedAt: null,
+    };
+    writePrivate(updateReceiptPath(ctx.sessionId, ctx.env), `${JSON.stringify(r, null, 2)}\n`);
+    return null;
+}
+/** 3.3 step 3 for an update command, from the hook's payload: the gate, then `checkSkillsUpdate` under the session lock. */
+export function updateGate(input, dir, env = process.env, now) {
+    try {
+        const g = skillsGate(input, dir, env, now);
+        if (!g.ok)
+            return null;
+        const ctx = g.ctx;
+        if (ctx.subagent)
+            return { permissionDecision: 'deny', reason: UPDATE_DENY.subagent };
+        if (!ctx.fold)
+            return { permissionDecision: 'deny', reason: UPDATE_DENY.noPerson };
+        const r = withSkillSession(ctx, { catchUp: true, waitMs: 300 }, (st, fold) => checkSkillsUpdate(input, ctx, st, fold));
+        return r === undefined ? { permissionDecision: 'deny', reason: UPDATE_DENY.busy } : r;
+    }
+    catch (e) {
+        // 0 rule 5: the command runs, and the CLI finds no receipt and changes nothing.
+        hookError('pre-bash', e, env);
+        return null;
+    }
+}
+const fail = (line) => ({ code: 1, lines: [line] });
+/** The transcript shows the main session's agent running exactly this update, with the receipt's tool_use id. */
+function updateInTranscript(r, name, offerId, calls) {
+    if (!r.toolUseId)
+        return false;
+    return calls.some((call) => {
+        const raw = call.id === r.toolUseId ? bashCommand(call) : null;
+        const c = raw === null ? null : parseSkillsUpdate(raw);
+        return c !== null && c.name === name && c.offerId === offerId;
+    });
+}
+/** A path as the person reads it: `~/…` under their home (Windows may set only USERPROFILE, which homedir() reads). */
+function shown(p, env) {
+    const home = env.HOME || homedir();
+    const rel = home && isAbsolute(p) ? relative(home, p) : '';
+    // Forward slashes either way: the person pastes it into Git Bash or PowerShell on Windows, and both take them.
+    return rel && !rel.startsWith('..') && !isAbsolute(rel) ? `~/${rel.split(sep).join('/')}` : p.split(sep).join('/');
+}
+/** What changed, in words: `step 4 is now '…'`, `step 5 added: '…'`, `the 4 steps that just worked replace the old ones`. */
+export function whatChanged(op, plan) {
+    const q = (c) => `'${one(c, 60).replace(/'/g, '"')}'`;
+    if (op === 'update' && plan.plan?.op === 'update')
+        return `step ${plan.plan.step} is now ${q(plan.plan.cmd.cmd)}`;
+    if (op === 'extend' && plan.plan?.op === 'extend') {
+        const at = plan.plan.at;
+        const cmds = plan.plan.cmds;
+        return cmds.length === 1 ? `step ${at + 1} added: ${q(cmds[0].cmd)}` : `steps ${at + 1} and ${at + 2} added: ${q(cmds[0].cmd)} and ${q(cmds[1].cmd)}`;
+    }
+    const k = plan.next.steps.length;
+    return `the ${k} step${k === 1 ? '' : 's'} that just worked replace the old ones`;
+}
+const WRITE_WHY = {
+    busy: UPDATE_DENY.busy,
+    link: `${NOT}the skill's folder in Trail's home is a link, so Trail won't write through it.`,
+    io: `${NOT}Trail couldn't write the new version, so the skill is as it was.`,
+};
+/** 4.11's CLI half: re-decides from the transcript, plans again, writes the new version or the proposal. Exit 0 changed, 1 not. */
+export function cliUpdate(name, offerId, env = process.env, now = new Date()) {
+    if (!skillsOn(env))
+        return fail('Skills are off. Turn them on with: trail skills on');
+    const found = findUpdateReceipt(offerId, name, now, env);
+    if (!found)
+        return fail(UPDATE_DENY.noYes);
+    const sandboxed = codexSandboxRefusal(found.host, `trail skills update ${name} --offer ${offerId}`, env);
+    if (sandboxed)
+        return fail(sandboxed);
+    const r = receiptTranscriptOk(asReceipt(found), env) && receiptTranscriptRead(asReceipt(found), env) ? found : null;
+    if (!r) {
+        markUpdateReceiptUsed(found, now, env);
+        return fail(UPDATE_DENY.transcript);
+    }
+    const calls = tailCalls(r.transcriptPath, dialectFor(r.host) ?? CLAUDE_DIALECT, env);
+    if (!updateInTranscript(r, name, offerId, calls))
+        return fail(UPDATE_DENY.noYes);
+    const tampered = tamperInTail(calls, r.transcriptPath, env);
+    if (tampered) {
+        markUpdateReceiptUsed(r, now, env);
+        return fail(tamperDeny(tampered));
+    }
+    const sheet = readRunSheet(r.runId, env);
+    if (!sheet) {
+        markUpdateReceiptUsed(r, now, env);
+        return fail(`${NOT}the run it came from is gone (runs are kept 7 days).`);
+    }
+    const ctx = {
+        sessionId: r.session, sessionHash: createHash('sha256').update(r.session).digest('hex').slice(0, 12), host: r.host, tier: 'A',
+        entry: 'interactive', permissionMode: null, subagent: false, fold: true, learn: true, learnOff: null, dir: sheet.checkout ?? '',
+        checkout: sheet.checkout ?? '', repoKey: sheet.repoKey, transcriptPath: r.transcriptPath, env, now,
+    };
+    let out;
+    try {
+        out = withSkillSession(ctx, { catchUp: true, waitMs: 1000 }, (st) => {
+            const d = decide({ name, offerId }, ctx, st);
+            if ('deny' in d)
+                return fail(d.deny);
+            const backed = d.typed.offset === r.typed.offset && d.typed.lineSha === r.typed.lineSha && typedLineStillThere(r.transcriptPath, r.typed)
+                && d.plan.proposalSha === r.proposalSha && d.plan.baseHash === r.baseHash && d.po.fold.op === r.op && d.po.fold.skillId === r.skillId;
+            if (!backed)
+                return fail(changedDeny(name));
+            const ref = listAllPersonal(env).find((x) => x.id === r.skillId && x.name === name);
+            if (!ref)
+                return fail(changedDeny(name));
+            const op = r.op;
+            if (d.plan.handEdited) {
+                const p = writeProposal(ref, d.plan.next, r.op, env, now);
+                if (!p)
+                    return fail(`${NOT}Trail couldn't write the change beside ${one(name)}, so nothing changed.`);
+                st.pendingOffer = null;
+                const diff = p.diff ? p.diff.split('\n') : [];
+                return {
+                    code: 0, op, proposal: true, lines: [
+                        ...diff,
+                        `Tell the person: you changed ${one(name)} by hand, so Trail left it alone and wrote the change beside it. To use it, they run this in their own terminal: cp ${shown(p.path, env)} ${shown(ref.file, env)} (their edited file is kept in .versions/${p.hand})`,
+                    ],
+                };
+            }
+            const w = writeNewVersion(ref, d.plan.next, { op, offerId, baseHash: d.plan.baseHash, lessonIds: d.plan.plan?.op === 'extend' ? d.plan.plan.lessonIds : undefined, env, now });
+            if (!w.ok)
+                return fail(w.why === 'changed' ? changedDeny(name) : WRITE_WHY[w.why]);
+            st.pendingOffer = null;
+            const what = whatChanged(op, d.plan);
+            const n = w.version;
+            return {
+                code: 0, op, lines: [
+                    `✓ changed ${one(name)} to v${n} · ${what}`,
+                    `Tell the person what Trail changed: ${one(name)} is now v${n}: ${what}. It's a candidate again until its next checked use. The old version is kept; to go back: trail skills restore ${one(name)} --version ${n - 1}`,
+                ],
+            };
+        });
+    }
+    catch (e) {
+        out = fail(`${NOT}${one(e instanceof Error ? e.message : String(e), 160).replace(/^trail:\s*/, '')}`);
+    }
+    // 4.11 CLI step 4: used once, a refusal included; a busy session lock leaves it for the same command again.
+    if (out === undefined)
+        return fail(UPDATE_DENY.busy);
+    markUpdateReceiptUsed(r, now, env);
+    return out;
+}
+//# sourceMappingURL=update-gate.js.map

package/dist/skills/update-gate.js.map

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

package/dist/skills/update-plan.d.ts

@@ -0,0 +1,40 @@
+import type { CompiledSkill, FoldOp } from './types.js';
+import type { RunSheet, SkillInjection, SkillSessionState } from '../trace/types.js';
+import { type FoldInput, type FoldPlan } from './fold.js';
+export type PlanInj = Pick<SkillInjection, 'params' | 'steps' | 'at' | 'check'>;
+/** `inj`: the block's injection (Stop passes the live one); else it is found in `st`, else in the run's session file. */
+export interface PlanOpts {
+    inj?: PlanInj;
+    st?: SkillSessionState | null;
+    now?: Date;
+}
+export interface Replanned {
+    next: CompiledSkill;
+    text: string;
+    /** 16 hex of sha256 of `text` (4.7). */
+    proposalSha: string;
+    /** `skillHash` of the file the plan was computed from. */
+    baseHash: string;
+    /** That file's text, for the printed diff (`draft --print`). */
+    current: string;
+    /** The file isn't what Trail last wrote: the change goes beside it (4.6). */
+    handEdited: boolean;
+    /** The fold plan; null for drift's replace. */
+    plan: Extract<FoldPlan, {
+        op: 'update' | 'extend';
+    }> | null;
+    base: CompiledSkill;
+    fresh: CompiledSkill | null;
+}
+/** The run's own session file (its `skills.sessionHash` is the sheet's), among the 64 newest: for draft, which has no session. */
+export declare function sessionOf(sheet: RunSheet, env: NodeJS.ProcessEnv): SkillSessionState | null;
+/** The fold input for one checked use of the skill (4.2), from disk; null when the skill, the run or its block is gone. */
+export declare function foldInputFor(skillId: string, runId: string, env?: NodeJS.ProcessEnv, o?: PlanOpts): FoldInput | null;
+export declare const proposalShaOf: (text: string) => string;
+/**
+ * The change again, from the run sheet and the file as they are now (4.11 step 6). Update and extend: `planFold`
+ * must give that same op. Replace (drift): the fresh compile as the next version, keeping the skill's id, name and
+ * asks. The next version is numbered past every kept one, as the write numbers it. null: nothing to change.
+ */
+export declare function replan(skillId: string, runId: string, op: FoldOp | 'replace', env?: NodeJS.ProcessEnv, o?: PlanOpts): Replanned | null;
+//# sourceMappingURL=update-plan.d.ts.map

package/dist/skills/update-plan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-plan.d.ts","sourceRoot":"","sources":["../../src/skills/update-plan.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAmC,MAAM,YAAY,CAAC;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMrF,OAAO,EAAoC,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAC;AAa5F,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;AAChF,yHAAyH;AACzH,MAAM,WAAW,QAAQ;IAAG,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,EAAE,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAAC,GAAG,CAAC,EAAE,IAAI,CAAA;CAAE;AAEtF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,UAAU,EAAE,OAAO,CAAC;IACpB,+CAA+C;IAC/C,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,QAAQ,GAAG,QAAQ,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IAC5D,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;CAC7B;AA4CD,kIAAkI;AAClI,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,iBAAiB,GAAG,IAAI,CAgB3F;AAgDD,2HAA2H;AAC3H,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,EAAE,CAAC,GAAE,QAAa,GAAG,SAAS,GAAG,IAAI,CAMrI;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,WAAyE,CAAC;AAEpH;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,EAAE,CAAC,GAAE,QAAa,GAAG,SAAS,GAAG,IAAI,CAyBvJ"}

package/dist/skills/update-plan.js

@@ -0,0 +1,196 @@
+/**
+ * The change a moment 5 or 6 offer shows, worked out again from disk
+ * (phase 2 design 4.11, R14): the run sheet, the skill file as it is now, its
+ * unfolded lessons, and the ledger uses from before that run started (never
+ * later ones, so a use another session flushed since can't move the plan).
+ * One builder (`foldInputFor`) and one plan (`replan`) serve the offer at
+ * Stop (c3, through `OfferInput.plan`), both halves of the update gate and
+ * `trail skills draft --print`, so they can't disagree: the offer pins the
+ * `proposalSha` and `baseHash` this returns, and the gate writes only when
+ * they come out the same again.
+ *
+ * Re-exported from `update-gate.ts`, where the design names `replan`.
+ * Loaded only on the update paths, never on the PreToolUse fast path.
+ */
+import { createHash } from 'node:crypto';
+import { lstatSync, readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { joinCarriedSheet, readRunSheet } from '../trace/runs.js';
+import { readJsonSafe, trailPath } from '../util/private-fs.js';
+import { compileRun, proposeName } from './compile.js';
+import { fidelityOf } from './fidelity.js';
+import { fidelityWhere } from './credit-facts.js';
+import { applyFold, planFold, replaceWith } from './fold.js';
+import { readLedger } from './ledger.js';
+import { readLessons } from './lessons.js';
+import { runCheckout } from './run-checkout.js';
+import { rebuildCompiled, rebuildLoose } from './skill-rebuild.js';
+import { parseSkillMd, renderSkillMd, skillHash } from './skillmd.js';
+import { getSkillState } from './state.js';
+import { listAllPersonal, nameTaken } from './store.js';
+import { MAX_SKILL_BYTES } from './store-fs.js';
+import { nextVersion } from './versions.js';
+import { fillParams } from './params.js';
+import { recallMarks, stepLearnings, whose } from './follow-learnings.js';
+const MAX_EARLIER = 4;
+const SESSION_FILES = 64;
+const SESSION_MAX_BYTES = 8 * 1024 * 1024;
+/** The file's text when it is a regular file of at most 64 KB and neither it nor its folder is a link. */
+function ownText(ref) {
+    try {
+        if (lstatSync(ref.dir).isSymbolicLink())
+            return null;
+        const s = lstatSync(ref.file);
+        if (!s.isFile() || s.size > MAX_SKILL_BYTES)
+            return null;
+        return readFileSync(ref.file, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}
+/** The helper file names in scripts/ (a rebuilt skill names them; a fold never writes them). */
+function scriptNames(dir) {
+    try {
+        if (!lstatSync(join(dir, 'scripts')).isDirectory())
+            return [];
+        return readdirSync(join(dir, 'scripts')).filter((n) => !n.startsWith('.') && lstatSync(join(dir, 'scripts', n)).isFile()).sort();
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * The block as credit read it (`settleCredit`, and c3's offer at Stop): the newest injection of this skill for the
+ * job's runs (the run and the parts a compaction joined into it) gives the params, steps and check, the oldest its
+ * `at`, so the fidelity window and so the plan come out the same at Stop, in PreToolUse and in the CLI.
+ */
+function injIn(st, skillId, runIds) {
+    const all = Array.isArray(st?.injected) ? st.injected : [];
+    const mine = all.filter((i) => i && i.skillId === skillId && i.runId !== null && runIds.includes(i.runId) && i.cue !== 'check')
+        .sort((a, b) => Date.parse(a.at) - Date.parse(b.at));
+    if (!mine.length)
+        return null;
+    const newest = mine[mine.length - 1];
+    return { params: newest.params, steps: newest.steps, check: newest.check, at: mine[0].at };
+}
+/** The run's own session file (its `skills.sessionHash` is the sheet's), among the 64 newest: for draft, which has no session. */
+export function sessionOf(sheet, env) {
+    const dir = trailPath(env, 'sessions');
+    let names;
+    try {
+        names = readdirSync(dir).filter((n) => /^[\w.-]+\.json$/.test(n) && !/\.(?:hooks|gate|lesson|update)\.json$/.test(n)).flatMap((n) => {
+            const s = lstatSync(join(dir, n));
+            return s.isFile() && s.size <= SESSION_MAX_BYTES ? [{ n, t: s.mtimeMs }] : [];
+        });
+    }
+    catch {
+        return null;
+    }
+    for (const { n } of names.sort((a, b) => b.t - a.t).slice(0, SESSION_FILES)) {
+        const st = readJsonSafe(join(dir, n))?.skills;
+        if (st && typeof st === 'object' && st.sessionHash === sheet.session)
+            return st;
+    }
+    return null;
+}
+function gather(skillId, runId, env, o, needInj) {
+    const ref = listAllPersonal(env).find((r) => r.id === skillId);
+    if (!ref || ref.scope !== 'personal')
+        return null;
+    const text = ownText(ref);
+    const skill = text === null ? null : parseSkillMd(text, ref.name);
+    if (text === null || !skill || skill.meta.trail !== skillId)
+        return null;
+    const sheet = readRunSheet(runId, env);
+    if (!sheet)
+        return null;
+    const read = (id) => readRunSheet(id, env);
+    const joined = joinCarriedSheet(sheet, read);
+    const ids = [...new Set([runId, ...(joined.joined ?? []).map((j) => j.id)])];
+    const inj = o.inj ?? injIn(o.st, skillId, ids) ?? (needInj ? injIn(sessionOf(sheet, env), skillId, ids) : null);
+    if (needInj && !inj)
+        return null;
+    const home = env.HOME || homedir();
+    const repoRoot = runCheckout(joined, env, '');
+    // c3's credit flush keys extraShas with the same `where` (one function for both), or two-uses never matches (R10).
+    const fid = fidelityOf(skill, inj ?? { params: {}, steps: [] }, joined.calls, fidelityWhere(joined, env));
+    const scope = { repoKeys: [sheet.repoKey], checkout: repoRoot, env };
+    const c = compileRun(sheet, {
+        repoRoot, home, platform: process.platform, prior: null, name: ref.name, moment: 'repeated',
+        applies: skill.meta.applies ?? sheet.repoKey, taken: () => false, id: skillId, readSheet: read,
+    });
+    const fresh = c.ok ? c.skill : null;
+    // R14: the uses before this run started, newest last.
+    const started = Date.parse(sheet.startedAt);
+    const earlier = readLedger(skillId, env).filter((l) => l.event === 'use' && Date.parse(l.at) < started).slice(-MAX_EARLIER);
+    const state = getSkillState(skillId, env);
+    const hash = skillHash(text);
+    const handEdited = !state || (hash !== state.hash && hash !== state.pendingWrite?.hash);
+    const base = handEdited ? rebuildLoose(text, skill)
+        : rebuildCompiled(text, skill, { source: state.source, helpers: scriptNames(ref.dir), runId: state.runId });
+    let splitName;
+    try {
+        if (fresh)
+            splitName = proposeName(sheet, fresh.steps, (n) => nameTaken(n, scope) !== null);
+    }
+    catch { /* no split name: no split */ }
+    // Part 7: the steps the block showed the way a live learning says, as it showed them (the injection's steps).
+    const preferred = inj ? recallMarks(skill.steps, stepLearnings({ repoKeys: [sheet.repoKey], checkout: repoRoot, env })).flatMap((m) => [...m.fixes].flatMap(([step, cmd]) => (cmd && inj.steps?.[step - 1] === fillParams(cmd, inj.params ?? {}) ? [{ step, cmd, follows: whose(m.l) }] : []))) : [];
+    const input = {
+        skill, text, fresh, fid, inj: { params: inj?.params ?? {} }, taken: (n) => nameTaken(n, scope) !== null, ...(preferred.length ? { preferred } : {}),
+        earlierExtraShas: earlier.map((u) => u.extraShas ?? []), lessons: readLessons(ref.dir),
+        earlierRan: earlier.map((u) => u.stepsRan), earlierChecks: earlier.map((u) => u.check), base, ...(splitName ? { splitName } : {}),
+    };
+    return { input, ref, state, text, sheet, handEdited };
+}
+/** The fold input for one checked use of the skill (4.2), from disk; null when the skill, the run or its block is gone. */
+export function foldInputFor(skillId, runId, env = process.env, o = {}) {
+    try {
+        return gather(skillId, runId, env, o, true)?.input ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+export const proposalShaOf = (text) => createHash('sha256').update(text, 'utf8').digest('hex').slice(0, 16);
+/**
+ * The change again, from the run sheet and the file as they are now (4.11 step 6). Update and extend: `planFold`
+ * must give that same op. Replace (drift): the fresh compile as the next version, keeping the skill's id, name and
+ * asks. The next version is numbered past every kept one, as the write numbers it. null: nothing to change.
+ */
+export function replan(skillId, runId, op, env = process.env, o = {}) {
+    try {
+        if (op === 'split')
+            return null;
+        const g = gather(skillId, runId, env, o, op !== 'replace');
+        const base = g?.input.base ?? null;
+        if (!g || !base || !/^[1-9]\d{0,5}$/.test(String(base.meta.version)))
+            return null;
+        let next;
+        let plan = null;
+        if (op === 'replace') {
+            if (!g.input.fresh)
+                return null;
+            next = replaceWith(base, g.input.fresh);
+        }
+        else {
+            const p = planFold(g.input);
+            if (p.op !== op)
+                return null;
+            plan = p;
+            next = applyFold(base, plan);
+        }
+        if (!next)
+            return null;
+        const version = String(nextVersion(g.ref, Number(base.meta.version)));
+        next = { ...next, meta: { ...next.meta, version } };
+        const text = renderSkillMd(next);
+        return { next, text, proposalSha: proposalShaOf(text), baseHash: skillHash(g.text), current: g.text, handEdited: g.handEdited, plan, base, fresh: g.input.fresh };
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=update-plan.js.map