@narumitw/pi-sync 0.54.2 → 0.56.0

package/dist/chunks/agent-store-A3F6IYWZ.ts

@@ -0,0 +1,152 @@
+// @generated by scripts/build-runtime.mjs; do not edit.
+// @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
+import {
+  withLock
+} from "./chunk-AAEEHR7H.ts";
+import "./chunk-PWMWOJP4.ts";
+import {
+  ContinuousError
+} from "./chunk-DT7M4VQS.ts";
+import "./chunk-YDVQYUHE.ts";
+import {
+  AGENT_OUTPUT_BYTES
+} from "./chunk-PRUEIIK7.ts";
+import "./chunk-UPNVIUBN.ts";
+import {
+  LOCKFILE_FS_ADAPTER,
+  LOCK_GUARD_STALE_MS,
+  LOCK_GUARD_UPDATE_MS,
+  stateDir
+} from "./chunk-SWRVXVFD.ts";
+import "./chunk-2JZFHNLM.ts";
+import "./chunk-T2SJD3N7.ts";
+import {
+  writeJson
+} from "./chunk-HUZ5CR4W.ts";
+
+// src/sync/agent-store.ts
+import { randomUUID } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+import lockfile from "proper-lockfile";
+function paths() {
+  const root = path.join(stateDir(), "agent-resolver");
+  return { root, claim: path.join(root, "claim.json") };
+}
+async function directory() {
+  const { root } = paths();
+  await fs.mkdir(root, { mode: 448 });
+}
+async function checkDirectory() {
+  const stat = await fs.lstat(paths().root);
+  if (!stat.isDirectory() || stat.isSymbolicLink() || process.platform !== "win32" && stat.mode & 63)
+    throw new Error("Unsafe agent resolver directory; evidence retained.");
+}
+async function readPrivate(file) {
+  try {
+    await checkDirectory();
+    const stat = await fs.lstat(file);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.nlink !== 1 || stat.size > AGENT_OUTPUT_BYTES * 2 || process.platform !== "win32" && stat.mode & 63)
+      throw new Error("Unsafe agent resolver record; evidence retained.");
+    return JSON.parse(await fs.readFile(file, "utf8"));
+  } catch (error) {
+    if (error.code === "ENOENT") return void 0;
+    throw new Error("Unreadable agent resolver record; evidence retained.");
+  }
+}
+async function readClaim() {
+  const value = await readPrivate(paths().claim);
+  if (value === void 0) return;
+  const claim = value;
+  if (claim?.version !== 1 || typeof claim.id !== "string" || !/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/u.test(claim.id) || Object.keys(claim).sort().join(",") !== "id,pid,version" || !Number.isSafeInteger(claim.pid) || claim.pid < 1 || claim.pid > 2147483647)
+    throw new Error("Invalid agent resolver claim; evidence retained.");
+  return claim;
+}
+function alive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code !== "ESRCH";
+  }
+}
+async function withAgentClaim(fn) {
+  const claim = { version: 1, id: randomUUID(), pid: process.pid };
+  let armed = false;
+  const assertOwner = async () => {
+    const current = await readClaim();
+    if (current?.id !== claim.id || current.pid !== process.pid)
+      throw new Error("Agent resolver ownership changed; candidate not applied.");
+  };
+  try {
+    await withLock("agent-claim", async () => {
+      try {
+        await directory();
+      } catch (error) {
+        if (error.code !== "EEXIST") throw error;
+      }
+      await checkDirectory();
+      await withClaimGuard(async () => {
+        const existing = await readClaim();
+        if (existing && alive(existing.pid))
+          throw new ContinuousError("contention", "Agent mode deferred: another local resolver is running.");
+        armed = true;
+        await writeJson(paths().claim, claim);
+      });
+    });
+    return await fn(assertOwner);
+  } finally {
+    if (armed) await releaseClaim(claim);
+  }
+}
+async function releaseClaim(claim) {
+  await withClaimGuard(async () => {
+    const current = await readClaim();
+    if (current?.id === claim.id && current.pid === claim.pid) await fs.rm(paths().claim);
+  });
+}
+async function withClaimGuard(run) {
+  await checkDirectory();
+  let compromisedError;
+  const release = await lockfile.lock(paths().claim, {
+    fs: LOCKFILE_FS_ADAPTER,
+    realpath: false,
+    stale: LOCK_GUARD_STALE_MS,
+    update: LOCK_GUARD_UPDATE_MS,
+    retries: { retries: 100, factor: 1.2, minTimeout: 10, maxTimeout: 100 },
+    onCompromised: (error) => {
+      compromisedError = error;
+    }
+  });
+  try {
+    const result = await run();
+    if (compromisedError) throw compromisedError;
+    return result;
+  } finally {
+    await release();
+  }
+}
+function candidatePath(key) {
+  if (!/^[a-f0-9]{64}$/u.test(key)) throw new Error("Invalid agent candidate key.");
+  return path.join(paths().root, `${key}.json`);
+}
+async function readAgentCandidate(key) {
+  return readPrivate(candidatePath(key));
+}
+async function saveAgentCandidate(key, candidate) {
+  await checkDirectory();
+  const target = candidatePath(key);
+  const existing = await readPrivate(target);
+  if (existing !== void 0) {
+    if (JSON.stringify(existing) !== JSON.stringify(candidate))
+      throw new Error("Agent candidate changed before save; existing evidence retained.");
+    return;
+  }
+  await writeJson(target, candidate, { maxBytes: AGENT_OUTPUT_BYTES * 2 });
+}
+export {
+  readAgentCandidate,
+  saveAgentCandidate,
+  withAgentClaim
+};
+//# sourceMappingURL=agent-store-A3F6IYWZ.ts.map

package/dist/chunks/agent-store-A3F6IYWZ.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/agent-store.ts"],
+  "sourcesContent": ["import { randomUUID } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport lockfile from \"proper-lockfile\";\nimport { writeJson } from \"../state/json-file.js\";\nimport { withLock } from \"../state/lock.js\";\nimport { LOCK_GUARD_STALE_MS, LOCK_GUARD_UPDATE_MS } from \"../state/lock-policy.js\";\nimport { LOCKFILE_FS_ADAPTER } from \"../state/lockfile-fs.js\";\nimport { stateDir } from \"../state/state-directory.js\";\nimport { AGENT_OUTPUT_BYTES } from \"./agent-policy.js\";\nimport { ContinuousError } from \"./continuous-errors.js\";\n\ninterface Claim {\n  version: 1;\n  id: string;\n  pid: number;\n}\nfunction paths() {\n  const root = path.join(stateDir(), \"agent-resolver\");\n  return { root, claim: path.join(root, \"claim.json\") };\n}\nasync function directory() {\n  const { root } = paths();\n  await fs.mkdir(root, { mode: 0o700 });\n}\nasync function checkDirectory() {\n  const stat = await fs.lstat(paths().root);\n  if (!stat.isDirectory() || stat.isSymbolicLink() || (process.platform !== \"win32\" && stat.mode & 0o077))\n    throw new Error(\"Unsafe agent resolver directory; evidence retained.\");\n}\nasync function readPrivate(file: string): Promise<unknown> {\n  try {\n    await checkDirectory();\n    const stat = await fs.lstat(file);\n    if (\n      !stat.isFile() ||\n      stat.isSymbolicLink() ||\n      stat.nlink !== 1 ||\n      stat.size > AGENT_OUTPUT_BYTES * 2 ||\n      (process.platform !== \"win32\" && stat.mode & 0o077)\n    )\n      throw new Error(\"Unsafe agent resolver record; evidence retained.\");\n    return JSON.parse(await fs.readFile(file, \"utf8\"));\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code === \"ENOENT\") return undefined;\n    throw new Error(\"Unreadable agent resolver record; evidence retained.\");\n  }\n}\nasync function readClaim(): Promise<Claim | undefined> {\n  const value = await readPrivate(paths().claim);\n  if (value === undefined) return;\n  const claim = value as Claim;\n  if (\n    claim?.version !== 1 ||\n    typeof claim.id !== \"string\" ||\n    !/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/u.test(claim.id) ||\n    Object.keys(claim).sort().join(\",\") !== \"id,pid,version\" ||\n    !Number.isSafeInteger(claim.pid) ||\n    claim.pid < 1 ||\n    claim.pid > 2_147_483_647\n  )\n    throw new Error(\"Invalid agent resolver claim; evidence retained.\");\n  return claim;\n}\nfunction alive(pid: number) {\n  try {\n    process.kill(pid, 0);\n    return true;\n  } catch (error) {\n    return (error as NodeJS.ErrnoException).code !== \"ESRCH\";\n  }\n}\n\n/** Caller retains the state-directory migration guard; claim changes use a separate short-lived guard. */\nexport async function withAgentClaim<T>(fn: (assertOwner: () => Promise<void>) => Promise<T>): Promise<T> {\n  const claim: Claim = { version: 1, id: randomUUID(), pid: process.pid };\n  let armed = false;\n  const assertOwner = async () => {\n    const current = await readClaim();\n    if (current?.id !== claim.id || current.pid !== process.pid)\n      throw new Error(\"Agent resolver ownership changed; candidate not applied.\");\n  };\n  try {\n    await withLock(\"agent-claim\", async () => {\n      try {\n        await directory();\n      } catch (error) {\n        if ((error as NodeJS.ErrnoException).code !== \"EEXIST\") throw error;\n      }\n      await checkDirectory();\n      await withClaimGuard(async () => {\n        const existing = await readClaim();\n        if (existing && alive(existing.pid))\n          throw new ContinuousError(\"contention\", \"Agent mode deferred: another local resolver is running.\");\n        // A durability failure can occur after rename: cleanup must own partial initialization too.\n        armed = true;\n        await writeJson(paths().claim, claim);\n      });\n    });\n    return await fn(assertOwner);\n  } finally {\n    if (armed) await releaseClaim(claim);\n  }\n}\nasync function releaseClaim(claim: Claim) {\n  // Ordinary transfers may hold the operation lock for an arbitrary time.\n  // Cleanup needs only the claim guard; it never waits for that operation lock.\n  await withClaimGuard(async () => {\n    const current = await readClaim();\n    if (current?.id === claim.id && current.pid === claim.pid) await fs.rm(paths().claim);\n  });\n}\nasync function withClaimGuard<T>(run: () => Promise<T>): Promise<T> {\n  await checkDirectory();\n  let compromisedError: Error | undefined;\n  const release = await lockfile.lock(paths().claim, {\n    fs: LOCKFILE_FS_ADAPTER,\n    realpath: false,\n    stale: LOCK_GUARD_STALE_MS,\n    update: LOCK_GUARD_UPDATE_MS,\n    retries: { retries: 100, factor: 1.2, minTimeout: 10, maxTimeout: 100 },\n    onCompromised: (error) => {\n      compromisedError = error;\n    },\n  });\n  try {\n    const result = await run();\n    if (compromisedError) throw compromisedError;\n    return result;\n  } finally {\n    await release();\n  }\n}\nfunction candidatePath(key: string) {\n  if (!/^[a-f0-9]{64}$/u.test(key)) throw new Error(\"Invalid agent candidate key.\");\n  return path.join(paths().root, `${key}.json`);\n}\nexport async function readAgentCandidate(key: string): Promise<unknown> {\n  return readPrivate(candidatePath(key));\n}\nexport async function saveAgentCandidate(key: string, candidate: unknown) {\n  await checkDirectory();\n  const target = candidatePath(key);\n  const existing = await readPrivate(target);\n  if (existing !== undefined) {\n    if (JSON.stringify(existing) !== JSON.stringify(candidate))\n      throw new Error(\"Agent candidate changed before save; existing evidence retained.\");\n    return;\n  }\n  await writeJson(target, candidate, { maxBytes: AGENT_OUTPUT_BYTES * 2 });\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/chunk-5Q5SSKNG.ts

@@ -0,0 +1,128 @@
+// @generated by scripts/build-runtime.mjs; do not edit.
+// @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
+import {
+  TEXT_MERGE_WORK_LIMIT,
+  isMergeTextPath,
+  mergeSession,
+  mergeText,
+  readMergeAncestors
+} from "./chunk-IWZH5KYS.ts";
+import {
+  mergePathIdentity
+} from "./chunk-76NB4R7U.ts";
+import {
+  jsonEqual,
+  parseSettingsDocument,
+  renderSettingsMembers
+} from "./chunk-ZW5ZLGBI.ts";
+
+// src/sync/content-conflicts.ts
+import { createHash } from "node:crypto";
+function snapshotFile(filePath, bytes) {
+  return {
+    path: filePath,
+    contentBase64: bytes.toString("base64"),
+    sha256: createHash("sha256").update(bytes).digest("hex")
+  };
+}
+async function resolveContentConflicts(config, state, local, remote, plan, protectedPaths, options = {}) {
+  if (plan.kind !== "planned" || !config.mergeContent) return plan;
+  options.signal?.throwIfAborted();
+  const budget = options.textBudget ?? { remaining: TEXT_MERGE_WORK_LIMIT };
+  const decisions = [...plan.decisions];
+  let ancestors = [];
+  try {
+    ancestors = await readMergeAncestors(config, state) ?? [];
+  } catch {
+    options.signal?.throwIfAborted();
+    return plan;
+  }
+  options.signal?.throwIfAborted();
+  const oursByPath = new Map(local.files.map((file) => [file.path, file]));
+  const theirsByPath = new Map(remote.files.map((file) => [file.path, file]));
+  const ancestorsByPath = new Map(ancestors.map((file) => [file.path, file]));
+  const decisionIndex = new Map(decisions.map((decision, index) => [decision.path, index]));
+  const protectedKeys = new Set([...protectedPaths].map(mergePathIdentity));
+  for (const conflict of plan.conflicts) {
+    options.signal?.throwIfAborted();
+    if (conflict.reason !== "both-changed" || protectedKeys.has(mergePathIdentity(conflict.path))) continue;
+    const session = conflict.path.startsWith("sessions/") && conflict.path.endsWith(".jsonl");
+    if (!session && (!isMergeTextPath(conflict.path) || budget.remaining === 0)) continue;
+    const ours = oursByPath.get(conflict.path);
+    const theirs = theirsByPath.get(conflict.path);
+    if (!ours || !theirs) continue;
+    const ancestor = ancestorsByPath.get(conflict.path);
+    const base = ancestor ? Buffer.from(ancestor.contentBase64, "base64") : void 0;
+    if (!base) continue;
+    const localBytes = Buffer.from(ours.contentBase64, "base64");
+    const remoteBytes = Buffer.from(theirs.contentBase64, "base64");
+    const bytes = session ? mergeSession(base, localBytes, remoteBytes) : mergeText(base, localBytes, remoteBytes, { budget, signal: options.signal });
+    if (!bytes) continue;
+    const index = decisionIndex.get(conflict.path);
+    if (index === void 0) continue;
+    decisions[index] = {
+      kind: "accepted",
+      path: conflict.path,
+      source: "merged",
+      file: snapshotFile(conflict.path, bytes)
+    };
+  }
+  return {
+    kind: "planned",
+    decisions,
+    conflicts: decisions.filter((item) => item.kind === "conflict")
+  };
+}
+
+// src/sync/settings-merge.ts
+var COUPLED_FIELDS = [
+  ["defaultProvider", "defaultModel"],
+  ["queueMode", "steeringMode"],
+  ["websockets", "transport"],
+  ["skills", "enableSkillCommands"],
+  ["enableAnalytics", "trackingId"]
+];
+function mergeSettingsJson(ancestor, local, remote, selections = /* @__PURE__ */ new Map()) {
+  let documents;
+  try {
+    documents = [ancestor, local, remote].map(parseSettingsDocument);
+  } catch {
+    return { kind: "review", reason: "unsupported-format", fields: [] };
+  }
+  const [base, left, right] = documents;
+  const selected = /* @__PURE__ */ new Map();
+  const fields = new Set(documents.flatMap((document) => [...document.root.members.keys()]));
+  const units = COUPLED_FIELDS.map((group) => [...group]);
+  const coupled = new Set(units.flat());
+  units.push(...[...fields].filter((field) => !coupled.has(field)).map((field) => [field]));
+  const conflicts = [];
+  for (const unit of units) {
+    const equal = (first, second) => unit.every(
+      (field) => jsonEqual(first.root.members.get(field)?.node.value, second.root.members.get(field)?.node.value)
+    );
+    const choice = selections.get(unit[0] ?? "");
+    const source = equal(left, right) ? left : equal(left, base) ? right : equal(right, base) ? left : choice === "local" ? left : choice === "remote" ? right : void 0;
+    if (!source) {
+      conflicts.push(...unit.filter((field) => fields.has(field)));
+      continue;
+    }
+    for (const field of unit) {
+      const member = source.root.members.get(field);
+      if (member) selected.set(field, { document: source, node: member.node });
+    }
+  }
+  if (conflicts.length) return { kind: "review", reason: "field-conflict", fields: conflicts };
+  try {
+    return { kind: "merged", content: renderSettingsMembers(left, selected) };
+  } catch {
+    return { kind: "review", reason: "unsupported-format", fields: [] };
+  }
+}
+
+export {
+  snapshotFile,
+  resolveContentConflicts,
+  COUPLED_FIELDS,
+  mergeSettingsJson
+};
+//# sourceMappingURL=chunk-5Q5SSKNG.ts.map

package/dist/chunks/chunk-5Q5SSKNG.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/content-conflicts.ts", "../../src/sync/settings-merge.ts"],
+  "sourcesContent": ["import { createHash } from \"node:crypto\";\nimport type { AnySyncConfig } from \"../settings/settings-types.js\";\nimport type { Snapshot, SnapshotFile } from \"../snapshot/snapshot-types.js\";\nimport { readMergeAncestors } from \"../state/merge-baseline-store.js\";\nimport type { SyncState } from \"../state/state-types.js\";\nimport { type FileMergePlan, mergePathIdentity } from \"./file-merge-planner.js\";\nimport { mergeSession } from \"./session-merge.js\";\nimport { isMergeTextPath, mergeText, TEXT_MERGE_WORK_LIMIT, type TextMergeBudget } from \"./text-merge.js\";\nexport function snapshotFile(filePath: string, bytes: Buffer): SnapshotFile {\n  return {\n    path: filePath,\n    contentBase64: bytes.toString(\"base64\"),\n    sha256: createHash(\"sha256\").update(bytes).digest(\"hex\"),\n  };\n}\nexport async function resolveContentConflicts(\n  config: AnySyncConfig,\n  state: SyncState,\n  local: Snapshot,\n  remote: Snapshot,\n  plan: FileMergePlan,\n  protectedPaths: ReadonlySet<string>,\n  options: { textBudget?: TextMergeBudget; signal?: AbortSignal } = {},\n): Promise<FileMergePlan> {\n  if (plan.kind !== \"planned\" || !config.mergeContent) return plan;\n  options.signal?.throwIfAborted();\n  const budget = options.textBudget ?? { remaining: TEXT_MERGE_WORK_LIMIT };\n  const decisions = [...plan.decisions];\n  let ancestors: SnapshotFile[] = [];\n  try {\n    ancestors = (await readMergeAncestors(config, state)) ?? [];\n  } catch {\n    options.signal?.throwIfAborted();\n    return plan;\n  }\n  options.signal?.throwIfAborted();\n  const oursByPath = new Map(local.files.map((file) => [file.path, file]));\n  const theirsByPath = new Map(remote.files.map((file) => [file.path, file]));\n  const ancestorsByPath = new Map(ancestors.map((file) => [file.path, file]));\n  const decisionIndex = new Map(decisions.map((decision, index) => [decision.path, index]));\n  const protectedKeys = new Set([...protectedPaths].map(mergePathIdentity));\n  for (const conflict of plan.conflicts) {\n    options.signal?.throwIfAborted();\n    if (conflict.reason !== \"both-changed\" || protectedKeys.has(mergePathIdentity(conflict.path))) continue;\n    const session = conflict.path.startsWith(\"sessions/\") && conflict.path.endsWith(\".jsonl\");\n    if (!session && (!isMergeTextPath(conflict.path) || budget.remaining === 0)) continue;\n    const ours = oursByPath.get(conflict.path);\n    const theirs = theirsByPath.get(conflict.path);\n    if (!ours || !theirs) continue;\n    const ancestor = ancestorsByPath.get(conflict.path);\n    const base = ancestor ? Buffer.from(ancestor.contentBase64, \"base64\") : undefined;\n    if (!base) continue;\n    const localBytes = Buffer.from(ours.contentBase64, \"base64\");\n    const remoteBytes = Buffer.from(theirs.contentBase64, \"base64\");\n    const bytes = session\n      ? mergeSession(base, localBytes, remoteBytes)\n      : mergeText(base, localBytes, remoteBytes, { budget, signal: options.signal });\n    if (!bytes) continue;\n    const index = decisionIndex.get(conflict.path);\n    if (index === undefined) continue;\n    decisions[index] = {\n      kind: \"accepted\",\n      path: conflict.path,\n      source: \"merged\",\n      file: snapshotFile(conflict.path, bytes),\n    };\n  }\n  return {\n    kind: \"planned\",\n    decisions,\n    conflicts: decisions.filter((item): item is Extract<typeof item, { kind: \"conflict\" }> => item.kind === \"conflict\"),\n  };\n}\n", "import {\n  type JsonDocument,\n  type JsonNode,\n  jsonEqual,\n  parseSettingsDocument,\n  renderSettingsMembers,\n} from \"./json-document.js\";\n\nexport type SettingsMergeResult =\n  | { kind: \"merged\"; content: Buffer }\n  | { kind: \"review\"; reason: \"unsupported-format\" | \"field-conflict\"; fields: string[] };\n\nexport const COUPLED_FIELDS = [\n  [\"defaultProvider\", \"defaultModel\"],\n  [\"queueMode\", \"steeringMode\"],\n  [\"websockets\", \"transport\"],\n  [\"skills\", \"enableSkillCommands\"],\n  [\"enableAnalytics\", \"trackingId\"],\n] as const;\n\n/** Only global settings.json; objects/arrays are atomic units until their invariants are proven. */\nexport function mergeSettingsJson(\n  ancestor: Buffer,\n  local: Buffer,\n  remote: Buffer,\n  selections: ReadonlyMap<string, \"local\" | \"remote\"> = new Map(),\n): SettingsMergeResult {\n  let documents: JsonDocument[];\n  try {\n    documents = [ancestor, local, remote].map(parseSettingsDocument);\n  } catch {\n    return { kind: \"review\", reason: \"unsupported-format\", fields: [] };\n  }\n  const [base, left, right] = documents as [JsonDocument, JsonDocument, JsonDocument];\n  const selected = new Map<string, { document: JsonDocument; node: JsonNode }>();\n  const fields = new Set(documents.flatMap((document) => [...document.root.members.keys()]));\n  const units: string[][] = COUPLED_FIELDS.map((group) => [...group]);\n  const coupled = new Set(units.flat());\n  units.push(...[...fields].filter((field) => !coupled.has(field)).map((field) => [field]));\n  const conflicts: string[] = [];\n  for (const unit of units) {\n    const equal = (first: JsonDocument, second: JsonDocument) =>\n      unit.every((field) =>\n        jsonEqual(first.root.members.get(field)?.node.value, second.root.members.get(field)?.node.value),\n      );\n    const choice = selections.get(unit[0] ?? \"\");\n    const source = equal(left, right)\n      ? left\n      : equal(left, base)\n        ? right\n        : equal(right, base)\n          ? left\n          : choice === \"local\"\n            ? left\n            : choice === \"remote\"\n              ? right\n              : undefined;\n    if (!source) {\n      conflicts.push(...unit.filter((field) => fields.has(field)));\n      continue;\n    }\n    for (const field of unit) {\n      const member = source.root.members.get(field);\n      if (member) selected.set(field, { document: source, node: member.node });\n    }\n  }\n  if (conflicts.length) return { kind: \"review\", reason: \"field-conflict\", fields: conflicts };\n  try {\n    return { kind: \"merged\", content: renderSettingsMembers(left, selected) };\n  } catch {\n    return { kind: \"review\", reason: \"unsupported-format\", fields: [] };\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/chunk-5XZOC7FD.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 {
+  safeTerminalText
+} from "./chunk-AMJRUXFT.ts";
+
+// src/ui/merge-review.ts
+import { truncateToWidth as truncateToWidth2 } from "@earendil-works/pi-tui";
+import { defineMenu, runCustomInteraction, runDocumentReview, runMenu } from "@narumitw/pi-tui-kit";
+
+// src/ui/sync-confirmation.ts
+import { Key, matchesKey, SelectList, truncateToWidth } from "@earendil-works/pi-tui";
+import { HorizontalRule, hardWrapTerminalDocument, sanitizeTerminalText } from "@narumitw/pi-tui-kit";
+function createSyncConfirmation(options) {
+  const { tui, theme, keybindings } = options;
+  const choices = ["cancel", "approve", "details"];
+  const list = new SelectList(
+    [
+      { value: "cancel", label: "No, cancel" },
+      { value: "approve", label: `Yes, ${sanitizeTerminalText(options.confirmationLabel)}` },
+      { value: "details", label: "View details" }
+    ],
+    3,
+    {
+      selectedPrefix: (text) => theme.fg("accent", text),
+      selectedText: (text) => theme.fg("accent", text),
+      description: (text) => theme.fg("muted", text),
+      scrollInfo: (text) => theme.fg("dim", text),
+      noMatch: (text) => theme.fg("muted", text)
+    }
+  );
+  const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
+  let selected = 0;
+  let offset = 0;
+  let maximumOffset = 0;
+  let lastWidth = 0;
+  let lastRows = 0;
+  let seen = /* @__PURE__ */ new Set();
+  let summary = [];
+  let reviewed = false;
+  let disposed = false;
+  let finished = false;
+  let summaryStart = 0;
+  let summaryEnd = 0;
+  let actionsStart = 0;
+  const finish = (choice) => {
+    if (disposed || finished) return;
+    finished = true;
+    options.complete(choice);
+  };
+  const select = (index) => {
+    selected = (index + choices.length) % choices.length;
+    list.setSelectedIndex(selected);
+  };
+  list.onSelectionChange = (item) => {
+    selected = Math.max(0, choices.indexOf(item.value));
+  };
+  list.onSelect = (item) => {
+    const choice = choices[selected] ?? "cancel";
+    if (item.value === choice && (choice !== "approve" || reviewed)) finish(choice);
+  };
+  const component = {
+    render(width, expose = true) {
+      if (!Number.isFinite(width) || width <= 0) {
+        reviewed = false;
+        return [];
+      }
+      const cells = Math.floor(width);
+      const rows = Math.max(1, Math.floor(tui.terminal.rows) - 3);
+      if (cells !== lastWidth || rows !== lastRows) {
+        summary = options.lines.flatMap((line) => hardWrapTerminalDocument(line, cells));
+        seen = /* @__PURE__ */ new Set();
+        offset = 0;
+        select(0);
+        lastWidth = cells;
+        lastRows = rows;
+      }
+      const framed = rows >= 9;
+      const actions = list.render(cells);
+      const viewport = Math.max(0, rows - actions.length - 3 - (framed ? 2 : 0));
+      maximumOffset = Math.max(0, summary.length - viewport);
+      offset = Math.min(offset, maximumOffset);
+      const visible = summary.slice(offset, offset + viewport);
+      if (expose) for (let index = offset; index < offset + visible.length; index++) seen.add(index);
+      reviewed = viewport > 0 && seen.size === summary.length;
+      const hint = reviewed ? "Select an action." : "Navigation keys scroll the summary before selecting Yes.";
+      const body = [
+        theme.fg("accent", theme.bold(hardWrapTerminalDocument(options.title, cells).join(" "))),
+        ...visible.map((line) => theme.fg("text", line)),
+        theme.fg(
+          "muted",
+          `Summary ${visible.length ? offset + 1 : 0}-${offset + visible.length}/${summary.length}${reviewed ? "" : " \u2014 review before Yes"}`
+        ),
+        ...actions,
+        theme.fg("dim", hint)
+      ];
+      summaryStart = Number(framed) + 1;
+      summaryEnd = summaryStart + visible.length;
+      actionsStart = summaryEnd + 1;
+      const frame = framed ? [...rule.render(cells), ...body, ...rule.render(cells)] : body;
+      return frame.slice(0, rows).map((line) => truncateToWidth(line, cells, ""));
+    },
+    invalidate() {
+      list.invalidate();
+      rule.invalidate();
+    },
+    handleInput(data) {
+      if (disposed || finished) return;
+      if (matchesKey(data, Key.ctrl("c")) || keybindings.matches(data, "tui.select.cancel")) {
+        finish("cancel");
+        return;
+      }
+      component.render(tui.terminal.columns ?? lastWidth, false);
+      if (keybindings.matches(data, "tui.select.up")) {
+        if (!reviewed || selected === 0 && offset > 0) offset = Math.max(0, offset - 1);
+        else select(selected - 1);
+      } else if (keybindings.matches(data, "tui.select.down")) {
+        if (!reviewed || selected === 0 && offset < maximumOffset) offset = Math.min(maximumOffset, offset + 1);
+        else select(selected + 1);
+      } else if (keybindings.matches(data, "tui.select.confirm")) {
+        const choice = choices[selected] ?? "cancel";
+        if (choice !== "approve" || reviewed) finish(choice);
+      }
+      tui.requestRender();
+    },
+    handleMouse(event) {
+      if (disposed || finished || event.width !== lastWidth) return void 0;
+      component.render(event.width, false);
+      if (event.y >= summaryStart && event.y < summaryEnd && event.type === "wheel" && event.wheelDelta) {
+        offset = Math.max(0, Math.min(maximumOffset, offset + (event.wheelDelta < 0 ? -1 : 1)));
+        select(0);
+        tui.requestRender();
+        return { handled: true, render: true };
+      }
+      if (event.y < actionsStart || event.y >= actionsStart + choices.length || event.y >= lastRows) return void 0;
+      return list.handleMouse({ ...event, y: event.y - actionsStart, height: choices.length });
+    },
+    dispose() {
+      disposed = true;
+      seen.clear();
+    }
+  };
+  return component;
+}
+
+// src/ui/merge-review.ts
+async function confirmMergeReview(ctx, title, content, signal, isCurrent, confirmationLabel = "apply changes", summaryLines) {
+  const lines = summaryLines ?? [
+    ...content.split("\n").slice(0, 6).map((line) => truncateToWidth2(safeTerminalText(line), 100)),
+    "View details for the complete review."
+  ];
+  while (isCurrent() && !signal?.aborted) {
+    const choice = { value: "cancel" };
+    const menu = defineMenu({
+      start: "confirm",
+      screens: {
+        confirm: () => ({
+          kind: "choice",
+          title,
+          lines,
+          initialItemId: "cancel",
+          items: [
+            { id: "cancel", label: "No, cancel" },
+            { id: "approve", label: `Yes, ${confirmationLabel}` },
+            { id: "details", label: "View details" }
+          ],
+          action: "choose",
+          hint: "close"
+        })
+      },
+      actions: {
+        choose: ({ itemId }) => {
+          if (itemId === "approve" || itemId === "details") choice.value = itemId;
+          return { kind: "close" };
+        }
+      }
+    });
+    const result = ctx.mode === "tui" && ctx.hasUI ? await runCustomInteraction(ctx, {
+      create: ({ tui, theme, keybindings, complete }) => createSyncConfirmation({ title, lines, confirmationLabel, tui, theme, keybindings, complete }),
+      signal,
+      isCurrent,
+      onError: () => {
+      }
+    }) : await runMenu(ctx, menu, { getState: () => void 0, signal, isCurrent, onError: () => {
+    } });
+    if (!isCurrent() || signal?.aborted) return false;
+    if (result.kind === "error") throw new Error("Sync review failed; no transfer was performed.");
+    if (result.kind === "unsupported")
+      throw new Error("Sync review requires observable TUI or RPC; review the plan before using --yes.");
+    if (result.kind === "completed") choice.value = result.value;
+    else if (result.kind !== "closed") return false;
+    if (choice.value === "approve") return true;
+    if (choice.value !== "details") return false;
+    const detail = await runDocumentReview(ctx, {
+      title: "Sync change details",
+      content,
+      format: { kind: "text" },
+      viewportSize: "adaptive",
+      hint: "back",
+      signal,
+      isCurrent,
+      onError: () => {
+      }
+    });
+    if (!isCurrent() || signal?.aborted) return false;
+    if (detail.kind === "error") throw new Error("Sync review failed; no transfer was performed.");
+    if (detail.kind !== "cancelled" || detail.reason !== "back") return false;
+  }
+  return false;
+}
+
+export {
+  confirmMergeReview
+};
+//# sourceMappingURL=chunk-5XZOC7FD.ts.map

package/dist/chunks/chunk-5XZOC7FD.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/ui/merge-review.ts", "../../src/ui/sync-confirmation.ts"],
+  "sourcesContent": ["import type { ExtensionCommandContext, ExtensionContext } from \"@earendil-works/pi-coding-agent\";\nimport { truncateToWidth } from \"@earendil-works/pi-tui\";\nimport { defineMenu, runCustomInteraction, runDocumentReview, runMenu } from \"@narumitw/pi-tui-kit\";\nimport { createSyncConfirmation, type SyncConfirmationChoice } from \"./sync-confirmation.js\";\nimport { safeTerminalText } from \"./terminal-text.js\";\n\ntype ReviewContext = ExtensionCommandContext | ExtensionContext;\n\n/** One approval screen; full details are optional and never authorize a transfer. */\nexport async function confirmMergeReview(\n  ctx: ReviewContext,\n  title: string,\n  content: string,\n  signal: AbortSignal | undefined,\n  isCurrent: () => boolean,\n  confirmationLabel = \"apply changes\",\n  summaryLines?: readonly string[],\n) {\n  const lines = summaryLines ?? [\n    ...content\n      .split(\"\\n\")\n      .slice(0, 6)\n      .map((line) => truncateToWidth(safeTerminalText(line), 100)),\n    \"View details for the complete review.\",\n  ];\n  while (isCurrent() && !signal?.aborted) {\n    const choice: { value: \"cancel\" | \"approve\" | \"details\" } = { value: \"cancel\" };\n    const menu = defineMenu<undefined, \"confirm\", \"choose\", ReviewContext>({\n      start: \"confirm\",\n      screens: {\n        confirm: () => ({\n          kind: \"choice\",\n          title,\n          lines,\n          initialItemId: \"cancel\",\n          items: [\n            { id: \"cancel\", label: \"No, cancel\" },\n            { id: \"approve\", label: `Yes, ${confirmationLabel}` },\n            { id: \"details\", label: \"View details\" },\n          ],\n          action: \"choose\",\n          hint: \"close\",\n        }),\n      },\n      actions: {\n        choose: ({ itemId }) => {\n          if (itemId === \"approve\" || itemId === \"details\") choice.value = itemId;\n          return { kind: \"close\" };\n        },\n      },\n    });\n    const result =\n      ctx.mode === \"tui\" && ctx.hasUI\n        ? await runCustomInteraction<SyncConfirmationChoice, ReviewContext>(ctx, {\n            create: ({ tui, theme, keybindings, complete }) =>\n              createSyncConfirmation({ title, lines, confirmationLabel, tui, theme, keybindings, complete }),\n            signal,\n            isCurrent,\n            onError: () => {},\n          })\n        : await runMenu(ctx, menu, { getState: () => undefined, signal, isCurrent, onError: () => {} });\n    if (!isCurrent() || signal?.aborted) return false;\n    if (result.kind === \"error\") throw new Error(\"Sync review failed; no transfer was performed.\");\n    if (result.kind === \"unsupported\")\n      throw new Error(\"Sync review requires observable TUI or RPC; review the plan before using --yes.\");\n    if (result.kind === \"completed\") choice.value = result.value;\n    else if (result.kind !== \"closed\") return false;\n    // Keep authorization separate from UI termination in both adapters.\n    if (choice.value === \"approve\") return true;\n    if (choice.value !== \"details\") return false;\n    const detail = await runDocumentReview(ctx, {\n      title: \"Sync change details\",\n      content,\n      format: { kind: \"text\" },\n      viewportSize: \"adaptive\",\n      hint: \"back\",\n      signal,\n      isCurrent,\n      onError: () => {},\n    });\n    if (!isCurrent() || signal?.aborted) return false;\n    if (detail.kind === \"error\") throw new Error(\"Sync review failed; no transfer was performed.\");\n    if (detail.kind !== \"cancelled\" || detail.reason !== \"back\") return false;\n    // A fresh menu discards remembered selection: returning from details always selects No.\n    // Unlike Pi's native Yes-first dialog, approval requires moving off the safe default.\n  }\n  return false;\n}\n", "import type { KeybindingsManager, Theme } from \"@earendil-works/pi-coding-agent\";\nimport { Key, matchesKey, SelectList, type TUI, type TuiMouseEvent, truncateToWidth } from \"@earendil-works/pi-tui\";\nimport { HorizontalRule, hardWrapTerminalDocument, sanitizeTerminalText } from \"@narumitw/pi-tui-kit\";\n\nexport type SyncConfirmationChoice = \"cancel\" | \"approve\" | \"details\";\n\n/** Kit choice context is clipped on short terminals; this summary must remain reviewable. */\nexport function createSyncConfirmation(options: {\n  title: string;\n  lines: readonly string[];\n  confirmationLabel: string;\n  tui: TUI;\n  theme: Theme;\n  keybindings: KeybindingsManager;\n  complete(choice: SyncConfirmationChoice): void;\n}) {\n  const { tui, theme, keybindings } = options;\n  const choices: SyncConfirmationChoice[] = [\"cancel\", \"approve\", \"details\"];\n  const list = new SelectList(\n    [\n      { value: \"cancel\", label: \"No, cancel\" },\n      { value: \"approve\", label: `Yes, ${sanitizeTerminalText(options.confirmationLabel)}` },\n      { value: \"details\", label: \"View details\" },\n    ],\n    3,\n    {\n      selectedPrefix: (text) => theme.fg(\"accent\", text),\n      selectedText: (text) => theme.fg(\"accent\", text),\n      description: (text) => theme.fg(\"muted\", text),\n      scrollInfo: (text) => theme.fg(\"dim\", text),\n      noMatch: (text) => theme.fg(\"muted\", text),\n    },\n  );\n  const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg(\"border\", text) });\n  let selected = 0;\n  let offset = 0;\n  let maximumOffset = 0;\n  let lastWidth = 0;\n  let lastRows = 0;\n  let seen = new Set<number>();\n  let summary: readonly string[] = [];\n  let reviewed = false;\n  let disposed = false;\n  let finished = false;\n  let summaryStart = 0;\n  let summaryEnd = 0;\n  let actionsStart = 0;\n  const finish = (choice: SyncConfirmationChoice) => {\n    if (disposed || finished) return;\n    finished = true;\n    options.complete(choice);\n  };\n  const select = (index: number) => {\n    selected = (index + choices.length) % choices.length;\n    list.setSelectedIndex(selected);\n  };\n  list.onSelectionChange = (item) => {\n    selected = Math.max(0, choices.indexOf(item.value as SyncConfirmationChoice));\n  };\n  list.onSelect = (item) => {\n    const choice = choices[selected] ?? \"cancel\";\n    if (item.value === choice && (choice !== \"approve\" || reviewed)) finish(choice);\n  };\n  const component = {\n    render(width: number, expose = true): string[] {\n      if (!Number.isFinite(width) || width <= 0) {\n        reviewed = false;\n        return [];\n      }\n      const cells = Math.floor(width);\n      const rows = Math.max(1, Math.floor(tui.terminal.rows) - 3);\n      if (cells !== lastWidth || rows !== lastRows) {\n        // Reflow can expose previously unseen rows or hide the selected action.\n        // Reset proof and selection rather than carry approval across a resize.\n        summary = options.lines.flatMap((line) => hardWrapTerminalDocument(line, cells));\n        seen = new Set();\n        offset = 0;\n        select(0);\n        lastWidth = cells;\n        lastRows = rows;\n      }\n      const framed = rows >= 9;\n      const actions = list.render(cells);\n      const viewport = Math.max(0, rows - actions.length - 3 - (framed ? 2 : 0));\n      maximumOffset = Math.max(0, summary.length - viewport);\n      offset = Math.min(offset, maximumOffset);\n      const visible = summary.slice(offset, offset + viewport);\n      if (expose) for (let index = offset; index < offset + visible.length; index++) seen.add(index);\n      reviewed = viewport > 0 && seen.size === summary.length;\n      // Describe actions without advertising configured keys that can be invalid,\n      // aliased, or shadowed by an earlier cancellation/navigation binding.\n      const hint = reviewed ? \"Select an action.\" : \"Navigation keys scroll the summary before selecting Yes.\";\n      const body = [\n        theme.fg(\"accent\", theme.bold(hardWrapTerminalDocument(options.title, cells).join(\" \"))),\n        ...visible.map((line) => theme.fg(\"text\", line)),\n        theme.fg(\n          \"muted\",\n          `Summary ${visible.length ? offset + 1 : 0}-${offset + visible.length}/${summary.length}${reviewed ? \"\" : \" \u2014 review before Yes\"}`,\n        ),\n        ...actions,\n        theme.fg(\"dim\", hint),\n      ];\n      summaryStart = Number(framed) + 1;\n      summaryEnd = summaryStart + visible.length;\n      actionsStart = summaryEnd + 1;\n      const frame = framed ? [...rule.render(cells), ...body, ...rule.render(cells)] : body;\n      // Very small terminals cannot display the summary and all choices together.\n      // Keep cancellation available, but never approve a zero-row summary viewport.\n      return frame.slice(0, rows).map((line) => truncateToWidth(line, cells, \"\"));\n    },\n    invalidate() {\n      list.invalidate();\n      rule.invalidate();\n    },\n    handleInput(data: string) {\n      if (disposed || finished) return;\n      if (matchesKey(data, Key.ctrl(\"c\")) || keybindings.matches(data, \"tui.select.cancel\")) {\n        finish(\"cancel\");\n        return;\n      }\n      // Refresh height/width proof before handling an input racing with terminal resize.\n      component.render(tui.terminal.columns ?? lastWidth, false);\n      if (keybindings.matches(data, \"tui.select.up\")) {\n        if (!reviewed || (selected === 0 && offset > 0)) offset = Math.max(0, offset - 1);\n        else select(selected - 1);\n      } else if (keybindings.matches(data, \"tui.select.down\")) {\n        if (!reviewed || (selected === 0 && offset < maximumOffset)) offset = Math.min(maximumOffset, offset + 1);\n        else select(selected + 1);\n      } else if (keybindings.matches(data, \"tui.select.confirm\")) {\n        const choice = choices[selected] ?? \"cancel\";\n        if (choice !== \"approve\" || reviewed) finish(choice);\n      }\n      tui.requestRender();\n    },\n    handleMouse(event: TuiMouseEvent) {\n      if (disposed || finished || event.width !== lastWidth) return undefined;\n      component.render(event.width, false);\n      if (event.y >= summaryStart && event.y < summaryEnd && event.type === \"wheel\" && event.wheelDelta) {\n        offset = Math.max(0, Math.min(maximumOffset, offset + (event.wheelDelta < 0 ? -1 : 1)));\n        select(0);\n        tui.requestRender();\n        return { handled: true, render: true };\n      }\n      if (event.y < actionsStart || event.y >= actionsStart + choices.length || event.y >= lastRows) return undefined;\n      return list.handleMouse({ ...event, y: event.y - actionsStart, height: choices.length });\n    },\n    dispose() {\n      disposed = true;\n      seen.clear();\n    },\n  };\n  return component;\n}\n"],
+  "mappings": "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",
+  "names": ["truncateToWidth", "truncateToWidth"]
+}