@codyswann/lisa 2.297.4 → 2.297.6

package/dist/core/learnings-file-safety.js

@@ -3,6 +3,7 @@ import * as fse from "fs-extra";
 import { lstat, open, realpath } from "node:fs/promises";
 import * as path from "node:path";
 import { LEARNINGS_CONTRACT } from "./learnings-contract.js";
+import { conflictMarkerError, findConflictMarkerInBytes, } from "./learnings-document.js";
 /**
  * Resolve the configured target without permitting project-root escape.
  * @param projectRoot - Host project root
@@ -37,6 +38,12 @@ export async function readExistingLearnings(target) {
                 throw new Error("Unsafe project learnings path: target changed during open");
             }
             if (opened.size > LEARNINGS_CONTRACT.maxTokens) {
+                // Diagnose conflict corruption before reporting size. A conflicted
+                // merge roughly doubles the ledger, so this branch is exactly where a
+                // real corruption lands — reporting "exceeds maxTokens" here would
+                // send the writer's caller off shortening entries instead of
+                // recompacting the duplicated block.
+                await assertNoConflictMarkerPrefix(handle);
                 throw new Error(`Project learnings payload exceeds maxTokens ${LEARNINGS_CONTRACT.maxTokens}`);
             }
             return handle.readFile({ encoding: "utf8" });
@@ -52,6 +59,21 @@ export async function readExistingLearnings(target) {
         throw error;
     }
 }
+/**
+ * Throw the shared conflict diagnosis when an over-budget file is corrupted.
+ *
+ * Reads only a bounded prefix from the already-verified handle, so an oversized
+ * ledger is diagnosed without ever being fully loaded.
+ * @param handle - Open handle to the verified regular file
+ */
+async function assertNoConflictMarkerPrefix(handle) {
+    const buffer = Buffer.allocUnsafe(LEARNINGS_CONTRACT.maxTokens + 1);
+    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
+    const conflictLine = findConflictMarkerInBytes(buffer.subarray(0, bytesRead));
+    if (conflictLine !== undefined) {
+        throw conflictMarkerError(conflictLine);
+    }
+}
 /**
  * Reject parent-directory symlinks that resolve outside the project root.
  * @param root - Resolved project root

package/dist/core/learnings-file-safety.js.map

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

package/dist/core/learnings-merge-driver-config.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Whether this project accepts the merge-driver registration.
+ * @param projectRoot - Host project directory
+ * @returns False only when `learnings.mergeDriver` is explicitly `false`
+ */
+export declare function isLearningsMergeDriverEnabled(projectRoot: string): Promise<boolean>;
+//# sourceMappingURL=learnings-merge-driver-config.d.ts.map

package/dist/core/learnings-merge-driver-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge-driver-config.d.ts","sourceRoot":"","sources":["../../src/core/learnings-merge-driver-config.ts"],"names":[],"mappings":"AA6CA;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAQlB"}

package/dist/core/learnings-merge-driver-config.js

@@ -0,0 +1,58 @@
+/**
+ * Host opt-out for the project-learnings union merge driver.
+ *
+ * `lisa apply` registers the driver automatically, and the TypeScript stack
+ * wires `lisa apply` into `postinstall` — so an ordinary `npm install` writes
+ * `merge.lisa-learnings.driver` into `.git/config` with no separate human step.
+ * That is not an escalation over `npm install` itself, which already runs
+ * arbitrary code, but it does persist an executable hook that fires on ordinary
+ * git operations for as long as the clone exists, outside npm's lifecycle. A
+ * host that would rather not carry that hook needs a way to say so.
+ *
+ * This reads `.lisa.config.json` directly rather than extending the validated
+ * `ProjectConfig` schema: `project-config.ts` sits exactly at its 300-line lint
+ * cap, and forcing an extraction of its cross-cutting learnings validators to
+ * make room would be a far larger change than this flag warrants. Keeping the
+ * flag beside the feature it governs also means the driver's opt-out is
+ * readable in one place.
+ *
+ * Opt-out only, and strictly `=== false`: absent, malformed, or non-boolean
+ * values all leave the driver enabled, matching the zero-configuration default
+ * every other Lisa guardrail uses. A malformed config must not silently disable
+ * a data-integrity guard.
+ * @module core/learnings-merge-driver-config
+ */
+import { readFile } from "node:fs/promises";
+import * as path from "node:path";
+const CONFIG_FILE = ".lisa.config.json";
+/**
+ * Read one inert own property without invoking an accessor.
+ * @param candidate - Value to inspect
+ * @param key - Property name to read
+ * @returns The own data value, when present
+ */
+function readOwn(candidate, key) {
+    if (candidate === null || typeof candidate !== "object") {
+        return undefined;
+    }
+    const descriptor = Object.getOwnPropertyDescriptor(candidate, key);
+    return descriptor !== undefined && "value" in descriptor
+        ? descriptor.value
+        : undefined;
+}
+/**
+ * Whether this project accepts the merge-driver registration.
+ * @param projectRoot - Host project directory
+ * @returns False only when `learnings.mergeDriver` is explicitly `false`
+ */
+export async function isLearningsMergeDriverEnabled(projectRoot) {
+    try {
+        const raw = await readFile(path.join(projectRoot, CONFIG_FILE), "utf8");
+        const learnings = readOwn(JSON.parse(raw), "learnings");
+        return readOwn(learnings, "mergeDriver") !== false;
+    }
+    catch {
+        return true;
+    }
+}
+//# sourceMappingURL=learnings-merge-driver-config.js.map

package/dist/core/learnings-merge-driver-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge-driver-config.js","sourceRoot":"","sources":["../../src/core/learnings-merge-driver-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAExC;;;;;GAKG;AACH,SAAS,OAAO,CAAC,SAAkB,EAAE,GAAW;IAC9C,IAAI,SAAS,KAAK,IAAI,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACnE,OAAO,UAAU,KAAK,SAAS,IAAI,OAAO,IAAI,UAAU;QACtD,CAAC,CAAC,UAAU,CAAC,KAAK;QAClB,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,WAAmB;IAEnB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,EAAE,WAAW,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,KAAK,KAAK,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/core/learnings-merge-driver-install.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Outcome of one registration attempt.
+ *
+ * `skipped` and `failed` are deliberately distinct: a directory that is not a
+ * git repository is a benign, expected non-event, while a git-config write that
+ * genuinely failed must not be reported as success — an operator who ran
+ * `lisa install-merge-driver` and saw exit 0 would believe the ledger is
+ * protected when it is not.
+ */
+export interface MergeDriverInstallResult {
+    /** Registered now, already correct, benignly inapplicable, or a real failure. */
+    readonly kind: "installed" | "unchanged" | "skipped" | "failed";
+    /** Single-line, operator-facing explanation. */
+    readonly detail: string;
+}
+/** Injectable collaborators for {@link installLearningsMergeDriver}. */
+export interface MergeDriverInstallDependencies {
+    /**
+     * How to invoke the Lisa CLI. Defaults to this process's own runtime and
+     * entry script, which is what makes the registration self-locating: whichever
+     * Lisa is running the install is the Lisa the driver will call.
+     */
+    readonly invocation?: string;
+}
+/**
+ * Whether this directory is a git working tree the driver can be registered in.
+ *
+ * Strictly read-only, so callers that must not mutate — a migration's
+ * `applies()` check and its dry-run path — can ask the question without
+ * writing anything.
+ * @param projectRoot - Project directory to inspect
+ * @returns True when the directory is inside a git working tree
+ */
+export declare function canInstallLearningsMergeDriver(projectRoot: string): Promise<boolean>;
+/**
+ * Register the union merge driver in one project's local git config.
+ *
+ * Idempotent and safe outside a git repository: a non-repository directory is
+ * skipped rather than failing an apply.
+ * @param projectRoot - Project directory to register the driver in
+ * @param dependencies - Injectable collaborators for tests
+ * @returns Structured registration outcome
+ */
+export declare function installLearningsMergeDriver(projectRoot: string, dependencies?: MergeDriverInstallDependencies): Promise<MergeDriverInstallResult>;
+//# sourceMappingURL=learnings-merge-driver-install.d.ts.map

package/dist/core/learnings-merge-driver-install.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge-driver-install.d.ts","sourceRoot":"","sources":["../../src/core/learnings-merge-driver-install.ts"],"names":[],"mappings":"AAiCA;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAwB;IACvC,iFAAiF;IACjF,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ,CAAC;IAChE,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,wEAAwE;AACxE,MAAM,WAAW,8BAA8B;IAC7C;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAuFD;;;;;;;;GAQG;AACH,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAElB;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,YAAY,GAAE,8BAAmC,GAChD,OAAO,CAAC,wBAAwB,CAAC,CAkDnC"}

package/dist/core/learnings-merge-driver-install.js

@@ -0,0 +1,161 @@
+/**
+ * Machine-local registration of the project-learnings union merge driver.
+ *
+ * Git never reads a driver command from the repository — that would let a
+ * cloned repository execute arbitrary code on `git merge` — so the command must
+ * be written into local git config on each machine. This module is the single
+ * implementation behind both registration paths: the `EnsureLearningsMergeDriver`
+ * migration that runs on every `lisa apply`, and the explicit
+ * `lisa install-merge-driver` command an operator can re-run by hand.
+ * @module core/learnings-merge-driver-install
+ */
+import { LEARNINGS_MERGE_DRIVER_DESCRIPTION, LEARNINGS_MERGE_DRIVER_NAME, buildLearningsMergeDriverCommand, } from "./learnings-merge-driver.js";
+const GIT_COMMAND_ENV = {
+    PATH: "/usr/bin:/bin:/usr/sbin:/sbin",
+};
+const DRIVER_KEY = `merge.${LEARNINGS_MERGE_DRIVER_NAME}.driver`;
+const NAME_KEY = `merge.${LEARNINGS_MERGE_DRIVER_NAME}.name`;
+const NOT_REGISTERED = "merge driver not registered";
+const NO_REPO = "not-a-repository";
+/**
+ * Run a fixed git command with arguments, never through a shell.
+ *
+ * `execFile` (not `exec`) keeps every argument a literal — the driver command
+ * contains `%` placeholders and may contain spaces, and shell quoting is an
+ * avoidable failure mode. `child_process` is imported dynamically to match the
+ * house pattern that keeps the static command-path lint satisfied.
+ * @param args - Literal git arguments
+ * @param cwd - Working directory to run in
+ * @returns Trimmed stdout, or undefined when the command exits non-zero
+ */
+async function tryGit(args, cwd) {
+    const { execFile } = await import("node:child_process");
+    const { promisify } = await import("node:util");
+    const run = promisify(execFile);
+    try {
+        const { stdout } = await run("git", [...args], {
+            cwd,
+            env: GIT_COMMAND_ENV,
+        });
+        return { ok: true, stdout: stdout.trim() };
+    }
+    catch (error) {
+        const code = typeof error === "object" && error !== null && "code" in error
+            ? error.code
+            : undefined;
+        return { ok: false, missingGit: code === "ENOENT" };
+    }
+}
+/**
+ * Probe whether this directory is a registrable git working tree.
+ *
+ * Distinguishes a missing git binary from a real non-repository. The pinned
+ * PATH is deliberate hardening, but on a host where git lives outside it, an
+ * undifferentiated failure would tell the operator "not a git repository" about
+ * a directory that plainly is one.
+ * @param projectRoot - Project directory to inspect
+ * @returns Closed probe outcome
+ */
+async function probeRepository(projectRoot) {
+    const result = await tryGit(["rev-parse", "--is-inside-work-tree"], projectRoot);
+    if (!result.ok) {
+        return result.missingGit ? "git-unavailable" : NO_REPO;
+    }
+    return result.stdout === "true" ? "repository" : NO_REPO;
+}
+/**
+ * Quote one path for the POSIX shell that git runs a merge driver through.
+ *
+ * Single quotes, not double: git executes `merge.<name>.driver` via `sh`, where
+ * `$`, a backtick, and a backslash stay special inside double quotes. A path
+ * containing `$` would silently expand to nothing and the driver would fail to
+ * launch; a backtick would run a command substitution. Inside single quotes the
+ * shell treats every byte literally, so only an embedded single quote needs
+ * handling — closed, escaped, and reopened as `'\''`.
+ * @param value - Raw filesystem path
+ * @returns Shell-safe single-quoted token
+ */
+function shellQuote(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+/**
+ * Resolve how to re-invoke the currently running Lisa CLI.
+ *
+ * Uses `process.execPath` as the runtime rather than a hardcoded `node`, so a
+ * checkout running under Bun registers a Bun-executable command and a published
+ * package running under Node registers a Node one. Returns undefined when the
+ * entry script is unknown: registering a command that can never launch is worse
+ * than leaving git on its default driver, which at least fails visibly.
+ * @returns Shell-safe `<runtime> <entry script>` invocation, when resolvable
+ */
+function resolveLisaInvocation() {
+    const entry = process.argv[1];
+    if (entry === undefined || entry === "") {
+        return undefined;
+    }
+    return `${shellQuote(process.execPath)} ${shellQuote(entry)}`;
+}
+/**
+ * Whether this directory is a git working tree the driver can be registered in.
+ *
+ * Strictly read-only, so callers that must not mutate — a migration's
+ * `applies()` check and its dry-run path — can ask the question without
+ * writing anything.
+ * @param projectRoot - Project directory to inspect
+ * @returns True when the directory is inside a git working tree
+ */
+export async function canInstallLearningsMergeDriver(projectRoot) {
+    return (await probeRepository(projectRoot)) === "repository";
+}
+/**
+ * Register the union merge driver in one project's local git config.
+ *
+ * Idempotent and safe outside a git repository: a non-repository directory is
+ * skipped rather than failing an apply.
+ * @param projectRoot - Project directory to register the driver in
+ * @param dependencies - Injectable collaborators for tests
+ * @returns Structured registration outcome
+ */
+export async function installLearningsMergeDriver(projectRoot, dependencies = {}) {
+    const probe = await probeRepository(projectRoot);
+    if (probe === "git-unavailable") {
+        return {
+            kind: "failed",
+            detail: `git executable not found — ${NOT_REGISTERED} (install git, then re-run \`lisa install-merge-driver\`)`,
+        };
+    }
+    if (probe === NO_REPO) {
+        return {
+            kind: "skipped",
+            detail: "not a git repository — nothing to register",
+        };
+    }
+    const invocation = dependencies.invocation ?? resolveLisaInvocation();
+    if (invocation === undefined) {
+        return {
+            kind: "failed",
+            detail: `could not resolve the Lisa entry point — ${NOT_REGISTERED}`,
+        };
+    }
+    const desired = buildLearningsMergeDriverCommand(invocation);
+    const current = await tryGit(["config", "--local", "--get", DRIVER_KEY], projectRoot);
+    if (current.ok && current.stdout === desired) {
+        return {
+            kind: "unchanged",
+            detail: `${LEARNINGS_MERGE_DRIVER_NAME} merge driver already registered`,
+        };
+    }
+    await tryGit(["config", "--local", NAME_KEY, LEARNINGS_MERGE_DRIVER_DESCRIPTION], projectRoot);
+    const set = await tryGit(["config", "--local", DRIVER_KEY, desired], projectRoot);
+    if (!set.ok) {
+        return {
+            kind: "failed",
+            detail: `could not write local git config — ${NOT_REGISTERED}`,
+        };
+    }
+    return {
+        kind: "installed",
+        detail: `registered the ${LEARNINGS_MERGE_DRIVER_NAME} merge driver`,
+    };
+}
+//# sourceMappingURL=learnings-merge-driver-install.js.map

package/dist/core/learnings-merge-driver-install.js.map

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

package/dist/core/learnings-merge-driver.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Registration contract for the project-learnings union merge driver.
+ *
+ * A git merge driver has two halves that live in different places:
+ *
+ * 1. **The attribute** (`.gitattributes`) says WHICH driver a path uses. It is
+ *    a committed file, so Lisa ships it to the repository and to every host
+ *    project through the template pipeline.
+ * 2. **The driver command** (`merge.<name>.driver`) says HOW to run it. Git
+ *    deliberately keeps this in machine-local config and never reads it from
+ *    the repository, because a committed driver command would let a cloned
+ *    repository execute arbitrary code on `git merge`.
+ *
+ * So the attribute alone is inert. Until the command is registered, git falls
+ * back to its built-in text merge — which is exactly today's behavior, so an
+ * unregistered checkout is degraded, never broken. That fallback is asserted in
+ * `tests/unit/core/learnings-merge-driver.test.ts`.
+ *
+ * Registration is AUTOMATIC, not operator-initiated. `EnsureLearningsMergeDriver`
+ * runs on every `lisa apply`, and the TypeScript stack's `package.lisa.json`
+ * wires `lisa apply` into `postinstall` — so an ordinary `npm install` in a host
+ * project writes `merge.lisa-learnings.driver` into `.git/config` with no
+ * separate human step, and against Lisa's own repository too.
+ *
+ * That is worth stating plainly because of what it implies: the registration
+ * persists an executable hook in local git config that fires on ordinary git
+ * operations, outside npm's lifecycle. It is not an escalation over `npm
+ * install` itself (which already runs arbitrary code), but it does outlive it.
+ * Hosts that would rather not carry that hook set `learnings.mergeDriver: false`
+ * in `.lisa.config.json`; `lisa install-merge-driver` remains available to
+ * register it by hand in a clone that apply has not touched.
+ * @module core/learnings-merge-driver
+ */
+/** Git merge-driver name shared by `.gitattributes` and the local git config. */
+export declare const LEARNINGS_MERGE_DRIVER_NAME = "lisa-learnings";
+/** Human-readable driver name recorded alongside the command. */
+export declare const LEARNINGS_MERGE_DRIVER_DESCRIPTION = "Union project learnings by entry id";
+/** Marker opening the Lisa-managed block in a host `.gitattributes`. */
+export declare const GITATTRIBUTES_BEGIN_MARKER = "# BEGIN: AI GUARDRAILS";
+/** Marker closing the Lisa-managed block in a host `.gitattributes`. */
+export declare const GITATTRIBUTES_END_MARKER = "# END: AI GUARDRAILS";
+/**
+ * Build the `merge.<name>.driver` command string.
+ *
+ * Git expands `%O` (merge base), `%A` (our version, and the file the driver
+ * MUST overwrite with the result), `%B` (their version), and `%P` (the real
+ * pathname, used only for diagnostics). The driver reports success by exiting
+ * zero; any non-zero exit tells git to record a conflict.
+ *
+ * ⚠️ DO NOT WRAP THE PLACEHOLDERS IN QUOTES. Git runs this string through
+ * `sh -c` and substitutes `%O/%A/%B/%P` already shell-quoted (git's own
+ * `sq_quote`), so bare `--path %P` is correct AND safe for a pathname
+ * containing spaces or metacharacters. Adding quotes — `--path "%P"` — looks
+ * like a fix for filenames with spaces and is a remote code execution hole: the
+ * value arrives pre-quoted, so the added double quotes re-expose `$(...)`,
+ * backticks and `$` inside a filename to the shell. A security review
+ * demonstrated a working RCE for exactly that "fix". If a path with spaces
+ * appears broken, the bug is elsewhere.
+ *
+ * The `invocation` argument is a different matter: it is OUR string, not git's,
+ * so it must be shell-quoted by the caller before it gets here (see
+ * `learnings-merge-driver-install.ts`).
+ * @param invocation - How to invoke the Lisa CLI, already shell-quoted
+ * @returns Fully expanded git driver command
+ */
+export declare function buildLearningsMergeDriverCommand(invocation: string): string;
+/**
+ * Build the `.gitattributes` line binding one ledger path to the driver.
+ * @param ledgerPath - Project-relative learnings file path
+ * @returns Single `.gitattributes` line, without a trailing newline
+ */
+export declare function buildLearningsAttributeLine(ledgerPath: string): string;
+/**
+ * Render the complete Lisa-managed `.gitattributes` block.
+ *
+ * Wrapped in the same guardrail markers the `.gitignore` template uses, so the
+ * `copy-contents` strategy replaces exactly this block on re-apply and leaves
+ * every host-authored rule outside it untouched.
+ * @param ledgerPath - Project-relative learnings file path
+ * @returns Managed block, newline-terminated
+ */
+export declare function renderLearningsGitattributesBlock(ledgerPath: string): string;
+//# sourceMappingURL=learnings-merge-driver.d.ts.map

package/dist/core/learnings-merge-driver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge-driver.d.ts","sourceRoot":"","sources":["../../src/core/learnings-merge-driver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,iFAAiF;AACjF,eAAO,MAAM,2BAA2B,mBAAmB,CAAC;AAE5D,iEAAiE;AACjE,eAAO,MAAM,kCAAkC,wCACR,CAAC;AAExC,wEAAwE;AACxE,eAAO,MAAM,0BAA0B,2BAA2B,CAAC;AAEnE,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,yBAAyB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAa5E"}

package/dist/core/learnings-merge-driver.js

@@ -0,0 +1,100 @@
+/**
+ * Registration contract for the project-learnings union merge driver.
+ *
+ * A git merge driver has two halves that live in different places:
+ *
+ * 1. **The attribute** (`.gitattributes`) says WHICH driver a path uses. It is
+ *    a committed file, so Lisa ships it to the repository and to every host
+ *    project through the template pipeline.
+ * 2. **The driver command** (`merge.<name>.driver`) says HOW to run it. Git
+ *    deliberately keeps this in machine-local config and never reads it from
+ *    the repository, because a committed driver command would let a cloned
+ *    repository execute arbitrary code on `git merge`.
+ *
+ * So the attribute alone is inert. Until the command is registered, git falls
+ * back to its built-in text merge — which is exactly today's behavior, so an
+ * unregistered checkout is degraded, never broken. That fallback is asserted in
+ * `tests/unit/core/learnings-merge-driver.test.ts`.
+ *
+ * Registration is AUTOMATIC, not operator-initiated. `EnsureLearningsMergeDriver`
+ * runs on every `lisa apply`, and the TypeScript stack's `package.lisa.json`
+ * wires `lisa apply` into `postinstall` — so an ordinary `npm install` in a host
+ * project writes `merge.lisa-learnings.driver` into `.git/config` with no
+ * separate human step, and against Lisa's own repository too.
+ *
+ * That is worth stating plainly because of what it implies: the registration
+ * persists an executable hook in local git config that fires on ordinary git
+ * operations, outside npm's lifecycle. It is not an escalation over `npm
+ * install` itself (which already runs arbitrary code), but it does outlive it.
+ * Hosts that would rather not carry that hook set `learnings.mergeDriver: false`
+ * in `.lisa.config.json`; `lisa install-merge-driver` remains available to
+ * register it by hand in a clone that apply has not touched.
+ * @module core/learnings-merge-driver
+ */
+/** Git merge-driver name shared by `.gitattributes` and the local git config. */
+export const LEARNINGS_MERGE_DRIVER_NAME = "lisa-learnings";
+/** Human-readable driver name recorded alongside the command. */
+export const LEARNINGS_MERGE_DRIVER_DESCRIPTION = "Union project learnings by entry id";
+/** Marker opening the Lisa-managed block in a host `.gitattributes`. */
+export const GITATTRIBUTES_BEGIN_MARKER = "# BEGIN: AI GUARDRAILS";
+/** Marker closing the Lisa-managed block in a host `.gitattributes`. */
+export const GITATTRIBUTES_END_MARKER = "# END: AI GUARDRAILS";
+/**
+ * Build the `merge.<name>.driver` command string.
+ *
+ * Git expands `%O` (merge base), `%A` (our version, and the file the driver
+ * MUST overwrite with the result), `%B` (their version), and `%P` (the real
+ * pathname, used only for diagnostics). The driver reports success by exiting
+ * zero; any non-zero exit tells git to record a conflict.
+ *
+ * ⚠️ DO NOT WRAP THE PLACEHOLDERS IN QUOTES. Git runs this string through
+ * `sh -c` and substitutes `%O/%A/%B/%P` already shell-quoted (git's own
+ * `sq_quote`), so bare `--path %P` is correct AND safe for a pathname
+ * containing spaces or metacharacters. Adding quotes — `--path "%P"` — looks
+ * like a fix for filenames with spaces and is a remote code execution hole: the
+ * value arrives pre-quoted, so the added double quotes re-expose `$(...)`,
+ * backticks and `$` inside a filename to the shell. A security review
+ * demonstrated a working RCE for exactly that "fix". If a path with spaces
+ * appears broken, the bug is elsewhere.
+ *
+ * The `invocation` argument is a different matter: it is OUR string, not git's,
+ * so it must be shell-quoted by the caller before it gets here (see
+ * `learnings-merge-driver-install.ts`).
+ * @param invocation - How to invoke the Lisa CLI, already shell-quoted
+ * @returns Fully expanded git driver command
+ */
+export function buildLearningsMergeDriverCommand(invocation) {
+    return `${invocation} merge-learnings --base %O --ours %A --theirs %B --path %P`;
+}
+/**
+ * Build the `.gitattributes` line binding one ledger path to the driver.
+ * @param ledgerPath - Project-relative learnings file path
+ * @returns Single `.gitattributes` line, without a trailing newline
+ */
+export function buildLearningsAttributeLine(ledgerPath) {
+    return `${ledgerPath} merge=${LEARNINGS_MERGE_DRIVER_NAME}`;
+}
+/**
+ * Render the complete Lisa-managed `.gitattributes` block.
+ *
+ * Wrapped in the same guardrail markers the `.gitignore` template uses, so the
+ * `copy-contents` strategy replaces exactly this block on re-apply and leaves
+ * every host-authored rule outside it untouched.
+ * @param ledgerPath - Project-relative learnings file path
+ * @returns Managed block, newline-terminated
+ */
+export function renderLearningsGitattributesBlock(ledgerPath) {
+    return [
+        GITATTRIBUTES_BEGIN_MARKER,
+        "",
+        "# The project learnings ledger is written by concurrent learner passes that",
+        "# each run on their own branch. Git's default line merge corrupts it with",
+        "# conflict markers; this driver unions entries by id instead. The driver",
+        "# command is machine-local — run `lisa install-merge-driver` to register it.",
+        buildLearningsAttributeLine(ledgerPath),
+        "",
+        GITATTRIBUTES_END_MARKER,
+        "",
+    ].join("\n");
+}
+//# sourceMappingURL=learnings-merge-driver.js.map

package/dist/core/learnings-merge-driver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge-driver.js","sourceRoot":"","sources":["../../src/core/learnings-merge-driver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,iFAAiF;AACjF,MAAM,CAAC,MAAM,2BAA2B,GAAG,gBAAgB,CAAC;AAE5D,iEAAiE;AACjE,MAAM,CAAC,MAAM,kCAAkC,GAC7C,qCAAqC,CAAC;AAExC,wEAAwE;AACxE,MAAM,CAAC,MAAM,0BAA0B,GAAG,wBAAwB,CAAC;AAEnE,wEAAwE;AACxE,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,gCAAgC,CAAC,UAAkB;IACjE,OAAO,GAAG,UAAU,4DAA4D,CAAC;AACnF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CAAC,UAAkB;IAC5D,OAAO,GAAG,UAAU,UAAU,2BAA2B,EAAE,CAAC;AAC9D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,iCAAiC,CAAC,UAAkB;IAClE,OAAO;QACL,0BAA0B;QAC1B,EAAE;QACF,6EAA6E;QAC7E,2EAA2E;QAC3E,0EAA0E;QAC1E,8EAA8E;QAC9E,2BAA2B,CAAC,UAAU,CAAC;QACvC,EAAE;QACF,wBAAwB;QACxB,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}

package/dist/core/learnings-merge.d.ts

@@ -0,0 +1,23 @@
+/** A clean union that satisfies every budget. */
+export interface LearningsMergeMerged {
+    readonly kind: "merged";
+    /** Canonical merged document, ready to publish. */
+    readonly content: string;
+}
+/** The merge cannot be completed without losing information. */
+export interface LearningsMergeConflict {
+    readonly kind: "conflict";
+    /** Single-line, operator-facing explanation. */
+    readonly reason: string;
+}
+/** Closed outcome of one ledger merge. */
+export type LearningsMergeResult = LearningsMergeMerged | LearningsMergeConflict;
+/**
+ * Merge two divergent ledger versions against their common ancestor.
+ * @param base - Merge-base document, or undefined when the file is new on both sides
+ * @param ours - Current-branch document
+ * @param theirs - Incoming-branch document
+ * @returns Canonical merged document, or a conflict with a reason
+ */
+export declare function mergeLearningsDocuments(base: string | undefined, ours: string, theirs: string): LearningsMergeResult;
+//# sourceMappingURL=learnings-merge.d.ts.map

package/dist/core/learnings-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"learnings-merge.d.ts","sourceRoot":"","sources":["../../src/core/learnings-merge.ts"],"names":[],"mappings":"AAoDA,iDAAiD;AACjD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,mDAAmD;IACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,gEAAgE;AAChE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,0CAA0C;AAC1C,MAAM,MAAM,oBAAoB,GAC5B,oBAAoB,GACpB,sBAAsB,CAAC;AAE3B;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,oBAAoB,CAgBtB"}