@narumitw/pi-sync 0.54.2 → 0.56.0

package/dist/chunks/{chunk-VHXBCEVF.ts → chunk-EUMINX7L.ts}

@@ -3,17 +3,17 @@
 import {
   runCancellableOperation,
   showRemoteSelectionReview
-} from "./chunk-5ZWQ33XL.ts";
+} from "./chunk-JJTARUSO.ts";
 import {
   safeTerminalText
 } from "./chunk-AMJRUXFT.ts";
-import {
-  loadConfig,
-  syncConfigReviewIdentity
-} from "./chunk-3B4Z2SKV.ts";
 import {
   errorMessage
 } from "./chunk-7D5SF7P3.ts";
+import {
+  loadConfig,
+  syncConfigReviewIdentity
+} from "./chunk-QO333NM4.ts";
 
 // src/ui/sync-resolution-ui.ts
 import { defineMenu, runMenu } from "@narumitw/pi-tui-kit";
@@ -206,4 +206,4 @@ async function dispatchManagerResult(ctx, initialResult, origin, runRoute, signa
 export {
   dispatchManagerResult
 };
-//# sourceMappingURL=chunk-VHXBCEVF.ts.map
+//# sourceMappingURL=chunk-EUMINX7L.ts.map

package/dist/chunks/chunk-FQOSHGJ7.ts

@@ -0,0 +1,215 @@
+// @generated by scripts/build-runtime.mjs; do not edit.
+// @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
+import {
+  COUPLED_FIELDS,
+  mergeSettingsJson,
+  snapshotFile
+} from "./chunk-5Q5SSKNG.ts";
+import {
+  scanSnapshot
+} from "./chunk-QOFMXPM5.ts";
+import {
+  edits,
+  isMergeTextPath,
+  lines,
+  text
+} from "./chunk-IWZH5KYS.ts";
+import {
+  parseJsonObjectDocument,
+  parseSettingsDocument
+} from "./chunk-ZW5ZLGBI.ts";
+import {
+  AGENT_INPUT_BYTES,
+  AGENT_MAX_UNITS,
+  AGENT_OUTPUT_BYTES
+} from "./chunk-PRUEIIK7.ts";
+
+// src/sync/agent-candidate.ts
+import { createHash } from "node:crypto";
+var digest = (value) => createHash("sha256").update(JSON.stringify(value)).digest("hex");
+function overlaps(a, b) {
+  return a.start === a.end || b.start === b.end ? a.start <= b.end && b.start <= a.end : a.start < b.end && b.start < a.end;
+}
+function textParts(filePath, baseText, localText, remoteText) {
+  const base = lines(baseText);
+  const changes = [
+    ...edits(base, lines(localText)).map((hunk) => ({ ...hunk, side: "local" })),
+    ...edits(base, lines(remoteText)).map((hunk) => ({ ...hunk, side: "remote" }))
+  ].sort((a, b) => a.start - b.start || a.end - b.end);
+  const clusters = [];
+  for (const change of changes) {
+    const last = clusters.at(-1);
+    if (last?.some((item) => overlaps(item, change))) last.push(change);
+    else clusters.push([change]);
+  }
+  const result = [];
+  let cursor = 0;
+  for (const cluster of clusters) {
+    const start = Math.min(...cluster.map((item) => item.start));
+    const end = Math.max(...cluster.map((item) => item.end));
+    result.push(base.slice(cursor, start).join(""));
+    const image = (side) => {
+      let position = start;
+      const output = [];
+      for (const hunk of cluster.filter((item) => item.side === side)) {
+        output.push(...base.slice(position, hunk.start), ...hunk.lines);
+        position = hunk.end;
+      }
+      return [...output, ...base.slice(position, end)].join("");
+    };
+    const local = image("local");
+    const remote = image("remote");
+    const original = base.slice(start, end).join("");
+    if (local === remote || local === original || remote === original) result.push(local === original ? remote : local);
+    else result.push({ id: "", path: filePath, kind: "text", base: original, local, remote });
+    cursor = end;
+  }
+  result.push(base.slice(cursor).join(""));
+  return result;
+}
+function buildAgentEvidence(plan, local, remote, ancestors) {
+  const evidence = { units: [], files: [], unsupported: [] };
+  if (plan.kind !== "planned") return evidence;
+  if (plan.conflicts.length > AGENT_MAX_UNITS)
+    throw new Error("Agent mode paused: too many conflict paths for bounded analysis.");
+  for (const conflict of plan.conflicts) {
+    try {
+      if (conflict.reason !== "both-changed") throw new Error("unsupported conflict");
+      const versions = [ancestors, local.files, remote.files].map((files) => {
+        const file2 = files.find((item) => item.path === conflict.path);
+        if (!file2) throw new Error("missing ancestor/version");
+        const bytes = Buffer.from(file2.contentBase64, "base64");
+        if (bytes.length > 8192) throw new Error("file bound");
+        return text(bytes);
+      });
+      const [base, left, right] = versions;
+      const file = { path: conflict.path, base, local: left, remote: right };
+      let units;
+      if (conflict.path === "settings.json") {
+        const documents = versions.map((value) => parseSettingsDocument(Buffer.from(value)));
+        const merge = mergeSettingsJson(...versions.map((value) => Buffer.from(value)));
+        if (merge.kind !== "review" || merge.reason !== "field-conflict") throw new Error("unsupported settings");
+        const fields = new Set(merge.fields);
+        const groups = COUPLED_FIELDS.map((group) => [...group]);
+        const coupled = new Set(groups.flat());
+        groups.push(...[...fields].filter((key) => !coupled.has(key)).map((key) => [key]));
+        file.fields = [];
+        units = groups.filter((group) => group.some((key) => fields.has(key))).map((group) => {
+          const values = documents.map(
+            (document) => JSON.stringify(
+              Object.fromEntries(
+                group.flatMap((key) => {
+                  const node = document.root.members.get(key)?.node;
+                  return node ? [[key, node.value]] : [];
+                })
+              )
+            )
+          );
+          const unit = {
+            id: "",
+            path: file.path,
+            kind: "settings",
+            base: values[0] ?? "{}",
+            local: values[1] ?? "{}",
+            remote: values[2] ?? "{}"
+          };
+          file.fields?.push({ id: String(evidence.units.length + file.fields.length), key: group[0] ?? "" });
+          return unit;
+        });
+      } else {
+        if (!isMergeTextPath(conflict.path)) throw new Error("unsupported path");
+        file.parts = textParts(file.path, base, left, right);
+        units = file.parts.filter((part) => typeof part !== "string");
+      }
+      for (const unit of units) {
+        unit.id = String(evidence.units.length);
+        evidence.units.push(unit);
+      }
+      evidence.files.push(file);
+    } catch {
+      evidence.unsupported.push(conflict.path);
+    }
+  }
+  if (evidence.units.length > AGENT_MAX_UNITS || Buffer.byteLength(JSON.stringify(evidence.units)) > AGENT_INPUT_BYTES)
+    throw new Error("Agent mode paused: conflict evidence exceeds its input bound.");
+  if (scanSnapshot({
+    ...local,
+    files: evidence.units.flatMap(
+      (unit) => [unit.path, unit.base, unit.local, unit.remote].map((value) => snapshotFile(unit.path, Buffer.from(value)))
+    )
+  }).length)
+    throw new Error("Agent mode paused: possible secrets in model evidence; nothing was disclosed.");
+  return evidence;
+}
+function parseAgentCandidate(raw, evidence) {
+  if (Buffer.byteLength(raw) > AGENT_OUTPUT_BYTES) throw new Error("Agent output exceeds its bound.");
+  const parsed = parseJsonObjectDocument(Buffer.from(raw)).root.value;
+  if (Object.keys(parsed).sort().join(",") !== "results,version" || parsed.version !== 1 || !Array.isArray(parsed.results) || parsed.results.length !== evidence.units.length)
+    throw new Error("Invalid agent candidate contract.");
+  const seen = /* @__PURE__ */ new Set();
+  for (const result of parsed.results) {
+    if (!result || typeof result !== "object" || Array.isArray(result)) throw new Error("Invalid agent result.");
+    const row = result;
+    const unit = evidence.units.find((unit2) => unit2.id === row.id);
+    if (!unit || seen.has(unit.id)) throw new Error("Unowned or duplicate agent unit.");
+    seen.add(unit.id);
+    const keys = Object.keys(row).sort().join(",");
+    if (keys === "id,refuse" && row.refuse === true) continue;
+    if (unit.kind === "settings" && keys === "id,source" && (row.source === "local" || row.source === "remote"))
+      continue;
+    if (unit.kind === "text" && keys === "content,id" && typeof row.content === "string" && row.content.length > 0) {
+      text(Buffer.from(row.content));
+      if (/^(?:<{7}|={7}|>{7}|\|{7})/mu.test(row.content)) throw new Error("Unresolved conflict markers.");
+      continue;
+    }
+    throw new Error("Unsupported agent action.");
+  }
+  return parsed;
+}
+function applyAgentCandidate(plan, evidence, candidate) {
+  parseAgentCandidate(JSON.stringify(candidate), evidence);
+  if (plan.kind !== "planned") throw new Error("Unverified merge plan.");
+  const results = new Map(candidate.results.map((row) => [row.id, row]));
+  const replacements = /* @__PURE__ */ new Map();
+  for (const file of evidence.files) {
+    const units = evidence.units.filter((unit) => unit.path === file.path);
+    if (units.some((unit) => results.get(unit.id) && "refuse" in (results.get(unit.id) ?? {}))) continue;
+    let bytes;
+    if (file.parts) {
+      bytes = Buffer.from(
+        file.parts.map((part) => typeof part === "string" ? part : results.get(part.id).content).join("")
+      );
+    } else {
+      const selections = new Map(
+        (file.fields ?? []).map(({ id, key }) => [key, results.get(id).source])
+      );
+      const merged = mergeSettingsJson(
+        Buffer.from(file.base),
+        Buffer.from(file.local),
+        Buffer.from(file.remote),
+        selections
+      );
+      if (merged.kind !== "merged") throw new Error("Agent settings units remain unresolved.");
+      parseSettingsDocument(merged.content);
+      for (const { key } of file.fields ?? []) {
+        if (!selections.has(key)) throw new Error("Missing atomic settings selection.");
+      }
+      bytes = merged.content;
+    }
+    if (bytes.length > AGENT_OUTPUT_BYTES) throw new Error("Agent file exceeds output bound.");
+    replacements.set(file.path, snapshotFile(file.path, bytes));
+  }
+  const decisions = plan.decisions.map((decision) => {
+    const file = replacements.get(decision.path);
+    return file && decision.kind === "conflict" ? { kind: "accepted", path: file.path, source: "merged", file } : decision;
+  });
+  return { kind: "planned", decisions, conflicts: decisions.filter((item) => item.kind === "conflict") };
+}
+
+export {
+  digest,
+  buildAgentEvidence,
+  parseAgentCandidate,
+  applyAgentCandidate
+};
+//# sourceMappingURL=chunk-FQOSHGJ7.ts.map

package/dist/chunks/chunk-FQOSHGJ7.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/agent-candidate.ts"],
+  "sourcesContent": ["import { createHash } from \"node:crypto\";\nimport { scanSnapshot } from \"../snapshot/snapshot.js\";\nimport type { Snapshot, SnapshotFile } from \"../snapshot/snapshot-types.js\";\nimport { AGENT_INPUT_BYTES, AGENT_MAX_UNITS, AGENT_OUTPUT_BYTES } from \"./agent-policy.js\";\nimport { snapshotFile } from \"./content-conflicts.js\";\nimport type { FileMergePlan } from \"./file-merge-planner.js\";\nimport { parseJsonObjectDocument, parseSettingsDocument } from \"./json-document.js\";\nimport { COUPLED_FIELDS, mergeSettingsJson } from \"./settings-merge.js\";\nimport { edits, type Hunk, isMergeTextPath, lines, text } from \"./text-merge.js\";\n\nexport interface AgentUnit {\n  id: string;\n  path: string;\n  kind: \"text\" | \"settings\";\n  base: string;\n  local: string;\n  remote: string;\n}\ninterface CandidateFile {\n  path: string;\n  base: string;\n  local: string;\n  remote: string;\n  parts?: (string | AgentUnit)[];\n  fields?: { id: string; key: string }[];\n}\nexport interface AgentEvidence {\n  units: AgentUnit[];\n  files: CandidateFile[];\n  unsupported: string[];\n}\nexport interface AgentCandidate {\n  version: 1;\n  results: (\n    | { id: string; content: string }\n    | { id: string; source: \"local\" | \"remote\" }\n    | { id: string; refuse: true }\n  )[];\n}\nexport const digest = (value: unknown) => createHash(\"sha256\").update(JSON.stringify(value)).digest(\"hex\");\n\nfunction overlaps(a: Hunk, b: Hunk) {\n  return a.start === a.end || b.start === b.end\n    ? a.start <= b.end && b.start <= a.end\n    : a.start < b.end && b.start < a.end;\n}\n\n/** Only overlapping edit regions are model-writable; all other bytes are assembled by code. */\nfunction textParts(filePath: string, baseText: string, localText: string, remoteText: string): (string | AgentUnit)[] {\n  const base = lines(baseText);\n  const changes = [\n    ...edits(base, lines(localText)).map((hunk) => ({ ...hunk, side: \"local\" as const })),\n    ...edits(base, lines(remoteText)).map((hunk) => ({ ...hunk, side: \"remote\" as const })),\n  ].sort((a, b) => a.start - b.start || a.end - b.end);\n  const clusters: (typeof changes)[] = [];\n  for (const change of changes) {\n    const last = clusters.at(-1);\n    if (last?.some((item) => overlaps(item, change))) last.push(change);\n    else clusters.push([change]);\n  }\n  const result: (string | AgentUnit)[] = [];\n  let cursor = 0;\n  for (const cluster of clusters) {\n    const start = Math.min(...cluster.map((item) => item.start));\n    const end = Math.max(...cluster.map((item) => item.end));\n    result.push(base.slice(cursor, start).join(\"\"));\n    const image = (side: \"local\" | \"remote\") => {\n      let position = start;\n      const output: string[] = [];\n      for (const hunk of cluster.filter((item) => item.side === side)) {\n        output.push(...base.slice(position, hunk.start), ...hunk.lines);\n        position = hunk.end;\n      }\n      return [...output, ...base.slice(position, end)].join(\"\");\n    };\n    const local = image(\"local\");\n    const remote = image(\"remote\");\n    const original = base.slice(start, end).join(\"\");\n    if (local === remote || local === original || remote === original) result.push(local === original ? remote : local);\n    else result.push({ id: \"\", path: filePath, kind: \"text\", base: original, local, remote });\n    cursor = end;\n  }\n  result.push(base.slice(cursor).join(\"\"));\n  return result;\n}\n\nexport function buildAgentEvidence(\n  plan: FileMergePlan,\n  local: Snapshot,\n  remote: Snapshot,\n  ancestors: SnapshotFile[],\n): AgentEvidence {\n  const evidence: AgentEvidence = { units: [], files: [], unsupported: [] };\n  if (plan.kind !== \"planned\") return evidence;\n  if (plan.conflicts.length > AGENT_MAX_UNITS)\n    throw new Error(\"Agent mode paused: too many conflict paths for bounded analysis.\");\n  for (const conflict of plan.conflicts) {\n    try {\n      if (conflict.reason !== \"both-changed\") throw new Error(\"unsupported conflict\");\n      const versions = [ancestors, local.files, remote.files].map((files) => {\n        const file = files.find((item) => item.path === conflict.path);\n        if (!file) throw new Error(\"missing ancestor/version\");\n        const bytes = Buffer.from(file.contentBase64, \"base64\");\n        if (bytes.length > 8192) throw new Error(\"file bound\");\n        return text(bytes);\n      }) as [string, string, string];\n      const [base, left, right] = versions;\n      const file: CandidateFile = { path: conflict.path, base, local: left, remote: right };\n      let units: AgentUnit[];\n      if (conflict.path === \"settings.json\") {\n        const documents = versions.map((value) => parseSettingsDocument(Buffer.from(value)));\n        const merge = mergeSettingsJson(...(versions.map((value) => Buffer.from(value)) as [Buffer, Buffer, Buffer]));\n        if (merge.kind !== \"review\" || merge.reason !== \"field-conflict\") throw new Error(\"unsupported settings\");\n        const fields = new Set(merge.fields);\n        const groups = COUPLED_FIELDS.map((group) => [...group] as string[]);\n        const coupled = new Set(groups.flat());\n        groups.push(...[...fields].filter((key) => !coupled.has(key)).map((key) => [key]));\n        file.fields = [];\n        units = groups\n          .filter((group) => group.some((key) => fields.has(key)))\n          .map((group) => {\n            const values = documents.map((document) =>\n              JSON.stringify(\n                Object.fromEntries(\n                  group.flatMap((key) => {\n                    const node = document.root.members.get(key)?.node;\n                    return node ? [[key, node.value]] : [];\n                  }),\n                ),\n              ),\n            );\n            const unit: AgentUnit = {\n              id: \"\",\n              path: file.path,\n              kind: \"settings\",\n              base: values[0] ?? \"{}\",\n              local: values[1] ?? \"{}\",\n              remote: values[2] ?? \"{}\",\n            };\n            file.fields?.push({ id: String(evidence.units.length + file.fields.length), key: group[0] ?? \"\" });\n            return unit;\n          });\n      } else {\n        if (!isMergeTextPath(conflict.path)) throw new Error(\"unsupported path\");\n        file.parts = textParts(file.path, base, left, right);\n        units = file.parts.filter((part): part is AgentUnit => typeof part !== \"string\");\n      }\n      for (const unit of units) {\n        unit.id = String(evidence.units.length);\n        evidence.units.push(unit);\n      }\n      evidence.files.push(file);\n    } catch {\n      evidence.unsupported.push(conflict.path);\n    }\n  }\n  if (evidence.units.length > AGENT_MAX_UNITS || Buffer.byteLength(JSON.stringify(evidence.units)) > AGENT_INPUT_BYTES)\n    throw new Error(\"Agent mode paused: conflict evidence exceeds its input bound.\");\n  // Scan only the actual disclosure image; skipSecretScan never authorizes model disclosure.\n  if (\n    scanSnapshot({\n      ...local,\n      files: evidence.units.flatMap((unit) =>\n        [unit.path, unit.base, unit.local, unit.remote].map((value) => snapshotFile(unit.path, Buffer.from(value))),\n      ),\n    }).length\n  )\n    throw new Error(\"Agent mode paused: possible secrets in model evidence; nothing was disclosed.\");\n  return evidence;\n}\n\nexport function parseAgentCandidate(raw: string, evidence: AgentEvidence): AgentCandidate {\n  if (Buffer.byteLength(raw) > AGENT_OUTPUT_BYTES) throw new Error(\"Agent output exceeds its bound.\");\n  const parsed = parseJsonObjectDocument(Buffer.from(raw)).root.value as Record<string, unknown>;\n  if (\n    Object.keys(parsed).sort().join(\",\") !== \"results,version\" ||\n    parsed.version !== 1 ||\n    !Array.isArray(parsed.results) ||\n    parsed.results.length !== evidence.units.length\n  )\n    throw new Error(\"Invalid agent candidate contract.\");\n  const seen = new Set<string>();\n  for (const result of parsed.results) {\n    if (!result || typeof result !== \"object\" || Array.isArray(result)) throw new Error(\"Invalid agent result.\");\n    const row = result as Record<string, unknown>;\n    const unit = evidence.units.find((unit) => unit.id === row.id);\n    if (!unit || seen.has(unit.id)) throw new Error(\"Unowned or duplicate agent unit.\");\n    seen.add(unit.id);\n    const keys = Object.keys(row).sort().join(\",\");\n    if (keys === \"id,refuse\" && row.refuse === true) continue;\n    if (unit.kind === \"settings\" && keys === \"id,source\" && (row.source === \"local\" || row.source === \"remote\"))\n      continue;\n    if (unit.kind === \"text\" && keys === \"content,id\" && typeof row.content === \"string\" && row.content.length > 0) {\n      text(Buffer.from(row.content));\n      if (/^(?:<{7}|={7}|>{7}|\\|{7})/mu.test(row.content)) throw new Error(\"Unresolved conflict markers.\");\n      continue;\n    }\n    throw new Error(\"Unsupported agent action.\");\n  }\n  return parsed as unknown as AgentCandidate;\n}\n\nexport function applyAgentCandidate(\n  plan: FileMergePlan,\n  evidence: AgentEvidence,\n  candidate: AgentCandidate,\n): FileMergePlan {\n  // Persisted candidates cross a trust boundary too.\n  parseAgentCandidate(JSON.stringify(candidate), evidence);\n  if (plan.kind !== \"planned\") throw new Error(\"Unverified merge plan.\");\n  const results = new Map(candidate.results.map((row) => [row.id, row]));\n  const replacements = new Map<string, SnapshotFile>();\n  for (const file of evidence.files) {\n    const units = evidence.units.filter((unit) => unit.path === file.path);\n    if (units.some((unit) => results.get(unit.id) && \"refuse\" in (results.get(unit.id) ?? {}))) continue;\n    let bytes: Buffer;\n    if (file.parts) {\n      bytes = Buffer.from(\n        file.parts\n          .map((part) => (typeof part === \"string\" ? part : (results.get(part.id) as { content: string }).content))\n          .join(\"\"),\n      );\n    } else {\n      const selections = new Map(\n        (file.fields ?? []).map(({ id, key }) => [key, (results.get(id) as { source: \"local\" | \"remote\" }).source]),\n      );\n      const merged = mergeSettingsJson(\n        Buffer.from(file.base),\n        Buffer.from(file.local),\n        Buffer.from(file.remote),\n        selections,\n      );\n      if (merged.kind !== \"merged\") throw new Error(\"Agent settings units remain unresolved.\");\n      // The existing renderer/parser retains atomic values, unknown members and exact numeric policy.\n      parseSettingsDocument(merged.content);\n      for (const { key } of file.fields ?? []) {\n        if (!selections.has(key)) throw new Error(\"Missing atomic settings selection.\");\n      }\n      bytes = merged.content;\n    }\n    if (bytes.length > AGENT_OUTPUT_BYTES) throw new Error(\"Agent file exceeds output bound.\");\n    replacements.set(file.path, snapshotFile(file.path, bytes));\n  }\n  const decisions = plan.decisions.map((decision) => {\n    const file = replacements.get(decision.path);\n    return file && decision.kind === \"conflict\"\n      ? { kind: \"accepted\" as const, path: file.path, source: \"merged\" as const, file }\n      : decision;\n  });\n  return { kind: \"planned\", decisions, conflicts: decisions.filter((item) => item.kind === \"conflict\") };\n}\n"],
+  "mappings": "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",
+  "names": ["file", "unit"]
+}

package/dist/chunks/chunk-GNH73BJ5.ts

@@ -0,0 +1,153 @@
+// @generated by scripts/build-runtime.mjs; do not edit.
+// @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
+import {
+  fileHashMap,
+  sameHashes
+} from "./chunk-BDB4IDM3.ts";
+import {
+  portableSnapshot,
+  sameLocalFields,
+  validatePortableSnapshot,
+  validateSnapshotFieldPolicy
+} from "./chunk-A6HU4ERM.ts";
+import {
+  planFileMerge
+} from "./chunk-76NB4R7U.ts";
+import {
+  statePathForConfig,
+  syncStateFingerprint
+} from "./chunk-UPNVIUBN.ts";
+import {
+  readJsonIfExists,
+  syncDirectory,
+  writeJson
+} from "./chunk-HUZ5CR4W.ts";
+
+// src/sync/merge-journal.ts
+import { randomUUID } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+function mergeJournalIdentity(config, backendIdentity) {
+  return JSON.stringify([config.setupName, backendIdentity, [...config.include].sort(), config.localFields ?? null]);
+}
+function mergeJournalPath(config) {
+  return `${statePathForConfig(config)}.merge-journal.json`;
+}
+async function readMergeJournal(config) {
+  let journal;
+  try {
+    const stat = await fs.lstat(mergeJournalPath(config));
+    if (!stat.isFile() || stat.size > 384 * 1024 * 1024) throw new Error("Unsafe or oversized journal.");
+    journal = await readJsonIfExists(mergeJournalPath(config));
+  } catch (error) {
+    if (error.code === "ENOENT") return;
+    throw new Error("Cannot read the private merge journal; preserve it and review recovery.");
+  }
+  if (!journal) return;
+  if (journal.version !== 1 || typeof journal.identity !== "string" || typeof journal.backup !== "string" || typeof journal.stateIdentity !== "string" || journal.applyOnly !== void 0 && (journal.applyOnly !== true || !journal.committedHead || journal.committedHead.revision !== journal.expectedHead?.revision || journal.committedHead.snapshotId !== journal.expectedHead?.snapshotId || journal.upload?.id !== journal.expectedHead?.snapshotId) || journal.sessionRoot !== void 0 && (typeof journal.sessionRoot !== "string" || !path.isAbsolute(journal.sessionRoot) || path.resolve(journal.sessionRoot) !== journal.sessionRoot) || journal.warnings !== void 0 && (!Array.isArray(journal.warnings) || journal.warnings.length > 64 || journal.warnings.some((item) => typeof item !== "string")) || !journal.expectedHead || typeof journal.expectedHead.revision !== "string" || !journal.before || !journal.after || !journal.upload || !Array.isArray(journal.before.files) || !Array.isArray(journal.after.files) || !Array.isArray(journal.upload.files))
+    throw new Error("Unsupported or damaged merge journal; preserve it and review recovery before syncing.");
+  try {
+    const pinnedPaths = new Set(journal.progress?.groups.flatMap((group) => group.paths) ?? []);
+    for (const snapshot of [
+      journal.before,
+      journal.after,
+      journal.upload,
+      ...journal.accepted ? [journal.accepted] : []
+    ]) {
+      validateSnapshotFieldPolicy(snapshot);
+      if (snapshot.version !== 1 && snapshot.version !== 2 && snapshot.version !== 3 || typeof snapshot.id !== "string" || typeof snapshot.profile !== "string" || snapshot.files.length > 16384 || snapshot.files.reduce(
+        (bytes, file) => bytes + (typeof file?.contentBase64 === "string" ? file.contentBase64.length * 0.75 : Infinity),
+        0
+      ) > 64 * 1024 * 1024)
+        throw new Error("Invalid journal input.");
+      const plan = planFileMerge({ baseline: {}, local: snapshot.files, remote: [], selectionCompatible: true });
+      if (plan.kind !== "planned" || plan.conflicts.some((conflict) => conflict.reason !== "path-collision" || !pinnedPaths.has(conflict.path)))
+        throw new Error("Invalid journal collision group.");
+    }
+    validatePortableSnapshot(journal.upload);
+    if ((journal.upload.version === 2 || journal.upload.version === 3) && !journal.accepted)
+      throw new Error("Portable merge journal requires an explicit accepted projection.");
+    if (journal.accepted) validatePortableSnapshot(journal.accepted);
+  } catch {
+    throw new Error("Invalid merge journal paths, metadata, or bytes; preserve evidence for review.");
+  }
+  try {
+    if (journal.accepted && (!sameLocalFields(journal.accepted.localFields, journal.upload.localFields) || !sameHashes(
+      fileHashMap(portableSnapshot(journal.after, journal.upload.localFields)),
+      fileHashMap(portableSnapshot(journal.accepted, journal.upload.localFields))
+    )))
+      throw new Error("Projection mismatch.");
+  } catch {
+    throw new Error("Invalid accepted merge projection; preserve journal evidence.");
+  }
+  if (journal.progress) {
+    const known = /* @__PURE__ */ new Set([
+      ...Object.keys(journal.progress.previous?.lastFileHashes ?? {}),
+      ...[...journal.before.files, ...journal.after.files, ...journal.upload.files].map((file) => file.path)
+    ]);
+    const progress = journal.progress;
+    if (!config.partialSync || !progress.previous || syncStateFingerprint(progress.previous) !== journal.stateIdentity || !Array.isArray(progress.groups) || progress.groups.length > 16384 || progress.groups.some(
+      (group) => !Array.isArray(group.paths) || !group.paths.length || group.paths.length > 16384 || group.paths.some((filePath) => !known.has(filePath)) || !/^[a-f0-9-]{36}$/u.test(group.artifact)
+    ))
+      throw new Error("Invalid partial acceptance metadata; preserve journal evidence.");
+  }
+  if (journal.progress) {
+    const before = fileHashMap(journal.before);
+    const after = fileHashMap(journal.after);
+    const { readConflictArtifact } = await import("./conflict-artifacts-FXFIIBCB.ts");
+    const backendIdentity = JSON.parse(journal.identity)[1];
+    if (typeof backendIdentity !== "string") throw new Error("Invalid partial backend identity.");
+    const byArtifact = /* @__PURE__ */ new Map();
+    for (const group of journal.progress.groups) {
+      const groups = byArtifact.get(group.artifact) ?? [];
+      groups.push(group);
+      byArtifact.set(group.artifact, groups);
+    }
+    for (const [token, groups] of byArtifact) {
+      const artifact = await readConflictArtifact(config, backendIdentity, token);
+      const retainedGroups = new Set(artifact.groups.map((group) => JSON.stringify(group.paths)));
+      const remote = fileHashMap(artifact.remote);
+      const upload = fileHashMap(journal.upload);
+      for (const group of groups) {
+        if (!retainedGroups.has(JSON.stringify(group.paths)))
+          throw new Error("Partial group does not match retained artifact evidence.");
+        for (const filePath of group.paths)
+          if (before[filePath] !== after[filePath] || remote[filePath] !== upload[filePath] || journal.progress.previous.lastFileHashes[filePath] !== artifact.state.lastFileHashes[filePath])
+            throw new Error("Withheld version changed in journal; preserve evidence.");
+      }
+    }
+  }
+  return journal;
+}
+async function writeMergeJournal(config, journal) {
+  await writeJson(mergeJournalPath(config), journal, { maxBytes: 384 * 1024 * 1024 });
+}
+async function clearMergeJournal(config) {
+  await fs.rm(mergeJournalPath(config), { force: true });
+  await syncDirectory(path.dirname(mergeJournalPath(config)));
+}
+async function retireMergeJournal(config) {
+  if (!await readMergeJournal(config)) return;
+  const file = mergeJournalPath(config);
+  await fs.rename(file, `${file}.${randomUUID()}.resolved`);
+  await syncDirectory(path.dirname(file));
+}
+async function requireNoMergeJournal(config, options = {}) {
+  const journal = await readMergeJournal(config);
+  if (options.force || !journal) return;
+  if (journal) {
+    throw new Error(
+      "A merged transfer needs recovery. Run /sync sync to reconcile it. If newer local edits or remote revisions prevent recovery, review /sync diff and explicitly choose push --force or pull --force; the selected directional result will archive the old journal, not restore old bytes. Keep its backup; do not downgrade while recovery is pending."
+    );
+  }
+}
+
+export {
+  mergeJournalIdentity,
+  readMergeJournal,
+  writeMergeJournal,
+  clearMergeJournal,
+  retireMergeJournal,
+  requireNoMergeJournal
+};
+//# sourceMappingURL=chunk-GNH73BJ5.ts.map

package/dist/chunks/chunk-GNH73BJ5.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/merge-journal.ts"],
+  "sourcesContent": ["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { RemoteHead } from \"../backends/sync-backend.js\";\nimport type { AnySyncConfig } from \"../settings/settings-types.js\";\nimport type { Snapshot } from \"../snapshot/snapshot-types.js\";\nimport { readJsonIfExists, syncDirectory, writeJson } from \"../state/json-file.js\";\nimport { statePathForConfig, syncStateFingerprint } from \"../state/sync-state-store.js\";\nimport { planFileMerge } from \"./file-merge-planner.js\";\nimport {\n  portableSnapshot,\n  sameLocalFields,\n  validatePortableSnapshot,\n  validateSnapshotFieldPolicy,\n} from \"./local-fields.js\";\nimport type { PartialProgress } from \"./partial-progress.js\";\nimport { fileHashMap, sameHashes } from \"./sync-state.js\";\n\nexport interface MergeJournal {\n  version: 1;\n  identity: string;\n  before: Snapshot;\n  after: Snapshot;\n  accepted?: Snapshot;\n  progress?: PartialProgress;\n  upload: Snapshot;\n  expectedHead: RemoteHead;\n  committedHead?: RemoteHead;\n  /** No remote publication was attempted; a stale candidate can retire if local preimages remain intact. */\n  applyOnly?: boolean;\n  backup: string;\n  stateIdentity: string;\n  /** Effective collection/apply root; absent legacy evidence cannot authorize session recovery. */\n  sessionRoot?: string;\n  warnings?: string[];\n}\n\nexport function mergeJournalIdentity(config: AnySyncConfig, backendIdentity: string) {\n  return JSON.stringify([config.setupName, backendIdentity, [...config.include].sort(), config.localFields ?? null]);\n}\n\nexport function mergeJournalPath(config: AnySyncConfig) {\n  return `${statePathForConfig(config)}.merge-journal.json`;\n}\n\nexport async function readMergeJournal(config: AnySyncConfig): Promise<MergeJournal | undefined> {\n  let journal: MergeJournal | undefined;\n  try {\n    const stat = await fs.lstat(mergeJournalPath(config));\n    if (!stat.isFile() || stat.size > 384 * 1024 * 1024) throw new Error(\"Unsafe or oversized journal.\");\n    journal = await readJsonIfExists<MergeJournal>(mergeJournalPath(config));\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code === \"ENOENT\") return;\n    // A JSON parser error may quote sensitive journal contents; do not retain it in a public error.\n    throw new Error(\"Cannot read the private merge journal; preserve it and review recovery.\");\n  }\n  if (!journal) return;\n  if (\n    journal.version !== 1 ||\n    typeof journal.identity !== \"string\" ||\n    typeof journal.backup !== \"string\" ||\n    typeof journal.stateIdentity !== \"string\" ||\n    (journal.applyOnly !== undefined &&\n      (journal.applyOnly !== true ||\n        !journal.committedHead ||\n        journal.committedHead.revision !== journal.expectedHead?.revision ||\n        journal.committedHead.snapshotId !== journal.expectedHead?.snapshotId ||\n        journal.upload?.id !== journal.expectedHead?.snapshotId)) ||\n    (journal.sessionRoot !== undefined &&\n      (typeof journal.sessionRoot !== \"string\" ||\n        !path.isAbsolute(journal.sessionRoot) ||\n        path.resolve(journal.sessionRoot) !== journal.sessionRoot)) ||\n    (journal.warnings !== undefined &&\n      (!Array.isArray(journal.warnings) ||\n        journal.warnings.length > 64 ||\n        journal.warnings.some((item) => typeof item !== \"string\"))) ||\n    !journal.expectedHead ||\n    typeof journal.expectedHead.revision !== \"string\" ||\n    !journal.before ||\n    !journal.after ||\n    !journal.upload ||\n    !Array.isArray(journal.before.files) ||\n    !Array.isArray(journal.after.files) ||\n    !Array.isArray(journal.upload.files)\n  )\n    throw new Error(\"Unsupported or damaged merge journal; preserve it and review recovery before syncing.\");\n  // Verify every path and byte, including the unmanaged remote files retained for publication.\n  try {\n    const pinnedPaths = new Set(journal.progress?.groups.flatMap((group) => group.paths) ?? []);\n    for (const snapshot of [\n      journal.before,\n      journal.after,\n      journal.upload,\n      ...(journal.accepted ? [journal.accepted] : []),\n    ]) {\n      validateSnapshotFieldPolicy(snapshot);\n      if (\n        (snapshot.version !== 1 && snapshot.version !== 2 && snapshot.version !== 3) ||\n        typeof snapshot.id !== \"string\" ||\n        typeof snapshot.profile !== \"string\" ||\n        snapshot.files.length > 16_384 ||\n        snapshot.files.reduce(\n          (bytes, file) =>\n            bytes + (typeof file?.contentBase64 === \"string\" ? file.contentBase64.length * 0.75 : Infinity),\n          0,\n        ) >\n          64 * 1024 * 1024\n      )\n        throw new Error(\"Invalid journal input.\");\n      const plan = planFileMerge({ baseline: {}, local: snapshot.files, remote: [], selectionCompatible: true });\n      if (\n        plan.kind !== \"planned\" ||\n        plan.conflicts.some((conflict) => conflict.reason !== \"path-collision\" || !pinnedPaths.has(conflict.path))\n      )\n        throw new Error(\"Invalid journal collision group.\");\n    }\n    validatePortableSnapshot(journal.upload);\n    if ((journal.upload.version === 2 || journal.upload.version === 3) && !journal.accepted)\n      throw new Error(\"Portable merge journal requires an explicit accepted projection.\");\n    if (journal.accepted) validatePortableSnapshot(journal.accepted);\n  } catch {\n    throw new Error(\"Invalid merge journal paths, metadata, or bytes; preserve evidence for review.\");\n  }\n  // Integrity is intrinsic to the recorded transaction, not the user's current recovery policy.\n  // completeJournal separately checks that the recorded policy matches the current setup.\n  try {\n    if (\n      journal.accepted &&\n      (!sameLocalFields(journal.accepted.localFields, journal.upload.localFields) ||\n        !sameHashes(\n          fileHashMap(portableSnapshot(journal.after, journal.upload.localFields)),\n          fileHashMap(portableSnapshot(journal.accepted, journal.upload.localFields)),\n        ))\n    )\n      throw new Error(\"Projection mismatch.\");\n  } catch {\n    throw new Error(\"Invalid accepted merge projection; preserve journal evidence.\");\n  }\n  if (journal.progress) {\n    const known = new Set([\n      ...Object.keys(journal.progress.previous?.lastFileHashes ?? {}),\n      ...[...journal.before.files, ...journal.after.files, ...journal.upload.files].map((file) => file.path),\n    ]);\n    const progress = journal.progress;\n    if (\n      !config.partialSync ||\n      !progress.previous ||\n      syncStateFingerprint(progress.previous) !== journal.stateIdentity ||\n      !Array.isArray(progress.groups) ||\n      progress.groups.length > 16_384 ||\n      progress.groups.some(\n        (group) =>\n          !Array.isArray(group.paths) ||\n          !group.paths.length ||\n          group.paths.length > 16_384 ||\n          group.paths.some((filePath) => !known.has(filePath)) ||\n          !/^[a-f0-9-]{36}$/u.test(group.artifact),\n      )\n    )\n      throw new Error(\"Invalid partial acceptance metadata; preserve journal evidence.\");\n  }\n  if (journal.progress) {\n    const before = fileHashMap(journal.before);\n    const after = fileHashMap(journal.after);\n    const { readConflictArtifact } = await import(\"./conflict-artifacts.js\");\n    const backendIdentity = (JSON.parse(journal.identity) as unknown[])[1];\n    if (typeof backendIdentity !== \"string\") throw new Error(\"Invalid partial backend identity.\");\n    const byArtifact = new Map<string, typeof journal.progress.groups>();\n    for (const group of journal.progress.groups) {\n      const groups = byArtifact.get(group.artifact) ?? [];\n      groups.push(group);\n      byArtifact.set(group.artifact, groups);\n    }\n    for (const [token, groups] of byArtifact) {\n      const artifact = await readConflictArtifact(config, backendIdentity, token);\n      const retainedGroups = new Set(artifact.groups.map((group) => JSON.stringify(group.paths)));\n      const remote = fileHashMap(artifact.remote);\n      const upload = fileHashMap(journal.upload);\n      for (const group of groups) {\n        if (!retainedGroups.has(JSON.stringify(group.paths)))\n          throw new Error(\"Partial group does not match retained artifact evidence.\");\n        for (const filePath of group.paths)\n          if (\n            before[filePath] !== after[filePath] ||\n            remote[filePath] !== upload[filePath] ||\n            journal.progress.previous.lastFileHashes[filePath] !== artifact.state.lastFileHashes[filePath]\n          )\n            throw new Error(\"Withheld version changed in journal; preserve evidence.\");\n      }\n    }\n  }\n  return journal;\n}\n\nexport async function writeMergeJournal(config: AnySyncConfig, journal: MergeJournal) {\n  await writeJson(mergeJournalPath(config), journal, { maxBytes: 384 * 1024 * 1024 });\n}\n\nexport async function clearMergeJournal(config: AnySyncConfig) {\n  await fs.rm(mergeJournalPath(config), { force: true });\n  await syncDirectory(path.dirname(mergeJournalPath(config)));\n}\n\nexport async function retireMergeJournal(config: AnySyncConfig) {\n  if (!(await readMergeJournal(config))) return;\n  const file = mergeJournalPath(config);\n  await fs.rename(file, `${file}.${randomUUID()}.resolved`);\n  await syncDirectory(path.dirname(file));\n}\n\nexport async function requireNoMergeJournal(config: AnySyncConfig, options: { force?: boolean } = {}) {\n  const journal = await readMergeJournal(config);\n  if (options.force || !journal) return;\n  if (journal) {\n    throw new Error(\n      \"A merged transfer needs recovery. Run /sync sync to reconcile it. If newer local edits or remote revisions prevent recovery, review /sync diff and explicitly choose push --force or pull --force; the selected directional result will archive the old journal, not restore old bytes. Keep its backup; do not downgrade while recovery is pending.\",\n    );\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{chunk-UQ3ALBIB.ts → chunk-GP5DU62N.ts}

@@ -2,10 +2,13 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   setSyncSetupCompletions
-} from "./chunk-2DI6PDZV.ts";
+} from "./chunk-NLWS55B6.ts";
 import {
   safeTerminalText
 } from "./chunk-AMJRUXFT.ts";
+import {
+  SetupPullRequiresUiError
+} from "./chunk-7D5SF7P3.ts";
 import {
   configuredSyncSetupNames,
   loadConfig,
@@ -13,10 +16,10 @@ import {
   syncConfigReviewIdentity,
   syncSetupReviewIdentity,
   updateLocalConfig
-} from "./chunk-3B4Z2SKV.ts";
+} from "./chunk-QO333NM4.ts";
 import {
-  SetupPullRequiresUiError
-} from "./chunk-7D5SF7P3.ts";
+  throwIfAborted
+} from "./chunk-PWMWOJP4.ts";
 
 // src/sync/setup-switch.ts
 var SETUP_SWITCH_ACTION_OPTIONS = [
@@ -113,10 +116,6 @@ async function useSyncSetup(ctx, name, pullCurrentSetup, expectedAction, signal,
   }
   return { pullApplied: pullOutcome === "applied" };
 }
-function throwIfAborted(signal) {
-  if (!signal?.aborted) return;
-  throw signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted", "AbortError");
-}
 
 export {
   SETUP_SWITCH_ACTION_OPTIONS,
@@ -125,4 +124,4 @@ export {
   saveOnSwitch,
   useSyncSetup
 };
-//# sourceMappingURL=chunk-UQ3ALBIB.ts.map
+//# sourceMappingURL=chunk-GP5DU62N.ts.map

package/dist/chunks/chunk-GP5DU62N.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/setup-switch.ts"],
+  "sourcesContent": ["import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { setSyncSetupCompletions } from \"../commands/command.js\";\nimport { loadConfig, syncConfigReviewIdentity, syncSetupReviewIdentity } from \"../settings/config.js\";\nimport { configuredSyncSetupNames, updateLocalConfig } from \"../settings/settings-store.js\";\nimport type { OnSwitchAction } from \"../settings/settings-types.js\";\nimport { normalizeOnSwitch } from \"../settings/settings-validation.js\";\nimport { safeTerminalText } from \"../ui/terminal-text.js\";\nimport { throwIfAborted } from \"./signals.js\";\nimport { SetupPullRequiresUiError } from \"./sync-errors.js\";\n\nexport { SetupPullRequiresUiError } from \"./sync-errors.js\";\n\nexport const SETUP_SWITCH_ACTION_OPTIONS: ReadonlyArray<{\n  label: string;\n  value: OnSwitchAction;\n}> = [\n  { label: \"Ask before pull\", value: \"ask-before-pull\" },\n  { label: \"Start pull\", value: \"pull-after-switch\" },\n  { label: \"Switch only\", value: \"switch-only\" },\n];\n\nexport function setupSwitchActionLabel(action: OnSwitchAction) {\n  return SETUP_SWITCH_ACTION_OPTIONS.find((option) => option.value === action)?.label ?? action;\n}\n\nexport function setupSwitchActionFromLabel(label: string): OnSwitchAction | undefined {\n  return SETUP_SWITCH_ACTION_OPTIONS.find((option) => option.label === label)?.value;\n}\n\nexport async function saveOnSwitch(action: OnSwitchAction, signal?: AbortSignal) {\n  await updateLocalConfig((settings) => ({ ...settings, onSwitch: action }), signal);\n}\n\nexport type SetupPullOutcome = \"applied\" | \"cancelled\";\n\nexport interface SetupSwitchResult {\n  pullApplied: boolean;\n}\n\nexport async function useSyncSetup(\n  ctx: ExtensionCommandContext,\n  name: string,\n  pullCurrentSetup?: (setup: string) => Promise<SetupPullOutcome | undefined>,\n  expectedAction?: OnSwitchAction,\n  signal?: AbortSignal,\n  expectedSetupIdentity?: string,\n): Promise<SetupSwitchResult> {\n  const normalized = name.trim();\n  if (!normalized) throw new Error(\"Usage: /sync use <setup>\");\n  const loadedConfig = await loadConfig(normalized);\n  const reviewedSetupIdentity = expectedSetupIdentity ?? syncConfigReviewIdentity(loadedConfig);\n  throwIfAborted(signal);\n  const switchResult: { action: OnSwitchAction; switched: boolean } = {\n    action: \"ask-before-pull\",\n    switched: false,\n  };\n  await updateLocalConfig((current) => {\n    throwIfAborted(signal);\n    const setup = current.syncSetups[normalized];\n    if (!setup) {\n      throw new Error(`Sync setup \u201C${safeTerminalText(normalized)}\u201D no longer exists.`);\n    }\n    const connectionName = setup.storage.connection;\n    const connection = current.storageConnections[connectionName];\n    if (\n      !connection ||\n      syncSetupReviewIdentity(normalized, setup, connectionName, connection) !== reviewedSetupIdentity\n    ) {\n      throw new Error(\n        `Sync setup \u201C${safeTerminalText(normalized)}\u201D changed while the switch preview was open; reopen it and review the current destination.`,\n      );\n    }\n    switchResult.action = normalizeOnSwitch(current.onSwitch);\n    if (expectedAction !== undefined && switchResult.action !== expectedAction) {\n      throw new Error(\"Setup-switch behavior changed while the preview was open; reopen it and retry.\");\n    }\n    if (switchResult.action === \"pull-after-switch\" && !ctx.hasUI) {\n      throw new SetupPullRequiresUiError(\n        `Automatic setup pulls require interactive confirmation; sync setup \u201C${safeTerminalText(normalized)}\u201D was not switched. Use TUI or RPC mode.`,\n      );\n    }\n    if (current.activeSyncSetup === normalized) return current;\n    switchResult.switched = true;\n    return { ...current, activeSyncSetup: normalized };\n  }, signal);\n  throwIfAborted(signal);\n  if (!switchResult.switched) {\n    ctx.ui.notify(`Sync setup \u201C${safeTerminalText(normalized)}\u201D is already current.`, \"info\");\n    return { pullApplied: false };\n  }\n  setSyncSetupCompletions(await configuredSyncSetupNames());\n  throwIfAborted(signal);\n\n  if (switchResult.action === \"switch-only\") {\n    ctx.ui.notify(`Switched to \u201C${safeTerminalText(normalized)}\u201D. No files were pulled.`, \"info\");\n    return { pullApplied: false };\n  }\n  if (switchResult.action === \"ask-before-pull\") {\n    if (ctx.mode !== \"tui\") {\n      ctx.ui.notify(\n        `Switched to \u201C${safeTerminalText(normalized)}\u201D. No files were pulled because confirmation requires TUI mode; run /sync pull to apply this setup.`,\n        \"info\",\n      );\n      return { pullApplied: false };\n    }\n    const confirmed = await ctx.ui.confirm(\n      `Review a pull for sync setup \u201C${safeTerminalText(normalized)}\u201D now?`,\n      \"pi-sync will check the remote snapshot and show the exact local writes and deletions before applying anything.\",\n      { signal },\n    );\n    throwIfAborted(signal);\n    if (!confirmed) {\n      ctx.ui.notify(`Switched to \u201C${safeTerminalText(normalized)}\u201D; files were not pulled.`, \"info\");\n      return { pullApplied: false };\n    }\n  }\n\n  ctx.ui.notify(`Switched to \u201C${safeTerminalText(normalized)}\u201D. Checking remote files for a reviewed pull\u2026`, \"info\");\n  if (!pullCurrentSetup) {\n    throw new Error(`Switched to \u201C${safeTerminalText(normalized)}\u201D, but pull is unavailable.`);\n  }\n  const pullOutcome = await pullCurrentSetup(normalized);\n  throwIfAborted(signal);\n  if (pullOutcome === \"cancelled\") {\n    ctx.ui.notify(\n      `Pull cancelled; sync setup \u201C${safeTerminalText(normalized)}\u201D remains current and synced files were not changed.`,\n      \"info\",\n    );\n  }\n  return { pullApplied: pullOutcome === \"applied\" };\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{chunk-5RZPINUQ.ts → chunk-GSNPASKB.ts}

@@ -9,7 +9,7 @@ import {
 import {
   syncCheckConfigFingerprint,
   syncConfigReviewFingerprint
-} from "./chunk-3B4Z2SKV.ts";
+} from "./chunk-QO333NM4.ts";
 import {
   compareSyncInclude,
   sameSyncInclude
@@ -164,4 +164,4 @@ export {
   observationMatchesConfig,
   observationSummary
 };
-//# sourceMappingURL=chunk-5RZPINUQ.ts.map
+//# sourceMappingURL=chunk-GSNPASKB.ts.map

package/dist/chunks/{chunk-QE7NZZWT.ts → chunk-IWZH5KYS.ts}

@@ -4,17 +4,17 @@ import {
   collidingPaths,
   planFileMerge
 } from "./chunk-76NB4R7U.ts";
+import {
+  parseJsonObjectDocument,
+  parseSettingsDocument
+} from "./chunk-ZW5ZLGBI.ts";
 import {
   statePathForConfig,
   syncStateFingerprint
-} from "./chunk-4QVPTIZB.ts";
+} from "./chunk-UPNVIUBN.ts";
 import {
   backendIdentityCoordinates
 } from "./chunk-2JZFHNLM.ts";
-import {
-  parseJsonObjectDocument,
-  parseSettingsDocument
-} from "./chunk-ZW5ZLGBI.ts";
 import {
   syncDirectory,
   writeJson
@@ -277,7 +277,7 @@ function baselinePath(config, state) {
 async function stageMergeBaseline(config, snapshot, accepted, previous) {
   const collisions = collidingPaths(snapshot.files.map((file) => file.path));
   const files = snapshot.files.filter((file) => {
-    return !collisions.has(file.path) && accepted.lastFileHashes[file.path] === file.sha256 && (file.path === "settings.json" || config.mergeContent) && eligible(file);
+    return !collisions.has(file.path) && accepted.lastFileHashes[file.path] === file.sha256 && (file.path === "settings.json" || config.mergeContent || config.agentMode && isMergeTextPath(file.path)) && eligible(file);
   });
   if (previous) {
     const stagedPaths = new Set(files.map((file) => file.path));
@@ -333,6 +333,18 @@ async function readMergeAncestors(config, state) {
   }
   return record.files;
 }
+async function hasCurrentMergeBaseline(config, snapshot, state) {
+  try {
+    const ancestors = await readMergeAncestors(config, state);
+    if (!ancestors) return false;
+    const hashes = new Map(ancestors.map((file) => [file.path, file.sha256]));
+    return snapshot.files.every(
+      (file) => !(file.path === "settings.json" || config.mergeContent || config.agentMode && isMergeTextPath(file.path)) || !eligible(file) || hashes.get(file.path) === file.sha256
+    );
+  } catch {
+    return false;
+  }
+}
 async function readMergeAncestor(config, state, filePath) {
   const file = (await readMergeAncestors(config, state))?.find((file2) => file2.path === filePath);
   return file ? Buffer.from(file.contentBase64, "base64") : void 0;
@@ -370,11 +382,15 @@ async function pruneMergeBaselines(config, state, validate) {
 export {
   TEXT_MERGE_WORK_LIMIT,
   isMergeTextPath,
+  text,
+  lines,
+  edits,
   mergeText,
   mergeSession,
   stageMergeBaseline,
   readMergeAncestors,
+  hasCurrentMergeBaseline,
   readMergeAncestor,
   pruneMergeBaselines
 };
-//# sourceMappingURL=chunk-QE7NZZWT.ts.map
+//# sourceMappingURL=chunk-IWZH5KYS.ts.map