@rosthq/cli 0.7.39 → 0.7.41

package/dist/forge-workspace.d.ts

@@ -1,3 +1,4 @@
+import { type StepLedger } from "./step-ledger.js";
 export declare const MODEL_SPAWN_ENV_ALLOWLIST: readonly ["PATH", "HOME", "LANG", "LC_ALL", "TMPDIR", "SHELL", "NODE_OPTIONS"];
 export declare function buildModelSpawnEnv(base: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export type ForgeCredential = {
@@ -31,11 +32,13 @@ export type PrepareForgeWorkspaceOptions = {
     };
     credential: ForgeCredential;
     remoteUrl?: string;
+    ledger?: StepLedger;
 };
 export declare function prepareForgeWorkspace(options: PrepareForgeWorkspaceOptions): Promise<ForgeWorkspace>;
-export declare function pushChangeset(ws: ForgeWorkspace, credential: ForgeCredential): Promise<{
+export declare function pushChangeset(ws: ForgeWorkspace, credential: ForgeCredential, ledger?: StepLedger): Promise<{
     commitSha: string;
 } | null>;
+export declare function computeChangedPaths(ws: ForgeWorkspace): Promise<string[]>;
 export type OpenDraftPullRequestOptions = {
     repo: {
         owner: string;
@@ -48,6 +51,7 @@ export type OpenDraftPullRequestOptions = {
     credential: ForgeCredential;
     apiBaseUrl?: string;
     fetchImpl?: typeof fetch;
+    ledger?: StepLedger;
 };
 export type ForgePullRequest = {
     url: string;

package/dist/forge-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,yBAAyB,gFAQ5B,CAAC;AAEX,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAW7E;AAID,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAG3B,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;IAGpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAKlB,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEvD,MAAM,MAAM,4BAA4B,GAAG;IAEzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,qBAAqB,CAAC;IAE/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,UAAU,EAAE,eAAe,CAAC;IAI5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA+QF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,cAAc,CAAC,CAmC1G;AA8CD,wBAAsB,aAAa,CACjC,EAAE,EAAE,cAAc,EAClB,UAAU,EAAE,eAAe,GAC1B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BvC;AAcD,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAE9D,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,eAAe,CAAC;IAG5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAE7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IAGf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAoGF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkC1G;AAiBD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvE"}
+{"version":3,"file":"forge-workspace.d.ts","sourceRoot":"","sources":["../src/forge-workspace.ts"],"names":[],"mappings":"AA2CA,OAAO,EAAqB,KAAK,UAAU,EAAiB,MAAM,kBAAkB,CAAC;AASrF,eAAO,MAAM,yBAAyB,gFAQ5B,CAAC;AAEX,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAW7E;AAID,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAG3B,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;IAGpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAKlB,OAAO,EAAE,MAAM,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEvD,MAAM,MAAM,4BAA4B,GAAG;IAEzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,OAAO,EAAE,qBAAqB,CAAC;IAE/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,UAAU,EAAE,eAAe,CAAC;IAI5B,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AA2TF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,cAAc,CAAC,CAoC1G;AAiDD,wBAAsB,aAAa,CACjC,EAAE,EAAE,cAAc,EAClB,UAAU,EAAE,eAAe,EAC3B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4BvC;AAsBD,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiC/E;AAcD,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;IAE9D,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,eAAe,CAAC;IAG5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAGzB,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAE7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IAGf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA+GF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAE1G;AAqDD,wBAAsB,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAOvE"}

package/dist/index.js

@@ -51788,6 +51788,65 @@ import { tmpdir } from "node:os";
 import path3 from "node:path";
 import { setTimeout as sleep2 } from "node:timers/promises";
 import { promisify as promisify3 } from "node:util";
+
+// src/step-ledger.ts
+var MAX_LEDGER_ENTRIES = 32;
+var MAX_TRANSCRIPT_CHARS = 4e4;
+var StepLedger = class {
+  #entries = [];
+  record(entry) {
+    this.#entries.push(entry);
+    if (this.#entries.length > MAX_LEDGER_ENTRIES) {
+      this.#entries.shift();
+    }
+  }
+  entries() {
+    return [...this.#entries];
+  }
+  /** The first failed entry, if any — used to step-tag error_logs. */
+  firstFailure() {
+    return this.#entries.find((entry) => !entry.ok);
+  }
+};
+function classifyStepError(message) {
+  const lower = message.toLowerCase();
+  if (/authentication failed|invalid username or password|permission denied|unauthorized|\b401\b|\b403\b/.test(lower)) {
+    return "auth";
+  }
+  if (/already exists|\b409\b|\b422\b/.test(lower)) {
+    return "conflict";
+  }
+  if (/timed out|timeout/.test(lower)) {
+    return "timeout";
+  }
+  if (/no space left|enospc/.test(lower)) {
+    return "disk";
+  }
+  if (/exhausted retries/.test(lower)) {
+    return "retry_exhausted";
+  }
+  if (/could not resolve host|couldn't resolve|connection (refused|reset)|econnrefused|enotfound|network|early eof|rpc failed|the remote end hung up/.test(lower)) {
+    return "network";
+  }
+  return "unknown";
+}
+function classifyHttpStatus(status) {
+  if (status === 401 || status === 403) {
+    return "auth";
+  }
+  if (status === 409 || status === 422) {
+    return "conflict";
+  }
+  if (status === 429) {
+    return "rate_limited";
+  }
+  if (status >= 500) {
+    return "server_error";
+  }
+  return "unknown";
+}
+
+// src/forge-workspace.ts
 var execFile3 = promisify3(execFileCallback3);
 var MODEL_SPAWN_ENV_ALLOWLIST = [
   "PATH",
@@ -51827,6 +51886,28 @@ var LOCAL_GIT_TIMEOUT_MS = 6e4;
 var NETWORK_RETRY_ATTEMPTS = 3;
 var NETWORK_RETRY_BASE_DELAY_MS = 500;
 var GIT_MAX_BUFFER = 64 * 1024 * 1024;
+async function withLedgerStep(ledger, step, fn) {
+  if (!ledger) {
+    return fn({ count: 0 });
+  }
+  const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+  const retryCounter = { count: 0 };
+  try {
+    const result = await fn(retryCounter);
+    ledger.record({ step, started_at: startedAt, ended_at: (/* @__PURE__ */ new Date()).toISOString(), ok: true, retry_count: retryCounter.count });
+    return result;
+  } catch (error51) {
+    ledger.record({
+      step,
+      started_at: startedAt,
+      ended_at: (/* @__PURE__ */ new Date()).toISOString(),
+      ok: false,
+      error_class: classifyStepError(error51 instanceof Error ? error51.message : String(error51)),
+      retry_count: retryCounter.count
+    });
+    throw error51;
+  }
+}
 var FORGE_GIT_AUTHOR_NAME = `${BRAND.name} ${RSF_ADDON_BRAND.shortName}`;
 var FORGE_GIT_AUTHOR_EMAIL = `${RSF_ADDON_BRAND.cliGroup}@${BRAND_DISTRIBUTION.cliBinName}.invalid`;
 function shortRequestId(buildRequestId) {
@@ -51894,13 +51975,20 @@ function isRetryableGitError(message) {
   }
   return /could not resolve host|couldn't resolve|connection (refused|reset|timed out)|connection was reset|timed out|timeout|early eof|rpc failed|unable to access|fetch-pack|the remote end hung up|ssl|tls|500|502|503|429|temporary failure/.test(lower);
 }
-async function withNetworkRetries(op, fn) {
+async function withNetworkRetries(op, fn, retryCounter) {
   let lastError;
   for (let attempt = 1; attempt <= NETWORK_RETRY_ATTEMPTS; attempt += 1) {
     try {
-      return await fn();
+      const result = await fn();
+      if (retryCounter) {
+        retryCounter.count = attempt - 1;
+      }
+      return result;
     } catch (error51) {
       lastError = error51;
+      if (retryCounter) {
+        retryCounter.count = attempt - 1;
+      }
       const message = error51 instanceof Error ? error51.message : String(error51);
       if (attempt >= NETWORK_RETRY_ATTEMPTS || !isRetryableGitError(message)) {
         break;
@@ -51943,7 +52031,7 @@ async function openAskpassSession(credential) {
     }
   };
 }
-async function runGitNetwork(op, args, env, cwd, timeoutMs = FETCH_TIMEOUT_MS) {
+async function runGitNetwork(op, args, env, cwd, timeoutMs = FETCH_TIMEOUT_MS, retryCounter) {
   return withNetworkRetries(op, async () => {
     try {
       const { stdout } = await execFile3("git", [...GIT_HARDENING_ARGS, ...args], {
@@ -51956,7 +52044,7 @@ async function runGitNetwork(op, args, env, cwd, timeoutMs = FETCH_TIMEOUT_MS) {
     } catch (error51) {
       throw new Error(`${op} failed: ${redactGitError(error51)}`);
     }
-  });
+  }, retryCounter);
 }
 async function withAskpass(credential, fn) {
   const session = await openAskpassSession(credential);
@@ -51994,9 +52082,9 @@ async function prepareForgeWorkspace(options) {
   const baseRepo = baseRepoDir(options.baseDir, options.buildRequestId);
   const url2 = remoteUrlFor(options);
   await mkdir2(path3.dirname(baseRepo), { recursive: true, mode: 448 });
-  await withAskpass(options.credential, async (netEnv) => {
+  await withLedgerStep(options.ledger, "clone", (retryCounter) => withAskpass(options.credential, async (netEnv) => {
     if (await isGitRepo(baseRepo)) {
-      await runGitNetwork("git fetch", ["fetch", "--prune", "--quiet", url2, "+refs/heads/*:refs/remotes/origin/*"], netEnv, baseRepo, FETCH_TIMEOUT_MS);
+      await runGitNetwork("git fetch", ["fetch", "--prune", "--quiet", url2, "+refs/heads/*:refs/remotes/origin/*"], netEnv, baseRepo, FETCH_TIMEOUT_MS, retryCounter);
     } else {
       await runGitNetwork(
         "git clone",
@@ -52005,10 +52093,11 @@ async function prepareForgeWorkspace(options) {
         ["clone", "--no-checkout", "--quiet", url2, baseRepo],
         netEnv,
         void 0,
-        CLONE_TIMEOUT_MS
+        CLONE_TIMEOUT_MS,
+        retryCounter
       );
     }
-  });
+  }));
   await configureForgeIdentity(baseRepo);
   if (options.profile === "review") {
     return await prepareReviewWorktree(options, baseRepo);
@@ -52019,13 +52108,15 @@ async function prepareBuildWorktree(options, baseRepo) {
   const branch = branchName(options.buildRequestId, options.changeset);
   const worktreeDir = buildWorktreeDir(options.baseDir, options.buildRequestId, options.changeset.ordinal);
   const originDefault = `origin/${options.repo.default_branch}`;
-  if (!await worktreeRegistered(baseRepo, worktreeDir)) {
-    if (await localBranchExists(baseRepo, branch)) {
-      await runGit(["worktree", "add", worktreeDir, branch], baseRepo);
-    } else {
-      await runGit(["worktree", "add", "-b", branch, worktreeDir, originDefault], baseRepo);
+  await withLedgerStep(options.ledger, "branch", async () => {
+    if (!await worktreeRegistered(baseRepo, worktreeDir)) {
+      if (await localBranchExists(baseRepo, branch)) {
+        await runGit(["worktree", "add", worktreeDir, branch], baseRepo);
+      } else {
+        await runGit(["worktree", "add", "-b", branch, worktreeDir, originDefault], baseRepo);
+      }
     }
-  }
+  });
   const baseSha = (await runGit(["merge-base", "HEAD", originDefault], worktreeDir)).trim();
   return { baseRepo, worktreeDir, branch, readOnly: false, baseSha, remoteUrl: remoteUrlFor(options) };
 }
@@ -52041,7 +52132,7 @@ async function prepareReviewWorktree(options, baseRepo) {
   await runGit(["worktree", "add", "--detach", worktreeDir, headSha], baseRepo);
   return { baseRepo, worktreeDir, branch: "", readOnly: true, baseSha: headSha, remoteUrl: remoteUrlFor(options) };
 }
-async function pushChangeset(ws, credential) {
+async function pushChangeset(ws, credential, ledger) {
   if (ws.readOnly || ws.branch.length === 0) {
     return null;
   }
@@ -52050,16 +52141,46 @@ async function pushChangeset(ws, credential) {
   if (!Number.isFinite(ahead) || ahead <= 0) {
     return null;
   }
-  await withAskpass(credential, async (netEnv) => {
-    await runGitNetwork("git push", ["push", "--quiet", ws.remoteUrl, `HEAD:refs/heads/${ws.branch}`], netEnv, ws.worktreeDir, PUSH_TIMEOUT_MS);
-    const remote = await runGitNetwork("git ls-remote", ["ls-remote", ws.remoteUrl, `refs/heads/${ws.branch}`], netEnv, ws.worktreeDir, FETCH_TIMEOUT_MS);
+  await withLedgerStep(ledger, "push", (retryCounter) => withAskpass(credential, async (netEnv) => {
+    await runGitNetwork("git push", ["push", "--quiet", ws.remoteUrl, `HEAD:refs/heads/${ws.branch}`], netEnv, ws.worktreeDir, PUSH_TIMEOUT_MS, retryCounter);
+    const remote = await runGitNetwork("git ls-remote", ["ls-remote", ws.remoteUrl, `refs/heads/${ws.branch}`], netEnv, ws.worktreeDir, FETCH_TIMEOUT_MS, retryCounter);
     const remoteSha = remote.split(/\s+/)[0]?.trim() ?? "";
     if (remoteSha !== head2) {
       throw new Error(`git push postcondition failed: remote ${ws.branch} is ${remoteSha || "absent"}, expected ${head2}`);
     }
-  });
+  }));
   return { commitSha: head2 };
 }
+async function computeChangedPaths(ws) {
+  if (ws.readOnly || ws.branch.length === 0) {
+    return [];
+  }
+  const raw = await runGit(
+    ["diff", "--name-status", "-M", "-z", `${ws.baseSha}..HEAD`],
+    ws.worktreeDir
+  );
+  const tokens = raw.split("\0").filter((token) => token.length > 0);
+  const paths = /* @__PURE__ */ new Set();
+  let i = 0;
+  while (i < tokens.length) {
+    const status = tokens[i] ?? "";
+    i += 1;
+    const isRenameOrCopy = status.startsWith("R") || status.startsWith("C");
+    const src = tokens[i];
+    if (src !== void 0) {
+      paths.add(src);
+      i += 1;
+    }
+    if (isRenameOrCopy) {
+      const dst = tokens[i];
+      if (dst !== void 0) {
+        paths.add(dst);
+        i += 1;
+      }
+    }
+  }
+  return [...paths];
+}
 var GITHUB_API_BASE_URL = "https://api.github.com";
 var PR_OPEN_RETRY_ATTEMPTS = 3;
 var PR_OPEN_RETRY_BASE_DELAY_MS = 500;
@@ -52088,19 +52209,28 @@ function draftPrBody(options) {
     `The approved plan and task checklist are tracked on the ${RSF_ADDON_BRAND.shortName} build request above. This PR is a draft; the runner never merges.`
   ].join("\n");
 }
-async function withGithubRetries(op, fn) {
+async function withGithubRetries(op, fn, retryCounter) {
   let lastError;
   for (let attempt = 1; attempt <= PR_OPEN_RETRY_ATTEMPTS; attempt += 1) {
     try {
       const response = await fn();
       if ((response.status >= 500 || response.status === 429) && attempt < PR_OPEN_RETRY_ATTEMPTS) {
         lastError = new Error(`${op} transient status ${response.status}`);
+        if (retryCounter) {
+          retryCounter.count = attempt - 1;
+        }
         await sleep2(PR_OPEN_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
         continue;
       }
+      if (retryCounter) {
+        retryCounter.count = attempt - 1;
+      }
       return response;
     } catch (error51) {
       lastError = error51;
+      if (retryCounter) {
+        retryCounter.count = attempt - 1;
+      }
       if (attempt >= PR_OPEN_RETRY_ATTEMPTS) {
         break;
       }
@@ -52126,7 +52256,7 @@ function toForgePullRequest(json2, adopted) {
   }
   return { url: url2, number: number4, draft, adopted };
 }
-async function adoptExistingPullRequest(baseUrl, fetchImpl, options) {
+async function adoptExistingPullRequest(baseUrl, fetchImpl, options, retryCounter) {
   const { owner, name } = options.repo;
   const head2 = `${owner}:${options.branch}`;
   const response = await withGithubRetries(
@@ -52134,7 +52264,8 @@ async function adoptExistingPullRequest(baseUrl, fetchImpl, options) {
     async () => fetchImpl(`${baseUrl}/repos/${owner}/${name}/pulls?state=open&head=${encodeURIComponent(head2)}`, {
       method: "GET",
       headers: githubHeaders(options.credential)
-    })
+    }),
+    retryCounter
   );
   if (response.status !== 200) {
     return null;
@@ -52146,6 +52277,9 @@ async function adoptExistingPullRequest(baseUrl, fetchImpl, options) {
   return toForgePullRequest(list[0], true);
 }
 async function openDraftPullRequest(options) {
+  return withLedgerStep(options.ledger, "pr_open", (retryCounter) => openDraftPullRequestInner(options, retryCounter));
+}
+async function openDraftPullRequestInner(options, retryCounter) {
   const baseUrl = (options.apiBaseUrl ?? GITHUB_API_BASE_URL).replace(/\/+$/, "");
   const fetchImpl = options.fetchImpl ?? fetch;
   const { owner, name } = options.repo;
@@ -52162,7 +52296,8 @@ async function openDraftPullRequest(options) {
         draft: true,
         maintainer_can_modify: true
       })
-    })
+    }),
+    retryCounter
   );
   if (created.status === 201) {
     return toForgePullRequest(await created.json(), false);
@@ -52170,7 +52305,7 @@ async function openDraftPullRequest(options) {
   if (created.status === 422) {
     const detail = await readErrorText(created);
     if (/already exists/i.test(detail)) {
-      const existing = await adoptExistingPullRequest(baseUrl, fetchImpl, options);
+      const existing = await adoptExistingPullRequest(baseUrl, fetchImpl, options, retryCounter);
       if (existing) {
         return existing;
       }
@@ -52878,6 +53013,7 @@ async function post2(fetchImpl, appUrl2, pathName, body, token) {
   return { status: response.status, json: json2 };
 }
 async function claimAndExecute(fetchImpl, appUrl2, state, config2, io, runtime, options = {}) {
+  const claimStartedAt = (/* @__PURE__ */ new Date()).toISOString();
   const claimed = await post2(
     fetchImpl,
     appUrl2,
@@ -52885,9 +53021,18 @@ async function claimAndExecute(fetchImpl, appUrl2, state, config2, io, runtime,
     options.interactiveOnly ? { interactive_only: true } : {},
     state.runner_secret
   );
+  const ledger = new StepLedger();
+  ledger.record({
+    step: "claim",
+    started_at: claimStartedAt,
+    ended_at: (/* @__PURE__ */ new Date()).toISOString(),
+    ok: claimed.status === 200,
+    retry_count: 0,
+    ...claimed.status === 200 ? {} : { error_class: classifyHttpStatus(claimed.status) }
+  });
   const turnExecution = claimed.json.turn_execution;
   if (claimed.status === 200 && turnExecution && typeof turnExecution === "object") {
-    await executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, {
+    await executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, ledger, {
       kind: "turn_execution",
       idField: "turn_execution_id",
       item: turnExecution,
@@ -52901,7 +53046,7 @@ async function claimAndExecute(fetchImpl, appUrl2, state, config2, io, runtime,
   if (claimed.status !== 200 || !workOrder || typeof workOrder !== "object") {
     return;
   }
-  await executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, {
+  await executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, ledger, {
     kind: "work_order",
     idField: "work_order_id",
     item: workOrder,
@@ -52910,7 +53055,7 @@ async function claimAndExecute(fetchImpl, appUrl2, state, config2, io, runtime,
     logRef: (id) => `runner-local:${id}`
   });
 }
-async function executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, input) {
+async function executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtime, ledger, input) {
   const id = input.item.id;
   if (typeof id !== "string") {
     return;
@@ -52920,7 +53065,7 @@ async function executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtim
     throw new Error(`${claimedUnitLabel(input.kind)} start failed ${started.status}: ${redactForLog(JSON.stringify(started.json))}`);
   }
   const turnRuntime = runtimeForClaimedUnit(input.item, runtime, input.kind);
-  const result = turnRuntime ? await runLocalTurn({ fetchImpl, appUrl: appUrl2, state, config: config2, io }, input.item, turnRuntime, input.kind) : {
+  const result = turnRuntime ? await runLocalTurn({ fetchImpl, appUrl: appUrl2, state, config: config2, io, ledger }, input.item, turnRuntime, input.kind) : {
     ok: false,
     summary: `Runner runtime ${runtime} cannot execute requested ${String(input.item.brain ?? "unknown")} turn.`
   };
@@ -52946,7 +53091,14 @@ async function executeClaimedUnit(fetchImpl, appUrl2, state, config2, io, runtim
     ...result.prUrl ? { pr_url: result.prUrl } : {},
     ...result.branch ? { branch: result.branch } : {},
     ...result.commitSha ? { commit_sha: result.commitSha } : {},
-    ...result.evidence && result.evidence.length > 0 ? { evidence: result.evidence } : {}
+    ...result.evidence && result.evidence.length > 0 ? { evidence: result.evidence } : {},
+    ...result.changedPaths && result.changedPaths.length > 0 ? { changed_paths: result.changedPaths } : {},
+    // DER-1331 (T1.9): the step ledger + the model's (already redacted, bounded) transcript.
+    // Only the work-orders result route accepts these today (turn-executions is a separate,
+    // narrower endpoint — T1.9 scope); its Zod schema strips unrecognized keys on a non-strict
+    // parse either way, so sending them there is harmless, just unused.
+    ...input.kind === "work_order" ? { step_ledger: ledger.entries() } : {},
+    ...input.kind === "work_order" && result.transcript ? { transcript: result.transcript } : {}
   }, state.runner_secret);
   if (reported.status !== 200) {
     throw new Error(`${claimedUnitLabel(input.kind)} result failed ${reported.status}: ${redactForLog(JSON.stringify(reported.json))}`);
@@ -53060,6 +53212,7 @@ async function prepareForgeTurn(ctx, workOrder, execution) {
   if (!workOrderId || !buildRequestId) {
     return { ok: false, summary: "forge turn missing work order id or build request id" };
   }
+  const credentialMintStartedAt = (/* @__PURE__ */ new Date()).toISOString();
   const brokered = await post2(
     ctx.fetchImpl,
     ctx.appUrl,
@@ -53067,6 +53220,14 @@ async function prepareForgeTurn(ctx, workOrder, execution) {
     {},
     ctx.state.runner_secret
   );
+  ctx.ledger.record({
+    step: "credential_mint",
+    started_at: credentialMintStartedAt,
+    ended_at: (/* @__PURE__ */ new Date()).toISOString(),
+    ok: brokered.status === 200,
+    retry_count: 0,
+    ...brokered.status === 200 ? {} : { error_class: classifyHttpStatus(brokered.status) }
+  });
   if (brokered.status !== 200) {
     return { ok: false, summary: `forge credential broker failed ${brokered.status}: ${redactForLog(JSON.stringify(brokered.json))}` };
   }
@@ -53094,7 +53255,8 @@ async function prepareForgeTurn(ctx, workOrder, execution) {
       profile: isBuild ? "build" : "review",
       ...isBuild ? {} : { headSha: `origin/${defaultBranch}` },
       repo: { owner, name, default_branch: defaultBranch },
-      credential
+      credential,
+      ledger: ctx.ledger
     });
   } catch (error51) {
     return { ok: false, summary: `forge workspace preparation failed: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}` };
@@ -53132,11 +53294,17 @@ async function prepareForgeTurn(ctx, workOrder, execution) {
     }
   };
 }
-async function finalizeForgeBuildPush(prep, result) {
+var FORGE_MAX_CHANGED_PATHS = 2e3;
+var FORGE_MAX_CHANGED_PATH_LENGTH = 500;
+function forgeChangedPathsField(changedPaths) {
+  const withinCaps = changedPaths.length > 0 && changedPaths.length <= FORGE_MAX_CHANGED_PATHS && changedPaths.every((path7) => path7.length >= 1 && path7.length <= FORGE_MAX_CHANGED_PATH_LENGTH);
+  return withinCaps ? { changedPaths: [...changedPaths] } : {};
+}
+async function finalizeForgeBuildPush(ctx, prep, result) {
   const credential = { token: prep.credential.token, expiresAt: prep.credential.expiresAt };
   let pushed;
   try {
-    pushed = await pushChangeset(prep.workspace, credential);
+    pushed = await pushChangeset(prep.workspace, credential, ctx.ledger);
   } catch (error51) {
     return {
       ...result,
@@ -53149,13 +53317,21 @@ async function finalizeForgeBuildPush(prep, result) {
     return { ...result, summary: `${result.summary}
 [forge] no changes to push`.slice(0, 12e3) };
   }
+  let changedPaths = [];
+  try {
+    changedPaths = await computeChangedPaths(prep.workspace);
+  } catch {
+    changedPaths = [];
+  }
+  const changedPathsField = forgeChangedPathsField(changedPaths);
   try {
     const pr = await openDraftPullRequest({
       repo: prep.repo,
       branch: prep.workspace.branch,
       buildRequestId: prep.buildRequestId,
       commitSha: pushed.commitSha,
-      credential
+      credential,
+      ledger: ctx.ledger
     });
     const evidence = [
       { kind: "note", summary: `pushed ${pushed.commitSha} to ${prep.workspace.branch}`.slice(0, 500) },
@@ -53167,6 +53343,7 @@ async function finalizeForgeBuildPush(prep, result) {
       branch: prep.workspace.branch,
       commitSha: pushed.commitSha,
       evidence,
+      ...changedPathsField,
       summary: `${result.summary}
 [forge] pushed ${pushed.commitSha} to ${prep.workspace.branch}; ${pr.adopted ? "adopted" : "opened"} draft PR ${pr.url}`.slice(0, 12e3)
     };
@@ -53178,6 +53355,7 @@ async function finalizeForgeBuildPush(prep, result) {
       // rather than advancing a headless push. Re-entry re-pushes (no-op) and re-opens (adopt).
       branch: prep.workspace.branch,
       commitSha: pushed.commitSha,
+      ...changedPathsField,
       summary: `${result.summary}
 [forge] pushed ${pushed.commitSha} to ${prep.workspace.branch}; draft PR open failed: ${redactForLog(error51 instanceof Error ? error51.message : String(error51))}`.slice(0, 12e3)
     };
@@ -53259,6 +53437,7 @@ async function spawnRunnerTurn(ctx, workOrder, runtime, kind) {
   }
   const { command, args } = wrapCommandWithSandbox(sandbox, built.command, built.args, sandboxProfilePath);
   const expectSessionEnvelope = runtime === "claude" && kind === "turn_execution";
+  const spawnStartedAt = (/* @__PURE__ */ new Date()).toISOString();
   let result = await runModelProcess({
     command,
     args,
@@ -53269,13 +53448,32 @@ async function spawnRunnerTurn(ctx, workOrder, runtime, kind) {
     expectSessionEnvelope,
     resumeSessionId
   });
+  const exitClass = classifyModelExit(result);
+  ctx.ledger.record({
+    step: "spawn",
+    started_at: spawnStartedAt,
+    ended_at: spawnStartedAt,
+    ok: !exitClass.spawnFailed,
+    retry_count: 0,
+    ...exitClass.spawnFailed ? { error_class: "spawn_error" } : {}
+  });
+  if (!exitClass.spawnFailed) {
+    ctx.ledger.record({
+      step: "model_exit",
+      started_at: spawnStartedAt,
+      ended_at: (/* @__PURE__ */ new Date()).toISOString(),
+      ok: result.ok,
+      retry_count: 0,
+      ...exitClass.errorClass ? { error_class: exitClass.errorClass } : {}
+    });
+  }
   void rm4(configPath, { force: true });
   if (sandboxProfilePath) {
     void rm4(sandboxProfilePath, { force: true });
   }
   if (forgePrep) {
     if (plan.profile === "forge_build" && result.ok && forgePrep.credential.canPush) {
-      result = await finalizeForgeBuildPush(forgePrep, result);
+      result = await finalizeForgeBuildPush(ctx, forgePrep, result);
     }
     if (plan.profile === "forge_review") {
       await removeWorkspace(forgePrep.workspace).catch((error51) => {
@@ -53286,6 +53484,9 @@ async function spawnRunnerTurn(ctx, workOrder, runtime, kind) {
   }
   return result;
 }
+function scrubTranscriptSessionIds(value) {
+  return value.replace(/("?(?:session_id|sessionId)"?\s*[:=]\s*"?)[A-Za-z0-9._-]+("?)/gi, "$1[redacted]$2");
+}
 function runModelProcess(input) {
   return new Promise((resolve2) => {
     let settled = false;
@@ -53305,7 +53506,12 @@ function runModelProcess(input) {
     let err = "";
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      finish({ ok: false, summary: `turn timed out after ${Math.round(input.timeoutMs / 1e3)}s` });
+      const partial2 = scrubTranscriptSessionIds(redactForLog((out || err || "").trim()));
+      finish({
+        ok: false,
+        summary: `turn timed out after ${Math.round(input.timeoutMs / 1e3)}s`,
+        ...partial2.length > 0 ? { transcript: partial2.slice(0, MAX_TRANSCRIPT_CHARS) } : {}
+      });
     }, input.timeoutMs);
     child.stdout.on("data", (data) => {
       out += data.toString("utf8");
@@ -53316,9 +53522,11 @@ function runModelProcess(input) {
     child.on("close", (code) => {
       clearTimeout(timer);
       const rawOutput = (out || err || "completed").trim();
+      const redacted = redactForLog(rawOutput);
       finish({
         ok: code === 0,
-        summary: extractRunnerSummary(redactForLog(rawOutput)).slice(0, 12e3),
+        summary: extractRunnerSummary(redacted).slice(0, 12e3),
+        transcript: scrubTranscriptSessionIds(redacted).slice(0, MAX_TRANSCRIPT_CHARS),
         ...input.expectSessionEnvelope ? extractClaudeSessionId(rawOutput) : {}
       });
     });
@@ -53328,6 +53536,18 @@ function runModelProcess(input) {
     });
   });
 }
+function classifyModelExit(result) {
+  if (result.summary.startsWith("spawn error:")) {
+    return { spawnFailed: true };
+  }
+  if (result.summary.startsWith("turn timed out after")) {
+    return { spawnFailed: false, errorClass: "timeout" };
+  }
+  if (!result.ok) {
+    return { spawnFailed: false, errorClass: "nonzero_exit" };
+  }
+  return { spawnFailed: false };
+}
 function extractRunnerSummary(output) {
   const trimmed = output.trim();
   if (!trimmed.startsWith("{")) {