nolo-cli 0.54.0 → 0.61.0-alpha.3

package/chunk-3BLB7QKO.js

@@ -0,0 +1,433 @@
+import {
+  isOAuthApiKeyRef
+} from "./chunk-YYLHWIW6.js";
+import {
+  compareAgentSelection
+} from "./chunk-RJ2SAFB5.js";
+import {
+  getModelAbility
+} from "./chunk-FKFMIBTT.js";
+import {
+  isOwnedAgentKey,
+  ownedAgentKey,
+  publicAgentKey
+} from "./chunk-BJIRLHJR.js";
+
+// packages/ai/agent/agentBilling.ts
+function resolveBillingSource(candidate) {
+  if (candidate?.local === true || candidate?.isLocal === true || candidate?.cliProvider === "local" || candidate?.apiSource === "local" || candidate?.provider === "local" || candidate?.billingSource === "local") return "local";
+  if (candidate?.isOwned !== true) return "platform_credits";
+  if (candidate?.isOAuth === true || candidate?.billingSource === "user_subscription" || candidate?.apiSource === "oauth" || isOAuthApiKeyRef(candidate?.apiKeyRef)) return "user_subscription";
+  if (candidate?.apiSource === "custom" || candidate?.billingSource === "user_api") {
+    return "user_api";
+  }
+  return "platform_credits";
+}
+
+// packages/ai/economics/economicsPolicy.ts
+var DEEPSEEK_PRICING_DOC = "https://api-docs.deepseek.com/quick_start/pricing";
+var BIGMODEL_CODING_PLAN_USAGE_NOTES = "https://docs.bigmodel.cn/cn/coding-plan/usage-notes";
+var WEEKDAYS_MON_FRI = [1, 2, 3, 4, 5];
+var DEEPSEEK_API_POLICY = {
+  id: "deepseek_api",
+  version: "2026-09-weekday-utc-peak-2x",
+  windows: [
+    { timezone: "UTC", weekdays: WEEKDAYS_MON_FRI, startMinute: 60, endMinute: 240 },
+    { timezone: "UTC", weekdays: WEEKDAYS_MON_FRI, startMinute: 360, endMinute: 600 }
+  ],
+  effectiveFrom: Date.UTC(2026, 7, 16, 16, 0, 0),
+  peakPriceMultiplier: 2,
+  offPeakPriceMultiplier: 1,
+  sourceUrl: DEEPSEEK_PRICING_DOC
+};
+var BIGMODEL_GLM_CODING_PLAN_POLICY = {
+  id: "bigmodel_glm_coding_plan",
+  version: "2026-09-coding-plan-sh-peak-14-18",
+  windows: [
+    { timezone: "Asia/Shanghai", weekdays: WEEKDAYS_MON_FRI, startMinute: 840, endMinute: 1080 }
+  ],
+  peakQuotaMultiplier: 1,
+  offPeakQuotaMultiplier: 0.5,
+  sourceUrl: BIGMODEL_CODING_PLAN_USAGE_NOTES
+};
+var ECONOMICS_POLICIES = [
+  DEEPSEEK_API_POLICY,
+  BIGMODEL_GLM_CODING_PLAN_POLICY
+];
+function resolveEconomicsSourceId(input) {
+  const provider = typeof input?.provider === "string" ? input.provider.trim().toLowerCase() : "";
+  if (input?.apiSource?.trim().toLowerCase() === "platform") return null;
+  const rawUrl = typeof input?.customProviderUrl === "string" ? input.customProviderUrl.trim() : "";
+  let hostname = "";
+  let pathname = "";
+  if (rawUrl) {
+    try {
+      const parsed = new URL(rawUrl);
+      hostname = parsed.hostname.toLowerCase();
+      pathname = parsed.pathname;
+    } catch {
+      return null;
+    }
+  }
+  if (provider === "deepseek") {
+    if (rawUrl && hostname !== "api.deepseek.com") return null;
+    return rawUrl ? "deepseek_api" : null;
+  }
+  if (provider === "bigmodel") {
+    if (hostname === "open.bigmodel.cn" && pathname.startsWith("/api/coding/")) {
+      return "bigmodel_glm_coding_plan";
+    }
+    return null;
+  }
+  return null;
+}
+
+// packages/ai/economics/economicsSnapshot.ts
+var wallClockFormatterCache = /* @__PURE__ */ new Map();
+function getWallClockFormatter(timezone) {
+  let formatter = wallClockFormatterCache.get(timezone);
+  if (!formatter) {
+    formatter = new Intl.DateTimeFormat("en-US", {
+      timeZone: timezone,
+      hourCycle: "h23",
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit"
+    });
+    wallClockFormatterCache.set(timezone, formatter);
+  }
+  return formatter;
+}
+function getZonedWallClock(timezone, at) {
+  const parts = getWallClockFormatter(timezone).formatToParts(new Date(at));
+  const values = {};
+  for (const part of parts) {
+    if (part.type !== "literal") values[part.type] = Number(part.value);
+  }
+  const year = values.year;
+  const month = values.month;
+  const day = values.day;
+  const hour = values.hour;
+  const minute = values.minute;
+  const second = values.second;
+  const weekday = new Date(Date.UTC(year, month - 1, day)).getUTCDay();
+  return { year, month, day, hour, minute, second, weekday, minutesOfDay: hour * 60 + minute };
+}
+function getTimeZoneOffsetMs(timezone, at) {
+  const atSecond = Math.floor(at / 1e3) * 1e3;
+  const clock = getZonedWallClock(timezone, atSecond);
+  return Date.UTC(clock.year, clock.month - 1, clock.day, clock.hour, clock.minute, clock.second) - atSecond;
+}
+function zonedWallClockToEpochMs(timezone, year, month, day, minutesOfDay) {
+  const guess = Date.UTC(year, month - 1, day, Math.floor(minutesOfDay / 60), minutesOfDay % 60);
+  let instant = guess - getTimeZoneOffsetMs(timezone, guess);
+  instant = guess - getTimeZoneOffsetMs(timezone, instant);
+  return instant;
+}
+function resolveEconomicsPeriod(policy, at) {
+  for (const window of policy.windows) {
+    const clock = getZonedWallClock(window.timezone, at);
+    if (!window.weekdays.includes(clock.weekday)) continue;
+    if (clock.minutesOfDay >= window.startMinute && clock.minutesOfDay < window.endMinute) {
+      return "peak";
+    }
+  }
+  return "off_peak";
+}
+function findNextEconomicsBoundary(policy, at) {
+  let best;
+  for (const window of policy.windows) {
+    const anchor = getZonedWallClock(window.timezone, at);
+    for (let dayOffset = 0; dayOffset <= 7; dayOffset++) {
+      const dayUtc = new Date(Date.UTC(anchor.year, anchor.month - 1, anchor.day + dayOffset));
+      const weekday = dayUtc.getUTCDay();
+      if (!window.weekdays.includes(weekday)) continue;
+      const year = dayUtc.getUTCFullYear();
+      const month = dayUtc.getUTCMonth() + 1;
+      const day = dayUtc.getUTCDate();
+      for (const edge of [window.startMinute, window.endMinute]) {
+        const instant = zonedWallClockToEpochMs(window.timezone, year, month, day, edge);
+        if (instant > at && (best === void 0 || instant < best)) best = instant;
+      }
+    }
+  }
+  return best;
+}
+function selectEconomicsPolicyVersion(policies, sourceId, at) {
+  const applicable = policies.filter(
+    (policy) => policy.id === sourceId && (policy.effectiveFrom === void 0 || policy.effectiveFrom <= at) && (policy.effectiveUntil === void 0 || at < policy.effectiveUntil)
+  );
+  if (applicable.length === 0) return null;
+  return applicable.reduce(
+    (latest, candidate) => (candidate.effectiveFrom ?? -Infinity) >= (latest.effectiveFrom ?? -Infinity) ? candidate : latest
+  );
+}
+function findNextPolicyBoundary(policy, at, policies) {
+  const boundaries = [
+    policy.effectiveUntil,
+    ...policies.filter((candidate) => candidate.id === policy.id).map((candidate) => candidate.effectiveFrom).filter((value) => value !== void 0 && value > at)
+  ].filter((value) => value !== void 0 && value > at);
+  return boundaries.length > 0 ? Math.min(...boundaries) : void 0;
+}
+function resolveEconomicsSnapshot(input, at, policies = ECONOMICS_POLICIES) {
+  const sourceId = resolveEconomicsSourceId(input);
+  if (!sourceId) return null;
+  const policy = selectEconomicsPolicyVersion(policies, sourceId, at);
+  if (!policy) return null;
+  const period = resolveEconomicsPeriod(policy, at);
+  const priceMultiplier = period === "peak" ? policy.peakPriceMultiplier : policy.offPeakPriceMultiplier;
+  const quotaMultiplier = period === "peak" ? policy.peakQuotaMultiplier : policy.offPeakQuotaMultiplier;
+  const windowBoundary = findNextEconomicsBoundary(policy, at);
+  const policyBoundary = findNextPolicyBoundary(policy, at, policies);
+  const changesAt = [windowBoundary, policyBoundary].filter((value) => value !== void 0).sort((a, b) => a - b)[0];
+  return {
+    source: sourceId,
+    policyVersion: policy.version,
+    period,
+    ...priceMultiplier !== void 0 ? { priceMultiplier } : {},
+    ...quotaMultiplier !== void 0 ? { quotaMultiplier } : {},
+    ...changesAt !== void 0 ? { changesAt } : {}
+  };
+}
+
+// packages/ai/agent/safeAgentSummary.ts
+function parseTimestamp(val) {
+  if (typeof val === "number" && Number.isFinite(val)) return val;
+  if (typeof val === "string") return Date.parse(val) || 0;
+  return 0;
+}
+function safeTimestamp(val) {
+  if (typeof val === "number" && Number.isFinite(val)) return val;
+  if (typeof val === "string") return val;
+  return null;
+}
+function parseAgentRecordId(privateKey, explicitId) {
+  if (explicitId && typeof explicitId === "string" && explicitId.trim()) {
+    return explicitId.trim();
+  }
+  if (privateKey && typeof privateKey === "string") {
+    const match = privateKey.match(/^agent-[^-]+-(.+)$/i);
+    if (match?.[1]) return match[1];
+  }
+  return null;
+}
+function resolveFavoriteStatus(record, options) {
+  if (options?.isFavorite !== void 0) {
+    return {
+      isFavorite: !!options.isFavorite,
+      favoritedAt: safeTimestamp(options.favoritedAt)
+    };
+  }
+  if (record?.isFavorite === true) {
+    return {
+      isFavorite: true,
+      favoritedAt: safeTimestamp(record?.favoritedAt)
+    };
+  }
+  const favoritesMap = options?.favoritesMap;
+  if (!favoritesMap) {
+    return { isFavorite: false, favoritedAt: null };
+  }
+  const candidateKeys = [];
+  if (typeof record?.dbKey === "string" && record.dbKey) candidateKeys.push(record.dbKey);
+  if (typeof record?.privateKey === "string" && record.privateKey) candidateKeys.push(record.privateKey);
+  if (typeof record?.publicKey === "string" && record.publicKey) candidateKeys.push(record.publicKey);
+  if (typeof record?.id === "string" && record.id) {
+    candidateKeys.push(record.id);
+    candidateKeys.push(publicAgentKey(record.id));
+    if (options?.userId) {
+      candidateKeys.push(ownedAgentKey(options.userId, record.id));
+    }
+  }
+  let matched = false;
+  let highestFavAt = null;
+  let highestFavTime = -1;
+  for (const key of candidateKeys) {
+    const val = favoritesMap instanceof Map ? favoritesMap.get(key) : favoritesMap[key];
+    if (val !== void 0 && val !== false && val !== null) {
+      const favAt = val === true ? 1 : safeTimestamp(val);
+      if (favAt === null) continue;
+      matched = true;
+      const time = parseTimestamp(favAt);
+      if (time > highestFavTime) {
+        highestFavTime = time;
+        highestFavAt = favAt;
+      }
+    }
+  }
+  if (matched) {
+    return {
+      isFavorite: true,
+      favoritedAt: highestFavAt ?? 1
+    };
+  }
+  return { isFavorite: false, favoritedAt: null };
+}
+function toSafeAgentSummary(record, options) {
+  const rawId = parseAgentRecordId(
+    typeof record?.privateKey === "string" ? record.privateKey : record?.dbKey,
+    typeof record?.id === "string" ? record.id : void 0
+  );
+  const id = rawId ?? (typeof record?.id === "string" ? record.id : null);
+  const publicRecordDenied = record?.publicRecordExists === false || options?.publicRecordExists === false;
+  const publicRecordConfirmed = record?.publicRecordExists === true || options?.publicRecordExists === true;
+  let publicKey;
+  if (typeof record?.publicKey === "string" && record.publicKey && !publicRecordDenied) {
+    publicKey = record.publicKey;
+  } else if (publicRecordConfirmed && id) {
+    publicKey = publicAgentKey(id);
+  }
+  const name = typeof record?.name === "string" && record.name ? record.name : "(unnamed)";
+  const handle = typeof record?.handle === "string" && record.handle ? record.handle : null;
+  const introduction = typeof record?.introduction === "string" && record.introduction ? record.introduction : typeof record?.description === "string" && record.description ? record.description : null;
+  const model = typeof record?.model === "string" && record.model ? record.model : null;
+  const provider = typeof record?.provider === "string" && record.provider ? record.provider : typeof record?.apiSource === "string" && record.apiSource ? record.apiSource : null;
+  const apiSource = typeof record?.apiSource === "string" && record.apiSource ? record.apiSource : null;
+  const cliProvider = typeof record?.cliProvider === "string" && record.cliProvider ? record.cliProvider : null;
+  const tools = Array.isArray(record?.tools) ? record.tools.filter((t) => typeof t === "string") : [];
+  const inputPrice = typeof record?.inputPrice === "number" && Number.isFinite(record.inputPrice) ? record.inputPrice : null;
+  const outputPrice = typeof record?.outputPrice === "number" && Number.isFinite(record.outputPrice) ? record.outputPrice : null;
+  const modelAbility = model ? getModelAbility(model) ?? null : null;
+  const favStatus = resolveFavoriteStatus(record, options);
+  const isPublic = record?.isPublic === true || record?.isPublicFlag === true || record?.publicRecordExists === true;
+  const updatedAt = safeTimestamp(record?.updatedAt ?? record?.createdAt ?? record?.created);
+  const nextAvailableAt = typeof record?.nextAvailableAt === "number" && Number.isFinite(record.nextAvailableAt) ? record.nextAvailableAt : void 0;
+  const currentUserId = options?.userId;
+  const isOwnedByRecord = Boolean(currentUserId) && (typeof record?.userId === "string" && record.userId === currentUserId || typeof record?.ownerId === "string" && record.ownerId === currentUserId);
+  const ownedKey = currentUserId ? [record?.dbKey, record?.privateKey].find(
+    (key) => isOwnedAgentKey(key, currentUserId)
+  ) : void 0;
+  const isOwned = isOwnedByRecord || Boolean(ownedKey);
+  const isOAuth = isOAuthApiKeyRef(record?.apiKeyRef);
+  const billingSource = resolveBillingSource({
+    ...record,
+    isOAuth,
+    isOwned,
+    apiSource,
+    cliProvider,
+    provider,
+    isPublic
+  });
+  const economics = resolveEconomicsSnapshot(
+    {
+      provider,
+      apiSource,
+      customProviderUrl: typeof record?.customProviderUrl === "string" ? record.customProviderUrl : null
+    },
+    options?.now ?? Date.now()
+  );
+  let agentKey;
+  if (currentUserId) {
+    if (isOwned) {
+      agentKey = ownedKey ?? (id ? ownedAgentKey(currentUserId, id) : void 0);
+    } else if (publicKey) {
+      agentKey = publicKey;
+    }
+  }
+  return {
+    id,
+    ...agentKey !== void 0 ? { agentKey } : {},
+    ...publicKey !== void 0 ? { publicKey } : {},
+    name,
+    handle,
+    introduction,
+    model,
+    provider,
+    apiSource,
+    cliProvider,
+    billingSource,
+    tools,
+    inputPrice,
+    outputPrice,
+    modelAbility,
+    isFavorite: favStatus.isFavorite,
+    favoritedAt: favStatus.favoritedAt,
+    isPublic,
+    ...economics ? { economics } : {},
+    isOwned,
+    isOAuth,
+    ...nextAvailableAt !== void 0 ? { nextAvailableAt } : {},
+    updatedAt
+  };
+}
+function sortSafeAgentSummaries(agents) {
+  return [...agents].sort(compareAgentSelection);
+}
+var COMPACT_AGENT_SUMMARY_FIELDS = [
+  "agentKey",
+  "name",
+  "model",
+  "provider",
+  "apiSource",
+  "billingSource",
+  "isFavorite",
+  "isOAuth",
+  "isOwned",
+  "isPublic",
+  "tools",
+  // Phase 2A economics 快照（period/multipliers/changesAt 等小对象）。
+  // 只对 DeepSeek API / BigModel GLM Coding Plan 存在；不含完整 policy/windows。
+  "economics",
+  // 仅限流中的 agent 才会带（可用 agent 上不存在）。对"现在能不能选它"是
+  // 决策信息（CLI --show-unavailable 场景）；默认列表已把这类 agent 过滤掉，
+  // 所以通常根本不占字节。
+  "nextAvailableAt"
+];
+function omitNullishAgentSummaryFields(summary) {
+  const result = {};
+  for (const [key, value] of Object.entries(summary)) {
+    if (value !== null && value !== void 0) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+function toCompactAgentSummary(summary) {
+  const compact = {};
+  for (const field of COMPACT_AGENT_SUMMARY_FIELDS) {
+    const value = summary[field];
+    if (value !== null && value !== void 0) {
+      compact[field] = value;
+    }
+  }
+  return compact;
+}
+var UNAVAILABLE_AGENT_SUMMARY_FIELDS = [
+  "agentKey",
+  "name",
+  "model",
+  "provider",
+  "apiSource",
+  "isFavorite",
+  "isOAuth",
+  "isOwned",
+  "nextAvailableAt",
+  "favoritedAt",
+  "updatedAt"
+];
+function toUnavailableAgentSummary(summary) {
+  const item = {
+    name: summary.name,
+    isFavorite: summary.isFavorite,
+    isOAuth: summary.isOAuth,
+    isOwned: summary.isOwned
+  };
+  for (const field of UNAVAILABLE_AGENT_SUMMARY_FIELDS) {
+    const value = summary[field];
+    if (value !== null && value !== void 0) {
+      item[field] = value;
+    }
+  }
+  return item;
+}
+
+export {
+  toSafeAgentSummary,
+  sortSafeAgentSummaries,
+  omitNullishAgentSummaryFields,
+  toCompactAgentSummary,
+  toUnavailableAgentSummary
+};

package/{chunk-CS6TCJ7E.js → chunk-3JQ2NRYU.js}

@@ -1,6 +1,8 @@
 import {
-  getCredentialsDir
-} from "./chunk-FD36SCCD.js";
+  getCredentialsDir,
+  getLegacyCredentialPath,
+  migrateLegacyCredentialFile
+} from "./chunk-ONXOABJR.js";
 import {
   asNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
@@ -23,6 +25,7 @@ import {
   unlinkSync,
   writeFileSync
 } from "node:fs";
+import { homedir } from "node:os";
 import { join } from "node:path";
 
 // packages/agent-runtime/credentialBroker.ts
@@ -65,7 +68,26 @@ function writePrivateFile(path, body) {
   } catch {
   }
 }
-function readApiKeyCredential(ref, homeDir) {
+function migrateApiKeyCredentialIfNeeded(ref, homeDir, migration) {
+  if (homeDir !== void 0 || !migration?.enableLegacyMigration) return;
+  const legacyHomeDir = migration.legacyHomeDir ?? homedir();
+  const relativePath = join("keys", credentialRefToFileName(ref));
+  migrateLegacyCredentialFile({
+    canonicalPath: getApiKeyCredentialPath(ref),
+    legacyPath: getLegacyCredentialPath(relativePath, legacyHomeDir),
+    mode: migration.mode ?? (migration.legacyHomeDir ? "test" : "production"),
+    isValid: (raw) => {
+      try {
+        const parsed = JSON.parse(raw);
+        return typeof parsed?.secret === "string" && Boolean(parsed.secret);
+      } catch {
+        return false;
+      }
+    }
+  });
+}
+function readApiKeyCredential(ref, homeDir, migration) {
+  migrateApiKeyCredentialIfNeeded(ref, homeDir, migration);
   const path = getApiKeyCredentialPath(ref, homeDir);
   if (!existsSync(path)) return null;
   try {
@@ -99,15 +121,16 @@ function removeApiKeyCredential(ref, homeDir) {
   if (!existsSync(path)) return;
   unlinkSync(path);
 }
-function hasApiKeyCredential(ref, homeDir) {
-  return readApiKeyCredential(ref, homeDir) !== null;
+function hasApiKeyCredential(ref, homeDir, migration) {
+  return readApiKeyCredential(ref, homeDir, migration) !== null;
 }
 function createFileCredentialBroker(options = {}) {
   const homeDir = options.homeDir;
+  const migration = options.migration;
   const now = options.now ?? Date.now;
   return {
     get(ref) {
-      return readApiKeyCredential(ref, homeDir);
+      return readApiKeyCredential(ref, homeDir, migration);
     },
     put(ref, secret) {
       writeApiKeyCredential(ref, secret, homeDir, now());
@@ -116,7 +139,7 @@ function createFileCredentialBroker(options = {}) {
       removeApiKeyCredential(ref, homeDir);
     },
     has(ref) {
-      return hasApiKeyCredential(ref, homeDir);
+      return hasApiKeyCredential(ref, homeDir, migration);
     }
   };
 }

package/{chunk-3LKZRP7E.js → chunk-3QGUVVX5.js}

@@ -6,10 +6,10 @@ import {
 } from "./chunk-AGGIDPCZ.js";
 import {
   getModelConfig
-} from "./chunk-SVDMVX4G.js";
+} from "./chunk-MMZ6ZTVO.js";
 import {
   isPlatformHostedImageModel
-} from "./chunk-HPW5MNDQ.js";
+} from "./chunk-22BTGNSP.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-SSXTSPSG.js → chunk-45YO6H7P.js}

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-KXKQO4Q6.js";
+} from "./chunk-NTW5GWDM.js";
 import {
   isCompiledBinary,
   resolveCliEntrypointPath
@@ -335,12 +335,6 @@ async function popQueueMessages(queuePath, depsOrFs = {}) {
   const entries = await popAllQueueEntries(queuePath, depsOrFs);
   return entries.map((e) => e.text);
 }
-function resolveRunReportPath(runId, env, homedir = nodeHomedir) {
-  return join(resolveRunsDir(env, homedir), `${runId}.report.md`);
-}
-function resolveRunReportJsonPath(runId, env, homedir = nodeHomedir) {
-  return join(resolveRunsDir(env, homedir), `${runId}.report.json`);
-}
 function defaultGenerateRunId() {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const random = Math.random().toString(36).slice(2, 8);
@@ -602,8 +596,6 @@ async function gcRunRecords(deps = {}, options = {}) {
     const jsonPath = resolveRunRecordPath(record.runId, deps.env, deps.homedir);
     const logPath = resolveRunLogPath(record.runId, deps.env, deps.homedir);
     const queuePath = record.queuePath ?? resolveRunQueuePath(record.runId, deps.env, deps.homedir);
-    const reportPath = resolveRunReportPath(record.runId, deps.env, deps.homedir);
-    const reportJsonPath = resolveRunReportJsonPath(record.runId, deps.env, deps.homedir);
     const msgPath = record.msgFile ?? join(resolveRunsDir(deps.env, deps.homedir), `${record.runId}.msg.md`);
     const logOk = tryUnlinkFile(fs, logPath);
     const msgOk = tryUnlinkFile(fs, msgPath);
@@ -617,8 +609,9 @@ async function gcRunRecords(deps = {}, options = {}) {
         queueOk = false;
       }
     }
-    tryUnlinkFile(fs, reportPath);
-    tryUnlinkFile(fs, reportJsonPath);
+    const runsDirForLegacy = resolveRunsDir(deps.env, deps.homedir);
+    tryUnlinkFile(fs, join(runsDirForLegacy, `${record.runId}.report.md`));
+    tryUnlinkFile(fs, join(runsDirForLegacy, `${record.runId}.report.json`));
     if (!logOk || !msgOk || !queueOk) {
       failedIds.push(record.runId);
       continue;
@@ -897,21 +890,60 @@ function releaseRunRecordAck(runId, token, deps = {}) {
     writeRunRecord(record, deps);
   });
 }
-function finalizeRunRecord(runId, update, deps = {}) {
-  withRunRecordLock(runId, deps, () => {
-    const record = readRunRecord(runId, deps);
-    if (!record) return;
+function transitionRunToTerminal(runId, update, deps = {}, options = {}) {
+  const settled = withRunRecordLock(runId, deps, () => {
+    const record2 = readRunRecord(runId, deps);
+    if (!record2) return { kind: "not_found" };
+    const orphanCorrection = options.allowOverOrphaned === true && record2.status === "orphaned" && (update.status === "done" || update.status === "failed");
+    if (isAgentRunTerminalStatus(record2.status) && !orphanCorrection) {
+      return { kind: "kept", record: record2 };
+    }
     const now = deps.now ?? (() => /* @__PURE__ */ new Date());
-    record.status = update.status;
-    if (typeof update.exitCode === "number") record.exitCode = update.exitCode;
-    if (update.dialogId) record.dialogId = update.dialogId;
+    record2.status = update.status;
+    if (typeof update.exitCode === "number") record2.exitCode = update.exitCode;
+    if (update.dialogId) record2.dialogId = update.dialogId;
     if (typeof update.credits === "number" && Number.isFinite(update.credits)) {
-      record.credits = update.credits;
+      record2.credits = update.credits;
     }
-    record.endedAt = now().toISOString();
-    if (record.note?.startsWith("orphaned:")) record.note = void 0;
-    writeRunRecord(record, deps);
-  });
+    if (update.dodResults && update.dodResults.length > 0) {
+      record2.dodResults = update.dodResults;
+    }
+    record2.endedAt = now().toISOString();
+    if (typeof update.note === "string" && update.note.trim()) {
+      record2.note = update.note.trim();
+    }
+    if (record2.note?.startsWith("orphaned:")) record2.note = void 0;
+    writeRunRecord(record2, deps);
+    return { kind: "transitioned", record: record2 };
+  }, { strict: true });
+  if (settled !== void 0) return settled;
+  const record = readRunRecord(runId, deps);
+  if (!record) return { kind: "not_found" };
+  if (isAgentRunTerminalStatus(record.status)) return { kind: "kept", record };
+  return { kind: "contended", record };
+}
+var AUTHORITATIVE_SETTLE_MAX_ATTEMPTS = 4;
+var AUTHORITATIVE_SETTLE_RETRY_DELAY_MS = 15;
+async function settleRunTerminalAuthoritatively(runId, update, deps = {}, transition = transitionRunToTerminal) {
+  const attempt = () => transition(runId, update, deps, { allowOverOrphaned: true });
+  let result = attempt();
+  for (let attemptNo = 1; result?.kind === "contended" && attemptNo < AUTHORITATIVE_SETTLE_MAX_ATTEMPTS; attemptNo += 1) {
+    await (deps.sleep ?? defaultSleep)(AUTHORITATIVE_SETTLE_RETRY_DELAY_MS);
+    result = attempt();
+  }
+  if (result?.kind === "contended") {
+    console.error(
+      `[nolo] authoritative settlement for run ${runId} lost the record lock ${AUTHORITATIVE_SETTLE_MAX_ATTEMPTS} times; durable record still ${result.record.status} \u2014 terminal status pending reconcile, child outcome (exitCode/dialogId/credits/DoD) may be lost`
+    );
+  } else if (result?.kind === "kept" && result.record.status !== update.status) {
+    console.warn(
+      `[nolo] run ${runId} already terminal (${result.record.status}); keeping the durable outcome over intended ${update.status}`
+    );
+  }
+  return result ?? { kind: "not_found" };
+}
+function finalizeRunRecord(runId, update, deps = {}) {
+  transitionRunToTerminal(runId, update, deps);
 }
 function isPidGone(pid, deps = {}) {
   const kill = deps.kill ?? ((p, s) => process.kill(p, s));
@@ -1349,12 +1381,18 @@ async function runSignalCommand(args, signal, verb, deps) {
 `);
     return 1;
   }
-  if (typeof record.pid !== "number") {
-    deps.output.write(`Run has no pid: ${record.runId}
+  const reconciled = checkStaleRun(record.runId, deps) ?? record;
+  if (isAgentRunTerminalStatus(reconciled.status)) {
+    deps.output.write(`Run ${reconciled.runId} is already ${reconciled.status}.
+`);
+    return 0;
+  }
+  if (typeof reconciled.pid !== "number") {
+    deps.output.write(`Run has no pid: ${reconciled.runId}
 `);
     return 1;
   }
-  const confirmed = await terminateRunProcess(record, signal, deps);
+  const confirmed = await terminateRunProcess(reconciled, signal, deps);
   if (!confirmed) {
     deps.output.write(
       `Failed to ${verb} ${record.runId} (pid ${record.pid}): process still alive after SIGKILL.
@@ -1362,9 +1400,10 @@ async function runSignalCommand(args, signal, verb, deps) {
     );
     return 1;
   }
-  finalizeRunRecord(record.runId, { status: "killed" }, deps);
+  const transition = transitionRunToTerminal(reconciled.runId, { status: "killed" }, deps);
   deps.output.write(
-    `Stopped ${record.runId} (pid ${record.pid}): process group confirmed gone.
+    transition.kind === "contended" ? `Stopped ${reconciled.runId} (pid ${reconciled.pid}): process group confirmed gone; terminal status pending reconcile.
+` : `Stopped ${reconciled.runId} (pid ${reconciled.pid}): process group confirmed gone.
 `
   );
   return 0;
@@ -1404,8 +1443,6 @@ export {
   popAllQueueEntries,
   popSingleQueueMessage,
   popQueueMessages,
-  resolveRunReportPath,
-  resolveRunReportJsonPath,
   defaultGenerateRunId,
   defaultGenerateBatchId,
   writeRunRecord,
@@ -1432,6 +1469,10 @@ export {
   claimRunRecord,
   commitRunRecordClaim,
   releaseRunRecordAck,
+  transitionRunToTerminal,
+  AUTHORITATIVE_SETTLE_MAX_ATTEMPTS,
+  AUTHORITATIVE_SETTLE_RETRY_DELAY_MS,
+  settleRunTerminalAuthoritatively,
   finalizeRunRecord,
   isPidGone,
   defaultGetProcessStartTime,