@codyswann/lisa 4.33.6 → 4.33.9

package/README.md

@@ -264,6 +264,28 @@ Lisa can watch a queue of ready work and dispatch each item through the lifecycl
 > **Prompt for your coding agent**
 > "Which commands let this Lisa scan a work queue, dispatch ready items, repair stuck ones, and report on scheduled-automation health? Show me how I'd point one at my queue and what it expects in configuration."
 
+### Running several agents on one machine
+
+Test runners size themselves to the machine, not to what else is running on it. Left alone, each run claims roughly one worker per core, so *k* agents working at once claim *k* × cores. That is not merely slow: past a certain point the machine starts terminating processes, and a gate that was killed looks exactly like a gate that failed — so an agent "fixes" a phantom, retries, and adds the load that kills the next run.
+
+Lisa caps the pool for you, in three layers:
+
+| layer | what it does | when it applies |
+|---|---|---|
+| **Floor** | Half the machine's cores | Always, when this run is the only one |
+| **Divisor** | Floor ÷ concurrent runs, never below 2 workers | Whenever other Lisa runs are live |
+| **Override** | Exactly the number you give it | Whenever you set it |
+
+You do not have to configure any of this. A run discovers how many sibling runs are live by looking at the shared scratch namespace, so the divisor applies to a fleet nobody told it about. Two variables are available when you want to steer it:
+
+- **`LISA_FLEET_CONCURRENCY`** — state how many runs are coming, rather than letting the run count what has already started. Useful when you are about to launch six agents and want the first one sized for six.
+- **`LISA_VITEST_MAX_WORKERS`** — set the pool size outright. Wins over both other layers, in both directions: raise it above the floor as readily as you lower it.
+
+A smaller pool is not automatically safer, which is why the floor is a proportion rather than a small constant and why the divisor stops at two workers. Below that a suite serialises, every file waits behind every other file, and per-test time budgets start expiring even as machine load falls — trading a visible failure for a subtler one.
+
+> **Prompt for your coding agent**
+> "Show me how this project's test worker pool is sized — find the resolver, tell me what each of the three layers would give on this machine right now, and how many sibling runs it currently detects."
+
 ## Working across trackers and sources
 
 Lisa is deliberately vendor-neutral. The lifecycle runs the same whether your tickets live in one tracker or another and whether your product specs originate in one document tool or another — a thin dispatch layer selects the right integration from configuration, so the workflow you learn transfers.

package/all/copy-overwrite/scripts/lisa-hooks/parity-safety-net.sh

@@ -1690,7 +1690,50 @@ fi
 
 # 13. Dropping or truncating a database / schema / table (Lisa-only guard —
 #     upstream has no SQL protection; keep).
-if matches '\b(drop[[:space:]]+(database|schema|table)|truncate[[:space:]]+(table[[:space:]]+)?[[:alnum:]_."`]+)\b'; then
+#
+# The two arms used to be asymmetric, and only the lopsided one produced false
+# positives (issue #3530). The `drop` arm requires a following keyword —
+# `drop database|schema|table` — so `drop the ball` never matched it. The
+# `truncate` arm made that keyword OPTIONAL:
+#
+#     truncate[[:space:]]+(table[[:space:]]+)?[[:alnum:]_."`]+
+#
+# which reduces to "`truncate`, whitespace, any identifier-ish word", so
+# `truncate the board`, `truncate results` and `truncate output` all matched.
+# A session was refused for a bug-report TITLE describing a connection that
+# truncates results — and a title has no escape hatch, because the remedy this
+# hook prints at the wall (write the text to a file, pass it BY PATH) covers a
+# body, while the title flag of an issue-filing CLI is necessarily inline. The
+# only exit left was to reword, which is what trains people to route around a
+# guard.
+#
+# The fix keeps the coverage and drops the English, in three arms.
+#
+# ARM 1 — `drop`, byte-identical to before. It was already correct, and a
+# rewrite that unified the arms could only make it permissive.
+readonly SQL_DROP='\bdrop[[:space:]]+(database|schema|table)\b'
+# ARM 2 — `truncate` carrying its own evidence that it is a statement rather
+# than a verb: the TABLE keyword (what the drop arm demands), a
+# schema-qualified name, a quoted identifier, a trailing `;`, or one of the
+# tail keywords that only ever follow a TRUNCATE. English has none of these.
+readonly SQL_TRUNCATE_TAIL='(cascade|restrict|restart[[:space:]]+identity|continue[[:space:]]+identity)([^[:alnum:]_]|$)'
+readonly SQL_TRUNCATE_EVIDENCE='\btruncate[[:space:]]+(table[[:space:]]+[[:alnum:]_."`]+|(only[[:space:]]+)?([[:alnum:]_]+\.[[:alnum:]_."`]+|["`][[:alnum:]_. ]+["`]|[[:alnum:]_]+[[:space:]]*(;|'"$SQL_TRUNCATE_TAIL"')))'
+# ARM 3 — the permissive-dialect `TRUNCATE <name>` with none of that evidence.
+# Deleting this shape is what a lazy fix does: it passes every prose scenario
+# while silently removing the coverage a regression fixture already asserts
+# (`mysql -e 'TRUNCATE sessions'`). So it is recognized by CONTEXT instead —
+# the same command must also invoke a command-line database client. Prose in a
+# tracker filing or a commit message invokes none, which is exactly the
+# difference the text scan could not see on its own.
+readonly SQL_CLIENT='(^|[^[:alnum:]_./-])([[:alnum:]_./-]*/)?(psql|pgcli|mysql|mysqladmin|mysqlsh|mariadb|mycli|sqlite3|sqlcmd|cqlsh|clickhouse-client|cockroach|mongosh|duckdb|usql)([[:space:]]|$)'
+readonly SQL_TRUNCATE_BARE='\btruncate[[:space:]]+(only[[:space:]]+)?[[:alnum:]_."`]'
+# Residual, accepted and stated: a bare `TRUNCATE <name>` with no terminator,
+# no qualification and no recognized client in the same command goes unmatched
+# — the same trade the `drop` arm has always made for `drop the ball`. No DROP
+# shape is weakened, and the guard still fails in the safe direction.
+if matches "$SQL_DROP" \
+  || matches "$SQL_TRUNCATE_EVIDENCE" \
+  || { matches "$SQL_CLIENT" && matches "$SQL_TRUNCATE_BARE"; }; then
   block "destructive SQL (DROP/TRUNCATE) detected"
 fi
 

package/all/copy-overwrite/scripts/lisa-work-item.mjs

@@ -25,6 +25,14 @@ const RELEASE_SUBJECT =
   /^chore\(release\): \d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)? \[skip ci\]$/;
 const ZERO_OID = /^0+$/;
 const MARKER = "[lisa-pr-link]";
+/**
+ * The deploy environment whose done role is terminal — the only one that
+ * closes a work item. Named once because three separate readers compare
+ * against it, and a literal repeated three times is three places to drift.
+ */
+const PRODUCTION = "production";
+/** How a base branch that maps to no deploy environment is described. */
+const NOT_A_DEPLOY_BRANCH = "not a deploy branch";
 /**
  * The command that establishes the ticket-side backlink.
  *
@@ -513,8 +521,11 @@ function lifecycleContract(config, provider) {
   // state is called `Done` — a message that sends someone looking for a state
   // that is not what they configured and not what Linear shows them.
   const terminalName = String(terminal ?? "");
+  const byEnvironment = doneRolesByEnvironment(roles.done, terminalName);
   return {
     claimed: requireString(roles.claimed, `${provider} claimed lifecycle role`),
+    done: byEnvironment,
+    productionEnvironment: productionEnvironmentOf(byEnvironment, terminalName),
     ready: requireString(roles.ready, `${provider} ready lifecycle role`),
     roles: lifecycleRoleSet(roles, done),
     terminal: terminalName.toLowerCase(),
@@ -522,6 +533,55 @@ function lifecycleContract(config, provider) {
   };
 }
 
+/**
+ * The done roles keyed by deploy environment, in configured order.
+ *
+ * The single-string form (`done: "Done"`) is a project that names one done
+ * role for every environment, so it is read as the production one — that is
+ * the only environment whose role closes anything.
+ * @param {unknown} done The configured `done` role or role map.
+ * @param {string} terminalName The resolved terminal role's spelling.
+ * @returns {[string, string][]} `[environment, role]` pairs, order preserved.
+ */
+function doneRolesByEnvironment(done, terminalName) {
+  const entries =
+    typeof done === "string"
+      ? [[PRODUCTION, done]]
+      : done && typeof done === "object"
+        ? Object.entries(done)
+        : [];
+  const mapped = entries
+    .map(([environment, role]) => [
+      String(environment).trim().toLowerCase(),
+      typeof role === "string" ? role.trim() : "",
+    ])
+    .filter(([environment, role]) => environment !== "" && role !== "");
+  // A shape this reader could not decompose must never leave the writer with
+  // NO environment to apply, which would refuse every completion in a project
+  // whose `done` nests. The resolved terminal is always an answer.
+  return mapped.length > 0 ? mapped : [[PRODUCTION, terminalName]];
+}
+
+/**
+ * Which of the configured environments is the production one.
+ *
+ * Found by matching the already-resolved TERMINAL ROLE, not by position. The
+ * terminal role is the single existing answer to "which role closes an item",
+ * so deriving the environment from it means the two can never disagree — and
+ * it avoids deriving anything a second, independent way from JSON key order,
+ * which is not semantically meaningful and which no schema constrains.
+ * @param {[string, string][]} byEnvironment `[environment, role]` pairs.
+ * @param {string} terminalName The resolved terminal role's spelling.
+ * @returns {string} The production environment's name.
+ */
+function productionEnvironmentOf(byEnvironment, terminalName) {
+  const folded = terminalName.trim().toLowerCase();
+  const matched = byEnvironment.find(
+    ([, role]) => role.toLowerCase() === folded
+  );
+  return matched?.[0] ?? PRODUCTION;
+}
+
 /**
  * Every lifecycle role a project has configured, in the project's own spelling.
  *
@@ -670,6 +730,46 @@ function verifyLevel(config) {
   return value;
 }
 
+/**
+ * Deploy branches reversed: branch name -> the environment it deploys.
+ *
+ * `deploy.branches` is written env-first (`production: main`) because that is
+ * how a human thinks about it. Every reader here starts from a branch — a
+ * merged pull request's base — and needs the environment, so the map is
+ * inverted once, here, rather than searched at each use.
+ *
+ * **The fallback is deliberate and narrow.** A project that configures no
+ * deploy branches at all is not saying "nothing ever deploys"; it is saying
+ * nothing unusual happens, and its default branch is its production branch.
+ * Treating the absent map as "no branch deploys anything" would refuse every
+ * completion in every project that never wrote the key — a fix that stops
+ * completing anything is not a fix. What the fallback does NOT do is invent an
+ * environment for a branch that is simply not in a map the project DID write:
+ * that is the stacked-integration case, and it is exactly the one that must
+ * not be read as production.
+ * @param {object} config The resolved Lisa configuration.
+ * @returns {Map<string, string>} Branch name to deploy environment.
+ */
+export function deployBranchEnvironments(config) {
+  const configured = config?.deploy?.branches;
+  const entries =
+    configured && typeof configured === "object"
+      ? Object.entries(configured)
+      : [];
+  const mapped = new Map();
+  for (const [environment, branch] of entries) {
+    const name = typeof branch === "string" ? branch.trim() : "";
+    if (name !== "") mapped.set(name, String(environment).trim().toLowerCase());
+  }
+  if (mapped.size > 0) return mapped;
+  const fallback = config?.policy?.repository?.default_branch;
+  const branch =
+    typeof fallback === "string" && fallback.trim() !== ""
+      ? fallback.trim()
+      : "main";
+  return new Map([[branch, PRODUCTION]]);
+}
+
 function trackerContract(config = readConfig()) {
   const provider = requireString(config.tracker, "tracker").toLowerCase();
   const identityRepo = currentRepoIdentity(config);
@@ -686,6 +786,7 @@ function trackerContract(config = readConfig()) {
       provider,
       repository,
       identityRepo,
+      deployBranches: deployBranchEnvironments(config),
       verify: verifyLevel(config),
       lifecycle: lifecycleContract(config, provider),
       repositoryIsIdentity:
@@ -3127,9 +3228,193 @@ function githubTimeline(ref) {
 }
 
 /**
- * Move a work item to its configured terminal role and close it.
+ * The branch a merged pull request was merged INTO.
  *
- * The terminal role is RESOLVED from configuration, never assumed. Lisa's own
+ * A second call per pull request, because the timeline cannot answer it: a
+ * `cross-referenced` event carries the referencing item in ISSUE shape, and an
+ * issue has no base branch. Reading the base is the whole point — without it
+ * "a merged pull request references this item" is the only evidence there is,
+ * and that sentence is true of a merge into an integration branch that shipped
+ * nothing.
+ * @param {string} repository `owner/name` the pull request belongs to.
+ * @param {number} number The pull-request number.
+ * @returns {string} The base branch name, empty when it could not be read.
+ */
+function pullRequestBaseBranch(repository, number) {
+  const result = run(
+    "gh",
+    ["api", `repos/${repository}/pulls/${number}`, "--jq", ".base.ref"],
+    { allowFailure: true }
+  );
+  if (result.status !== 0)
+    throw githubFailure(result, `${repository}#${number}`);
+  return result.stdout.trim();
+}
+
+/**
+ * Decide which lifecycle role a set of merged pull requests has earned.
+ *
+ * The defect this exists to end: completion read "is there a merged pull
+ * request referencing this item" and never asked which branch it merged into,
+ * so a stacked pull request landing on an integration branch stamped the
+ * PRODUCTION terminal role and closed the item. Nothing had reached the deploy
+ * branch and nothing had deployed, but every recovery flow — sweep, repair
+ * intake, the rollup reconcilers — reads a closed item carrying the terminal
+ * role as finished, so the corruption is in the direction that stops recovery
+ * from firing.
+ *
+ * **Production is recognised, never ranked.** An earlier draft of this
+ * function ordered environments by their POSITION in the configured `done`
+ * map, which makes correctness depend on JSON key order — not semantically
+ * meaningful, constrained by no schema, and able to fail in the direction of
+ * writing the WRONG TERMINAL ROLE rather than merely refusing, which is the
+ * original defect with extra steps. So the only distinction drawn here is
+ * production versus not: a merge into the production environment is terminal,
+ * a single non-production environment records its own role, and several
+ * different non-production environments are reported rather than ranked. That
+ * is enough, because the role this ticket is about is the terminal one.
+ *
+ * Pure and exported so the decision can be asserted without a network.
+ * @param {{base: string, number: number}[]} pullRequests Merged pull requests.
+ * @param {Map<string, string>} branchEnvironments Branch to deploy environment.
+ * @param {{done: [string, string][], productionEnvironment: string}} lifecycle
+ *   The resolved lifecycle contract.
+ * @returns {{ambiguous: boolean, environment: string|null, evidence: {base: string, environment: string|null, number: number}[], role: string|null, terminal: boolean}}
+ *   The role earned, or a null role when nothing was earned or nothing ranks.
+ */
+export function mergedBaseDecision(
+  pullRequests,
+  branchEnvironments,
+  lifecycle
+) {
+  const roles = new Map(lifecycle?.done ?? []);
+  const production = lifecycle?.productionEnvironment;
+  const evidence = (pullRequests ?? []).map(request => {
+    const base = String(request?.base ?? "");
+    return {
+      base,
+      environment: branchEnvironments?.get(base) ?? null,
+      number: request?.number,
+    };
+  });
+  const reached = [
+    ...new Set(
+      evidence
+        .map(entry => entry.environment)
+        .filter(environment => roles.has(environment))
+    ),
+  ];
+  if (reached.includes(production)) {
+    return {
+      ambiguous: false,
+      environment: production,
+      evidence,
+      role: roles.get(production),
+      terminal: true,
+    };
+  }
+  // Exactly one non-production environment is unambiguous. Two different ones
+  // would need an ordering the configuration does not state, so they are
+  // reported instead of guessed at.
+  if (reached.length !== 1) {
+    return {
+      ambiguous: reached.length > 1,
+      environment: null,
+      evidence,
+      role: null,
+      terminal: false,
+    };
+  }
+  return {
+    ambiguous: false,
+    environment: reached[0],
+    evidence,
+    role: roles.get(reached[0]),
+    terminal: false,
+  };
+}
+
+/**
+ * Name every merged pull request and the branch it landed on.
+ *
+ * An operator reading a run that completed nothing has to be able to tell WHY
+ * without opening the code, and "which branch did it actually merge into" is
+ * the whole answer.
+ * @param {{base: string, environment: string|null, number: number}[]} evidence
+ *   What each merged pull request was observed to target.
+ * @returns {string} A readable one-line summary.
+ */
+function describeMergeBases(evidence) {
+  return evidence
+    .map(
+      entry =>
+        `#${entry.number} -> ${entry.base || "(unknown base)"} [${entry.environment ?? NOT_A_DEPLOY_BRANCH}]`
+    )
+    .join(", ");
+}
+
+/**
+ * Name the branches this project does deploy, and which one it took to be
+ * production.
+ *
+ * Naming the production branch explicitly is what makes a wrong ASSUMPTION
+ * visible. A project that never wrote `deploy.branches` has its default branch
+ * read as production; if that is not its real production branch, every
+ * completion refuses and the operator has to be able to see the assumption in
+ * the refusal rather than infer it from a list.
+ * @param {Map<string, string>} branchEnvironments Branch to deploy environment.
+ * @param {string} production The production environment's name.
+ * @returns {string} A readable list, with the production branch called out.
+ */
+function describeDeployBranches(branchEnvironments, production) {
+  const listed =
+    [...branchEnvironments]
+      .map(([branch, environment]) => `${branch} [${environment}]`)
+      .join(", ") || "(none configured)";
+  const [productionBranch] =
+    [...branchEnvironments].find(
+      ([, environment]) => environment === production
+    ) ?? [];
+  return productionBranch === undefined
+    ? `${listed}; no branch maps to "${production}"`
+    : `${listed}; production is taken to be "${productionBranch}"`;
+}
+
+/**
+ * Record a deploy role that is NOT the production terminal.
+ *
+ * Adds the environment's role and stops. It deliberately does not close the
+ * item and does not retire the claimed role: the work is genuinely still in
+ * flight until it reaches the production branch, and native closure fires only
+ * at the production terminal.
+ * @param {string} ref Canonical work-item reference.
+ * @param {{labels: string[]}} before The pre-write tracker state.
+ * @param {string} role The environment's configured done role.
+ * @returns {void}
+ */
+function recordDeployRole(ref, before, role) {
+  if (carriesLabel(before.labels, role)) return;
+  const [repository, number] = ref.split("#");
+  const edited = run(
+    "gh",
+    [
+      "issue",
+      "edit",
+      String(number),
+      "--repo",
+      repository,
+      "--add-label",
+      role,
+    ],
+    { allowFailure: true }
+  );
+  if (edited.status !== 0) throw githubFailure(edited, ref);
+}
+
+/**
+ * Move a work item to the lifecycle role its merges have actually earned.
+ *
+ * The role is RESOLVED from configuration, never assumed. Lisa's own
  * repository maps `production` to `status:done`, but the map is environment
  * aware — a project whose target is `dev` has a different terminal role, and a
  * hardcoded label would silently apply the wrong one there while looking
@@ -3139,9 +3424,18 @@ function githubTimeline(ref) {
  * is pointed at is a way to make unfinished work disappear, which is the same
  * defect class as a gate that passes because it found nothing. Evidence is a
  * merged pull request in this repository.
+ *
+ * **And a merged pull request is not evidence on its own.** The base branch it
+ * merged into decides which role it earned: only a merge into the production
+ * deploy branch is terminal. A merge into an integration branch records the
+ * environment's role at most, and a merge into a branch this project does not
+ * deploy at all records nothing and closes nothing — reported, never silent,
+ * because a completion that quietly did not happen is the same failure as one
+ * that wrongly did.
  * @param {string} ref Canonical work-item reference.
  * @param {object} contract The resolved tracker contract.
- * @returns {{merged: number[], terminal: string}} What was applied, and why.
+ * @returns {{applied: boolean, merged: number[], report: string, terminal: string|null}}
+ *   What was applied, and why.
  */
 function completeGithubWorkItem(ref, contract) {
   const [repository] = ref.split("#");
@@ -3154,11 +3448,51 @@ function completeGithubWorkItem(ref, contract) {
         `from a real one afterwards. If the work shipped some other way, say so on the item and close it deliberately.`
     );
   }
+  const decision = mergedBaseDecision(
+    merged.map(number => ({
+      base: pullRequestBaseBranch(repository, number),
+      number,
+    })),
+    contract.deployBranches,
+    contract.lifecycle
+  );
+  const evidence = merged.map(number => `#${number}`).join(", ");
+  const bases = describeMergeBases(decision.evidence);
+  if (decision.role === null) {
+    const why = decision.ambiguous
+      ? `Several different non-production deploy environments were reached, and the configuration states\n` +
+        `no ordering between them, so this writer reports them rather than guessing which is furthest.`
+      : `No merged pull request reached a branch this project deploys, so no lifecycle role was\n` +
+        `applied and ${ref} stays open. It completes when the change reaches a deploy branch.`;
+    return {
+      applied: false,
+      bases,
+      merged,
+      report:
+        `work-item NOT completed: ${ref} (merged: ${evidence}) bases: ${bases}\n` +
+        `${why}\n` +
+        `Deploy branches: ${describeDeployBranches(contract.deployBranches, contract.lifecycle.productionEnvironment)}.\n` +
+        `If that production branch is wrong, "deploy.branches" in .lisa.config.json is what to fix.`,
+      terminal: null,
+    };
+  }
   const before = githubLifecycleState(
     ref,
     `GitHub issue ${ref} completion read`
   );
   assertNotAbandoned(ref, before);
+  if (!decision.terminal) {
+    recordDeployRole(ref, before, decision.role);
+    return {
+      applied: true,
+      bases,
+      merged,
+      report:
+        `work-item advanced: ${ref} -> ${decision.role} (merged: ${evidence}) bases: ${bases}\n` +
+        `${decision.environment} is not the production environment, so ${ref} stays open.`,
+      terminal: decision.role,
+    };
+  }
   reconcileGithubLifecycle(ref, before, contract);
   // A SECOND read, deliberately. The edit and the close each reported their own
   // success, and a writer that trusts those is asserting about tracker state it
@@ -3168,7 +3502,13 @@ function completeGithubWorkItem(ref, contract) {
     `GitHub issue ${ref} completion readback`
   );
   assertCompletionReadback(ref, after, contract);
-  return { merged, terminal: contract.lifecycle.terminalName };
+  return {
+    applied: true,
+    bases,
+    merged,
+    report: `work-item completed: ${ref} -> ${contract.lifecycle.terminalName} (merged: ${evidence}) bases: ${bases}`,
+    terminal: contract.lifecycle.terminalName,
+  };
 }
 
 /**
@@ -3582,11 +3922,15 @@ function complete(args) {
   }
   const ref = canonicalizeRef(supplied ?? bound, contract);
   const prUrl = pullRequestUrlOption(args);
-  const { merged, terminal } = completeWorkItem(ref, contract, prUrl);
+  const outcome = completeWorkItem(ref, contract, prUrl);
+  // The writer composes its own sentence when the base branch shaped the
+  // outcome, because only the writer knows which bases it read. The Linear
+  // path has no such decision to report, so it keeps the original line.
   console.log(
-    `work-item completed: ${ref} -> ${terminal} (merged: ${merged
-      .map(number => `#${number}`)
-      .join(", ")})`
+    outcome.report ??
+      `work-item completed: ${ref} -> ${outcome.terminal} (merged: ${outcome.merged
+        .map(number => `#${number}`)
+        .join(", ")})`
   );
 }
 
@@ -3645,8 +3989,15 @@ function sweep(args) {
       console.log(`DRIFT  ${ref}  merged: ${evidence}  ${issue.title}`);
       continue;
     }
-    const { terminal } = completeWorkItem(ref, contract);
-    console.log(`completed ${ref} -> ${terminal}  (merged: ${evidence})`);
+    const outcome = completeWorkItem(ref, contract);
+    // A sweep must not abort on the first item whose merges have not reached a
+    // deploy branch. It reports that item and carries on, which is what makes
+    // the backstop safe to run over a whole queue.
+    console.log(
+      outcome.applied
+        ? `completed ${ref} -> ${outcome.terminal}  (merged: ${evidence}) bases: ${outcome.bases}`
+        : outcome.report
+    );
   }
   if (drifted === 0) {
     console.log(

package/dist/cli/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/cli/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,EACL,KAAK,UAAU,EAGhB,MAAM,qBAAqB,CAAC;AAoO7B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,eAAe,GACrB,MAAM,GAAG,SAAS,CAepB;AAmCD;;;;;;;;;;GAUG;AACH,wBAAsB,QAAQ,CAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CAwEf"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/cli/apply.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,EACL,KAAK,UAAU,EAGhB,MAAM,qBAAqB,CAAC;AAmP7B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,eAAe,GACrB,MAAM,GAAG,SAAS,CAepB;AAmCD;;;;;;;;;;GAUG;AACH,wBAAsB,QAAQ,CAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CAyEf"}

package/dist/cli/apply.js

@@ -129,9 +129,10 @@ function buildApplyConfig(parts) {
  * @param parts.harness - Resolved harness for this invocation
  * @param parts.persistence - Inputs deciding whether config must be written
  * @param parts.stalePaths - Managed files this apply left out of date
+ * @param parts.deletedWorkflowPaths - Workflow files this apply removed
  */
 async function finalizeSuccessfulApply(parts) {
-    const { destDir, logger, config, harness, persistence, stalePaths } = parts;
+    const { destDir, logger, config, harness, persistence, stalePaths, deletedWorkflowPaths, } = parts;
     // Ensure every applied project carries a .lisa.config.json. A missing file is
     // always backfilled with the resolved harness (the default when no --harness
     // was passed) so no project is left config-less; an existing file is only
@@ -161,6 +162,11 @@ async function finalizeSuccessfulApply(parts) {
         // upstream fixes. Doctor reads the receipt, so the finding outlives the
         // install (CodySwannGT/lisa#3033).
         stalePaths,
+        // Same argument as stalePaths, one degree worse. A workflow Lisa removed
+        // leaves nothing on disk to notice and cannot fail a check afterwards, so
+        // the receipt is the only place the removal is still recorded once the
+        // install output is gone (CodySwannGT/lisa#3656).
+        deletedWorkflowPaths,
     });
 }
 /**
@@ -284,6 +290,7 @@ export async function runApply(destination, options) {
                     resolvedHarness: harness,
                 },
                 stalePaths: result.stalePaths,
+                deletedWorkflowPaths: result.deletedWorkflowPaths,
             });
         }
         // After a real apply, surface (read-only) whether any locally-authored

package/dist/cli/apply.js.map

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