@foldrun/core 2.5.0 → 2.6.0

package/src/store.ts

@@ -31,7 +31,7 @@ import { platform } from "./platform.ts";
 import { toLF, asRaw } from "./eol.ts";
 import type { TestEffect } from "./test-mode.ts";
 import type { OperatorEvent } from "./operator.ts";
-import matter from "./matter.ts";
+import matter, { frontmatterErrorText, configMatter } from "./matter.ts";
 import { readAgentsMdKeys } from "./agents-md.ts";
 
 /**
@@ -44,7 +44,7 @@ import { readAgentsMdKeys } from "./agents-md.ts";
  * the runtime, and there is nothing to fail to import.
  */
 export function readFrontmatter(file: string): Record<string, unknown> {
-  return matter(fs.readFileSync(file, "utf8")).data as Record<string, unknown>;
+  return configMatter(fs.readFileSync(file, "utf8")).data as Record<string, unknown>;
 }
 import { ownToolNames, legacyUseNames, retiredToolNames } from "./tool-names.ts";
 import { refNames } from "./refs.ts";
@@ -1602,7 +1602,7 @@ export function listAgents(tenant: string, workspace: string): AgentInfo[] {
       let data: Record<string, any> = {};
       let frontmatterError: string | undefined;
       try {
-        ({ data } = matter(fs.readFileSync(path.join(dir, name, "agent.md"), "utf8")));
+        ({ data } = configMatter(fs.readFileSync(path.join(dir, name, "agent.md"), "utf8")));
       } catch (err) {
         frontmatterError = frontmatterErrorText(err);
       }
@@ -1652,12 +1652,9 @@ export function listAgents(tenant: string, workspace: string): AgentInfo[] {
     });
 }
 
-/** The first line of a YAML parse error, with where it is: what a person
- *  needs to fix the file, without the parser's excerpt. */
-export function frontmatterErrorText(err: unknown): string {
-  const msg = err instanceof Error ? err.message : String(err);
-  return `frontmatter does not parse — ${msg.split("\n")[0].trim()}. Quote a value that contains a colon followed by a space.`;
-}
+// Kept here for callers that import it from the store; it lives in matter.ts
+// so the scanner can use it without the store.
+export { frontmatterErrorText };
 
 /** The body of a file whose frontmatter would not parse: what follows the
  *  closing fence, so a flow's steps can still be read and shown. */
@@ -1839,7 +1836,7 @@ export function parseFlow(file: string, raw: string): FlowInfo {
   let content: string;
   let frontError: string | null = null;
   try {
-    ({ data, content } = matter(raw));
+    ({ data, content } = configMatter(raw));
   } catch (err) {
     frontError = frontmatterErrorText(err);
     content = bodyAfterFrontmatter(raw);
@@ -3297,6 +3294,15 @@ export function sumAttempts(tries: StepAttempt[]): Pick<StepAttempt, "costUsd" |
 export { type TokenUsage, type PromptLayerRecord, tokensOf, sumTokens, cacheHitRate, measuredHitRate, runTokens, promptLayersChanged, promptCacheNote } from "./tokens.ts";
 import { sumTokens, type TokenUsage, type PromptLayerRecord } from "./tokens.ts";
 
+/** The marker rescueStep puts in a rescue's instruction; how a rescue record
+ *  written before `rescueOf` existed is still recognised. */
+export const RESCUE_MARKER = "<rescue>\nYou are taking this step over:";
+
+/** Is this record an on-fail rescue rather than a step of the flow? */
+export function isRescueRecord(step: { rescueOf?: string; instruction?: string | null }): boolean {
+  return !!step.rescueOf || (step.instruction ?? "").includes(RESCUE_MARKER);
+}
+
 export interface StepRecord {
   agent: string;
   instruction: string;
@@ -3450,6 +3456,13 @@ export interface StepRecord {
    *  actually executed in. Carried steps provide context and are never
    *  billed again — the original run's ledger line already paid for them. */
   carriedFrom?: string;
+  /** Set on an on-fail rescue record (runner.ts rescueStep): the agent of the
+   *  failed step it took over. A rescue is not a step of the flow: a resumed
+   *  drive must not launch it as one of its group, and a re-run must not
+   *  copy it as work (21 Oct 2026: one rerun carried 77 fixers as pending
+   *  steps). Records written before this field are recognised by their
+   *  instruction's `<rescue>` block instead — see isRescueRecord. */
+  rescueOf?: string;
   /**
    * Sandbox seconds this step rented, and how many of them were cold start.
    * Set only on the isolated path — an in-process step rents nothing, so