@nanonets/graft 0.24.1 → 0.25.0

package/dist/skills/fold.d.ts

@@ -0,0 +1,87 @@
+import type { CompiledSkill, FoldOp, ParsedSkill, SkillStep } from './types.js';
+import type { SkillInjection } from '../trace/types.js';
+import type { Lesson } from './lessons.js';
+import type { Fidelity } from './fidelity.js';
+export type FoldPlan = {
+    op: 'update';
+    step: number;
+    cmd: SkillStep;
+    why: 'failed-then-worked';
+}
+/**
+ * Part 7: the block showed step `step` the way a live learning says (`follows`: whose, "your preference"), and it
+ * worked; `more`: the other steps the same learning changed that ran that way too, changed with it.
+ */
+ | {
+    op: 'update';
+    step: number;
+    cmd: SkillStep;
+    why: 'preference';
+    follows: string;
+    more?: SkillStep[];
+} | {
+    op: 'extend';
+    at: number;
+    cmds: SkillStep[];
+    why: 'lesson' | 'two-uses';
+    lessonIds: string[];
+} | {
+    op: 'split';
+    from: number;
+    to: number;
+    name: string;
+} | {
+    op: 'none';
+    why: FoldNone;
+};
+export type FoldNone = 'no-change' | 'compile' | 'too-big' | 'too-long' | 'risk' | 'new-param' | 'layout' | 'gated-new' | 'guardrail-lesson';
+export interface FoldInput {
+    skill: ParsedSkill;
+    text: string;
+    /** compileRun of this run's sheet (4.2 step 1); null when compile refused it. */
+    fresh: CompiledSkill | null;
+    fid: Fidelity;
+    inj: Pick<SkillInjection, 'params'>;
+    earlierExtraShas: string[][];
+    lessons: Lesson[];
+    earlierRan: number[][];
+    /** The earlier uses' checks, newest last, beside earlierRan: split needs the use before to have passed. Absent: no split. */
+    earlierChecks?: Array<'passed' | 'failed' | 'none'>;
+    /** The skill to fold: rebuildLoose of a hand-edited file (4.6). Absent: rebuildCompiled of `text`, or none 'layout'. */
+    base?: CompiledSkill | null;
+    /** Split's name, compile's proposeName for the fresh run made free (the caller has the sheet and the store). */
+    splitName?: string;
+    /** Whether a skill name is taken (the store's nameTaken): the split's name is never one (review). */
+    taken?: (name: string) => boolean;
+    /**
+     * Part 7: steps the block showed the way a live learning says rather than as the skill has them (`cmd` with the
+     * skill's params, `follows` whose learning it was). An update to that way is offered once it ran and checked out.
+     */
+    preferred?: Array<{
+        step: number;
+        cmd: string;
+        follows: string;
+    }>;
+}
+/** 4.2: the plan, its result checked (4.2 step 7) and through the size gate (4.3). Never throws. */
+export declare function planFold(i: FoldInput): FoldPlan;
+/** The plan applied: the new CompiledSkill (version bumped), or null when a check after the edit refuses it. */
+export declare function applyFold(base: CompiledSkill, plan: Exclude<FoldPlan, {
+    op: 'none' | 'split';
+}>): CompiledSkill | null;
+/** Drift (4.8, P17): the new version from the run, keeping the skill's id, name, scope, applies, job and asks. */
+export declare function replaceWith(base: CompiledSkill, fresh: CompiledSkill): CompiledSkill;
+/** Phase 3's N4: the change as text and a printed diff, from inputs only (no disk). `op: 'none'` gives text equal to the input. */
+export declare function foldDiff(i: FoldInput, base: CompiledSkill): {
+    text: string;
+    diff: string;
+    op: FoldOp | 'none';
+    why?: FoldNone;
+};
+/** Phase 3's N4 for drift: the whole new version and its diff against the skill as Trail reads it. */
+export declare function driftDiff(base: CompiledSkill, fresh: CompiledSkill): {
+    text: string;
+    diff: string;
+    op: 'replace';
+};
+//# sourceMappingURL=fold.d.ts.map

package/dist/skills/fold.d.ts.map

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

package/dist/skills/fold.js

@@ -0,0 +1,348 @@
+/**
+ * The fold plan (phase 2 design 4.2, spec 9 and 13, P1 to P11): moment 5's
+ * one change to a skill, worked out from the skill as it is and the run that
+ * just checked out. Update a step that failed and was done another way,
+ * extend with at most 2 steps a lesson or 2 uses in a row back, split a
+ * subset two uses ran into a skill of its own, or nothing.
+ *
+ * New step text only ever comes from a fresh compile of the run (P4): every
+ * copy rule, the secret and risk checks and the 12-line cap stay in one
+ * place. A fold can't add a param (P6) or a step that can't be undone (P7),
+ * goes through the renderer on an exact round trip (P11), and passes the
+ * size gate (4.3). Drift's replace (4.8) is a whole new version, not a fold.
+ *
+ * Pure: no disk, no clock. Phase 3 (N4) reads the change as text and a diff
+ * through `foldDiff` and `driftDiff`.
+ */
+import { createHash } from 'node:crypto';
+import { programVerb } from './fidelity.js';
+import { ranAs } from './ledger.js';
+import { fillParams } from './params.js';
+import { MAX_RUN_LINES, MAX_STEP_CHARS, gatedKind } from './risk.js';
+import { parseSkillMd, renderSkillMd } from './skillmd.js';
+import { refusedAtRecall } from './recall.js';
+import { rebuildCompiled } from './skill-rebuild.js';
+import { FOLD_MAX_CHARS, printDiff, sizeGate } from './skill-diff.js';
+import { goodName } from './compile-words.js';
+import { bareCommand, simpleCommands } from '../trace/shell.js';
+import { sameGatedCommand } from './fold-gated.js';
+const MAX_EXTEND = 2;
+const none = (why) => ({ op: 'none', why });
+const intVersion = (c) => (/^[1-9]\d{0,5}$/.test(String(c.meta.version ?? '')) ? Number(c.meta.version) : null);
+/** A fresh step's values: its params as this run filled them (findParams keeps this run's value first). */
+const freshValues = (fresh) => Object.fromEntries(fresh.params.filter((p) => p.seen[0] !== undefined).map((p) => [p.name, p.seen[0]]));
+/**
+ * The fresh step in the skill's own params (P6): each `{p}` becomes the skill param with the same filled value, or keeps
+ * its name when the skill has it and its value is a command (`$(git rev-parse HEAD)`) or unknown. null: a new param.
+ */
+function inSkillTerms(cmd, fresh, base, vals) {
+    const fv = freshValues(fresh);
+    const names = new Set(base.params.map((p) => p.name));
+    let bad = false;
+    const out = cmd.replace(/\{([A-Za-z_]\w*)\}/g, (m, p) => {
+        const v = fv[p];
+        const same = v === undefined ? undefined : [...names].find((q) => vals[q] === v);
+        if (same)
+            return `{${same}}`;
+        if (names.has(p) && (vals[p] === undefined || v === undefined || vals[p].startsWith('$(')))
+            return m;
+        bad = true;
+        return m;
+    });
+    return bad ? null : out;
+}
+/** The candidate's source call is one this use ran and passed in its checkout: an extra or a changed step of fidelity. */
+const passedHere = (c, fid) => [...fid.extra, ...fid.changed].some((x) => c.step.from?.includes(x.id));
+/** 4.2 step 2: fresh steps that ran as no skill step (nor the skill's check) are the candidates. */
+function candidates(base, fresh, vals) {
+    const fv = freshValues(fresh);
+    const matched = fresh.steps.map((s) => {
+        const filled = fillParams(s.cmd, fv);
+        const k = base.steps.findIndex((b) => ranAs(b.cmd, filled, vals));
+        return k + 1;
+    });
+    const cands = fresh.steps.flatMap((step, j) => {
+        const filled = fillParams(step.cmd, fv);
+        if (matched[j] > 0 || (base.check && ranAs(base.check, filled, vals)))
+            return [];
+        return [{ j, step, filled }];
+    });
+    return { cands, matched };
+}
+/** The skill step a candidate goes after: from fidelity's extra step for its source call, else the steps matched before it. */
+function afterOf(c, fid, matched) {
+    const e = fid.extra.find((x) => c.step.from?.includes(x.id));
+    if (e)
+        return e.after;
+    return Math.max(0, ...matched.slice(0, c.j));
+}
+const lessonCommand = (l) => {
+    const at = String(l.text ?? '').indexOf(': ');
+    return at < 0 ? '' : l.text.slice(at + 2).trim();
+};
+function planOf(i, base) {
+    const fresh = i.fresh;
+    const vals = i.inj?.params ?? {};
+    // P4, spec 13: a new step is one this use ran and passed, so only candidates fidelity counted (review).
+    const { cands: all, matched } = candidates(base, fresh, vals);
+    const cands = all.filter((c) => passedHere(c, i.fid));
+    // Part 7: steps the block showed the person's way, that ran that way: the change is from the fresh compile (P4).
+    const fv = freshValues(fresh);
+    const changes = [];
+    for (const p of i.preferred ?? []) {
+        const old = base.steps[p.step - 1];
+        if (!old || old.gated || !i.fid.ran.includes(p.step) || (changes.length && changes[0].follows !== p.follows))
+            continue;
+        const hit = fresh.steps.find((s) => !s.gated && ranAs(fillParams(p.cmd, vals), fillParams(s.cmd, fv), vals));
+        if (!hit)
+            continue;
+        const cmd = inSkillTerms(hit.cmd, fresh, base, vals);
+        if (cmd === null)
+            return none('new-param');
+        if (cmd !== old.cmd)
+            changes.push({ cmd: { ...old, cmd, n: p.step }, follows: p.follows });
+    }
+    if (changes.length) {
+        const [first, ...rest] = changes.sort((a, b) => a.cmd.n - b.cmd.n);
+        return { op: 'update', step: first.cmd.n, cmd: first.cmd, why: 'preference', follows: first.follows, ...(rest.length ? { more: rest.map((c) => c.cmd) } : {}) };
+    }
+    // 3. update: a step that failed and was done another way, the same program and verb.
+    for (const c of [...i.fid.changed].sort((a, b) => a.step - b.step)) {
+        const old = base.steps[c.step - 1];
+        if (!old)
+            continue;
+        const verb = programVerb(fillParams(old.cmd, vals));
+        const hit = cands.find((x) => x.step.from?.includes(c.id)) ?? cands.find((x) => verb !== null && programVerb(x.filled) === verb);
+        if (!hit)
+            continue;
+        const cmd = inSkillTerms(hit.step.cmd, fresh, base, vals);
+        if (cmd === null)
+            return none('new-param');
+        if ((hit.step.gated ?? null) !== (old.gated ?? null))
+            return none('gated-new');
+        // D138 (1): a gated step keeps its command; only its arguments may change (no force flag, no new shared branch).
+        if (old.gated && !sameGatedCommand(fillParams(old.cmd, vals), hit.filled))
+            return none('gated-new');
+        return { op: 'update', step: c.step, cmd: { ...hit.step, n: c.step, cmd }, why: 'failed-then-worked' };
+    }
+    // 4. extend: from a lesson the person kept on this skill, else the same extra step in the use before.
+    const lessonIds = new Map();
+    for (const l of i.lessons ?? []) {
+        const part = lessonCommand(l);
+        if (!part)
+            continue;
+        for (const c of cands) {
+            if (!ranAs(part, c.filled, vals))
+                continue;
+            if (l.kind === 'guardrail')
+                return none('guardrail-lesson');
+            lessonIds.set(c.j, [...(lessonIds.get(c.j) ?? []), l.id]);
+        }
+    }
+    let why = 'lesson';
+    let picked = cands.filter((c) => lessonIds.has(c.j));
+    if (!picked.length) {
+        const before = new Set(i.earlierExtraShas?.at(-1) ?? []);
+        why = 'two-uses';
+        picked = cands.filter((c) => i.fid.extra.some((e) => before.has(e.sha) && c.step.from?.includes(e.id)));
+    }
+    if (picked.length) {
+        const at = afterOf(picked[0], i.fid, matched);
+        const group = picked.filter((c) => afterOf(c, i.fid, matched) === at).slice(0, MAX_EXTEND);
+        const cmds = [];
+        for (const [k, c] of group.entries()) {
+            if (c.step.gated || gatedKind(c.filled))
+                return none('gated-new');
+            const cmd = inSkillTerms(c.step.cmd, fresh, base, vals);
+            if (cmd === null)
+                return none('new-param');
+            cmds.push({ ...c.step, n: at + k + 1, cmd });
+        }
+        const ids = why === 'lesson' ? [...new Set(group.flatMap((c) => lessonIds.get(c.j) ?? []))] : [];
+        return { op: 'extend', at, cmds, why, lessonIds: ids };
+    }
+    // 5. split: this use and the one before ran the same contiguous steps, 2 or more and fewer than all, both checked, no extras.
+    const prevRan = i.earlierRan?.at(-1);
+    if (prevRan && i.earlierChecks?.at(-1) === 'passed' && !i.fid.extra.length && !i.fid.changed.length && !(i.earlierExtraShas?.at(-1) ?? []).length) {
+        const now = [...new Set(i.fid.ran)].sort((a, b) => a - b);
+        const prev = [...new Set(prevRan)].sort((a, b) => a - b);
+        const contiguous = now.every((n, k) => k === 0 || n === now[k - 1] + 1);
+        if (now.length >= 2 && now.length < base.steps.length && contiguous && now.join() === prev.join()) {
+            const name = splitNameFor(i, base);
+            if (name)
+                return { op: 'split', from: now[0], to: now.at(-1), name };
+        }
+    }
+    return none('no-change');
+}
+/** A good name no other skill has; null when none is found (review: a hand-edited name is no base for a folder). */
+function splitNameFor(i, base) {
+    const free = (n) => goodName(n) && n !== base.name && !(i.taken?.(n) ?? false);
+    if (i.splitName && free(i.splitName))
+        return i.splitName;
+    const stem = goodName(base.name) ? base.name : i.fresh && goodName(i.fresh.name) ? i.fresh.name : 'split';
+    for (let n = 2; n < 100; n++) {
+        const name = `${stem.slice(0, 44).replace(/-+$/, '')}-${n}`;
+        if (free(name) && name !== i.fresh?.name)
+            return name;
+    }
+    return null;
+}
+/** The base to fold: the caller's, else the file rebuilt on an exact round trip. */
+const baseFor = (i) => i.base ?? rebuildCompiled(i.text, i.skill, { source: null, helpers: [] });
+/** 4.2: the plan, its result checked (4.2 step 7) and through the size gate (4.3). Never throws. */
+export function planFold(i) {
+    try {
+        if (!i.fresh || !i.fresh.steps?.length)
+            return none('compile');
+        const base = baseFor(i);
+        if (!base || intVersion(base) === null)
+            return none('layout');
+        const plan = planOf(i, base);
+        if (plan.op !== 'update' && plan.op !== 'extend')
+            return plan;
+        const next = applyWhy(base, plan);
+        if ('why' in next)
+            return none(next.why);
+        // Part 7: a change to follow a learning swaps a program in the steps it names and nothing else, so on a small skill
+        // it can touch most of the file; only the size in characters holds it back.
+        const size = sizeGate(renderSkillMd(base), renderSkillMd(next.skill));
+        if (!(plan.op === 'update' && plan.why === 'preference' ? size.chars <= FOLD_MAX_CHARS : size.ok))
+            return none('too-big');
+        return plan;
+    }
+    catch {
+        return none('no-change');
+    }
+}
+/* -------------------------------------------------------------- applying */
+/** Words compile never lists as a need (compile.ts NOT_NEEDS), plus a wait loop's own words. */
+const NOT_NEEDS = new Set(['cd', 'export', 'source', 'echo', 'printf', 'sleep', 'true', 'false', 'pwd', 'set', 'unset', 'alias', 'wait', 'exit', 'return', 'test', 'until', 'while', 'if', 'for', 'do', 'done', 'then', 'fi', 'eval', 'exec', 'read', 'local', 'shift', 'trap', 'cat', 'ls', 'head', 'tail', 'grep', 'break']);
+const MAX_NEEDS = 6;
+/** The programs a step needs, as compile reads them (its folder taken off). */
+function needsOf(cmd) {
+    const core = /^\(cd \S+ && (.*)\)$/.exec(cmd)?.[1] ?? cmd;
+    const out = [];
+    for (const simple of simpleCommands(core)) {
+        const w = bareCommand(simple).split(/\s+/)[0] ?? '';
+        if (/^[A-Za-z][\w.+-]*$/.test(w) && !NOT_NEEDS.has(w) && !out.includes(w))
+            out.push(w);
+    }
+    return out;
+}
+/** `needs` after a change: what a removed step alone needed goes, what a new step needs is added, at most 6. */
+function needsAfter(base, steps, check) {
+    const had = String(base.meta.needs ?? '').split(/,\s*/).map((s) => s.trim()).filter(Boolean);
+    const used = new Set([...steps.map((s) => s.cmd), ...(check ? [check] : [])].flatMap(needsOf));
+    const before = new Set([...base.steps.map((s) => s.cmd), ...(base.check ? [base.check] : [])].flatMap(needsOf));
+    const kept = had.filter((p) => used.has(p) || !before.has(p));
+    for (const p of used)
+        if (!kept.includes(p) && !before.has(p))
+            kept.push(p);
+    return kept.length ? kept.slice(0, MAX_NEEDS).join(', ') : undefined;
+}
+function applyWhy(base, plan) {
+    const v = intVersion(base);
+    if (v === null)
+        return { why: 'layout' };
+    let steps = base.steps.map((s) => ({ ...s }));
+    let check = base.check;
+    if (plan.op === 'update') {
+        const old = steps[plan.step - 1];
+        if (!old || !plan.cmd?.cmd)
+            return { why: 'layout' };
+        for (const next of [plan.cmd, ...(plan.why === 'preference' ? plan.more ?? [] : [])]) {
+            const was = steps[next.n - 1];
+            if (!was)
+                return { why: 'layout' };
+            if (base.checkIsStep && was.cmd === base.check)
+                check = next.cmd;
+            steps[next.n - 1] = { ...next };
+        }
+    }
+    else {
+        if (!Number.isInteger(plan.at) || plan.at < 0 || plan.at > steps.length || !plan.cmds?.length)
+            return { why: 'layout' };
+        steps.splice(plan.at, 0, ...plan.cmds.map((s) => ({ ...s })));
+    }
+    steps = steps.map((s, k) => ({ ...s, n: k + 1 }));
+    if (steps.length > MAX_RUN_LINES || steps.some((s) => s.cmd.length > MAX_STEP_CHARS))
+        return { why: 'too-long' };
+    if (steps.some((s) => !s.gated && gatedKind(s.cmd) !== null))
+        return { why: 'risk' };
+    const meta = { ...base.meta, version: String(v + 1) };
+    const gated = steps.filter((s) => s.gated).map((s) => s.cmd);
+    if (gated.length)
+        meta['confirm-before'] = gated.join(' ; ');
+    else
+        delete meta['confirm-before'];
+    const needs = needsAfter(base, steps, check);
+    if (needs)
+        meta.needs = needs;
+    else
+        delete meta.needs;
+    if (check !== base.check && meta.check !== undefined)
+        meta.check = check;
+    // Compile's "what worked was step N." ends the line and names a step by its number: it follows the renumber. Only
+    // the one at the end: the quoted error before it is a command's output and may say anything (review).
+    const [at, shift] = plan.op === 'extend' ? [plan.at, plan.cmds.length] : [0, 0];
+    const ifFails = base.ifFails.map((l) => l.replace(/\bwhat worked was step (\d+)\.$/, (m, n) => (shift && Number(n) > at ? `what worked was step ${Number(n) + shift}.` : m)));
+    const skill = { ...base, meta, steps, check, ifFails };
+    const parsed = parseSkillMd(renderSkillMd(skill), skill.name);
+    if (!parsed || parsed.steps.length !== steps.length)
+        return { why: 'layout' };
+    if (refusedAtRecall(parsed) !== null)
+        return { why: 'risk' };
+    return { skill };
+}
+/** The plan applied: the new CompiledSkill (version bumped), or null when a check after the edit refuses it. */
+export function applyFold(base, plan) {
+    try {
+        const r = applyWhy(base, plan);
+        return 'skill' in r ? r.skill : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Drift (4.8, P17): the new version from the run, keeping the skill's id, name, scope, applies, job and asks. */
+export function replaceWith(base, fresh) {
+    const v = intVersion(base) ?? 1;
+    const meta = { ...fresh.meta, trail: base.meta.trail, scope: base.meta.scope, asks: base.meta.asks, version: String(v + 1) };
+    for (const k of ['applies', 'job', 'status-asks']) {
+        if (base.meta[k] === undefined)
+            delete meta[k];
+        else
+            meta[k] = base.meta[k];
+    }
+    return { ...fresh, name: base.name, meta };
+}
+/* -------------------------------------------------------------- phase 3 (N4) */
+const labels = (base, to) => [`${base.name}/SKILL.md v${base.meta.version}`, `${base.name}/SKILL.md v${to}`];
+/** The fresh compile as the split's own skill: its name, an id of its own, version 1. */
+function splitSkill(base, fresh, name) {
+    const id = `s-${createHash('sha256').update(`${base.meta.trail}|${name}`).digest('hex').slice(0, 6)}`;
+    return { ...fresh, name, meta: { ...fresh.meta, trail: id, version: '1' } };
+}
+/** Phase 3's N4: the change as text and a printed diff, from inputs only (no disk). `op: 'none'` gives text equal to the input. */
+export function foldDiff(i, base) {
+    const plan = planFold({ ...i, base });
+    if (plan.op === 'none')
+        return { text: i.text, diff: '', op: 'none', why: plan.why };
+    if (plan.op === 'split') {
+        const text = renderSkillMd(splitSkill(base, i.fresh, plan.name));
+        return { text, diff: printDiff('', text, ['/dev/null', `${plan.name}/SKILL.md v1`]), op: 'split' };
+    }
+    const next = applyFold(base, plan);
+    if (!next)
+        return { text: i.text, diff: '', op: 'none', why: 'layout' };
+    const text = renderSkillMd(next);
+    return { text, diff: printDiff(i.text, text, labels(base, Number(next.meta.version))), op: plan.op };
+}
+/** Phase 3's N4 for drift: the whole new version and its diff against the skill as Trail reads it. */
+export function driftDiff(base, fresh) {
+    const next = replaceWith(base, fresh);
+    const text = renderSkillMd(next);
+    return { text, diff: printDiff(renderSkillMd(base), text, labels(base, Number(next.meta.version))), op: 'replace' };
+}
+//# sourceMappingURL=fold.js.map

package/dist/skills/fold.js.map

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

package/dist/skills/follow-learnings.d.ts

@@ -0,0 +1,128 @@
+/**
+ * Learnings and skills, said once and never against each other (part 7).
+ *
+ * A person's live preferences, decisions and guardrails are read for what
+ * they say about commands (learning-steps.ts, no model), then:
+ *
+ * - at a skill's save or offer, the steps follow them: a step a learning
+ *   forbids is written its way when Trail can do that safely, else left
+ *   out, and the offer names either in one plain line (`followAtSave`);
+ * - at recall, a learning that only repeats a step is said once, in the run
+ *   block, and the prompt's learnings lines leave it out; one that goes
+ *   against a step wins, and the block marks the step (`recallMarks`,
+ *   `markLines`). The update offer then proposes the change, with its usual
+ *   consent (fold.ts, why `preference`).
+ *
+ * Retired, replaced and held learnings never count (`liveLearnings`), nor
+ * one on a teammate's unmerged branch, nor a lesson. Reading fails open:
+ * no learnings, nothing changes.
+ */
+import { type Note } from '../notes/notes.js';
+import { type LearningKind, type Scope } from '../notes/learning-fields.js';
+import { type StepRule } from './learning-steps.js';
+export interface StepLearning {
+    id: string;
+    /** Its file name: one learning wherever it sits, as the session's shown list knows it (`shownFiles`). */
+    file: string;
+    kind: LearningKind | null;
+    scope: Scope;
+    /** The learning's words as a line quotes them. */
+    quote: string;
+    /** The quote is the whole learning and every sentence of it was read: a line that says it leaves nothing out. */
+    whole: boolean;
+    rules: StepRule[];
+}
+/** Where a save or a block reads learnings: the run's repo, its checkout's committed ones, and every-repo ones. */
+export interface LearningsWhere {
+    repoKeys: string[];
+    checkout: string;
+    env: NodeJS.ProcessEnv;
+}
+export declare const QUOTE_MAX = 160;
+/** The words the person and the agent read. No em dashes; never notes, rules or the like (the words test reads these). */
+export declare const FOLLOW_COPY: {
+    readonly savedOne: "Step {n} runs {next} rather than this run's {old}, as {whose} \"{quote}\" says.";
+    readonly savedMany: "Steps {list} follow {whose} \"{quote}\" rather than this run's commands.";
+    readonly leftOne: "Trail left out {old}: it goes against {whose} \"{quote}\", and Trail can't change it safely.";
+    readonly leftMany: "Trail left out {k} steps: they go against {whose} \"{quote}\", and Trail can't change them safely.";
+    readonly refuse: "goes against {whose} \"{quote}\", and it is the check";
+    readonly short: "Some steps follow your learnings rather than this run; say show me to see them.";
+    readonly counts: "To follow your learnings, Trail {did}; say show me to see them.";
+    readonly stepFixed: " ({whose_s} way; the skill has {old})";
+    readonly stepAgainst: " (against {whose}: see below)";
+    readonly wins: "{Whose} wins over the skill: \"{quote}\". {Steps} {are} written its way; run {them} as shown.";
+    readonly against: "{Whose} \"{quote}\" goes against {steps}: leave {it} out, do that part its way, and tell the person.";
+    readonly follows: "{Steps} {follow} {whose}: \"{quote}\".";
+};
+/** A command as a line shows it: one line, at most 60 characters, its single quotes made double, in single quotes. */
+export declare const cmdWords: (cmd: string) => string;
+/** 'your preference', "this repo's decision", "your team's learning". */
+export declare function whose(l: Pick<StepLearning, 'kind' | 'scope'>): string;
+/** What one learning says about commands; null when it says nothing a step could repeat or go against. */
+export declare function stepLearningOf(n: Pick<Note, 'id' | 'kind' | 'scope' | 'title' | 'body'> & {
+    path?: string;
+}): StepLearning | null;
+/** The file names of the learnings a session has shown already (its `injectedNotes`: paths, or a title for one with none). */
+export declare function shownFiles(injected: readonly string[] | undefined): Set<string>;
+/** The live learnings that say something about commands, for a run in `where`. [] on any read failure. */
+export declare function stepLearnings(where: LearningsWhere): StepLearning[];
+/**
+ * The learning's words only repeat what the steps do: every sentence read, at least one step repeats it, none goes
+ * against it. What init folds into a skill as a lesson (part 7).
+ */
+export declare function onlyRepeats(text: string, steps: string[]): boolean;
+export interface SaveItem {
+    cmd: string;
+    gated: boolean;
+    isCheck: boolean;
+}
+export interface SaveFollow {
+    /** The steps kept, by their index in the input, with the command they keep. */
+    keep: Array<{
+        i: number;
+        cmd: string;
+    }>;
+    /** The one plain line the offer and the save name it in; '' when nothing changed. */
+    line: string;
+    /** Why the skill can't be kept: the check itself goes against a learning and can't follow it. */
+    refuse: string | null;
+}
+/** The steps as a save keeps them: each one a learning goes against written its way, or left out, and the line that says so. */
+export declare function followAtSave(items: SaveItem[], ls: StepLearning[]): SaveFollow;
+/** An offer's 2 lines with the follow line at the end of line 1 (a shorter one when both don't fit). */
+export declare function withFollowLine(lines: [string, string], followed: string | undefined): [string, string];
+/** One learning's say in a run block: the steps it repeats, or the steps it goes against (written its way, or to leave out). */
+export interface RecallMark {
+    l: StepLearning;
+    against: boolean;
+    steps: number[];
+    /** Against: each step's command its way (with the skill's {params}), or null for a step to leave out. */
+    fixes: Map<number, string | null>;
+}
+/**
+ * What the live learnings say of a skill's steps, at most 3 learnings. A learning that goes against a step wins over
+ * one that repeats it. A repeat is said only for a preference or decision (or a plain learning) the line can quote in
+ * full, so leaving it out of the prompt's learnings lines loses nothing, and only once a session: one the session showed
+ * already (`shown`, file names: on a file the agent opened, or with an earlier prompt) is not said again. A learning
+ * that goes against a step is always marked, since the step is shown its way.
+ */
+export declare function recallMarks(steps: Array<{
+    n: number;
+    cmd: string;
+    gated?: unknown;
+}>, ls: StepLearning[], shown?: ReadonlySet<string>): RecallMark[];
+/** The step texts and check as the block shows them: each fix in place of its step (and of the check it is). */
+export declare function withFixes<T extends {
+    steps: Array<{
+        n: number;
+        cmd: string;
+    }>;
+    check: string | null;
+}>(skill: T, marks: RecallMark[]): T;
+/** What a marked step's line ends with in the block (`n` is the step, `old` the skill's own command, filled). */
+export declare function stepNote(marks: RecallMark[], n: number, old: string): string;
+/** The lines after a block's steps, one per learning, each quoting it once. */
+export declare function markLines(marks: RecallMark[]): string[];
+/** The ids of the learnings a block says (its lines are in the block as it went out). */
+export declare function saidIn(block: string, marks: RecallMark[]): string[];
+//# sourceMappingURL=follow-learnings.d.ts.map

package/dist/skills/follow-learnings.d.ts.map

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