@narumitw/pi-sync 0.57.0 → 0.57.2

package/README.md

@@ -186,7 +186,7 @@ Shutdown behavior is unchanged: when **Automatic sync** is On and sessions are i
 
 **Warning:** eligible conflict text is sent to the selected Pi model and can incur costs. Accepted results can replace/delete selected local and remote content without another transfer prompt. The resolver has no tools or parent conversation, and validates candidate ownership and current versions before using the existing publication/backup/journal flow. Validation is not a guarantee of semantic correctness or lossless editing against other local processes.
 
-The first implementation resolves bounded overlapping `AGENTS.md` and prompt/skill Markdown/plain-text edits, and selects complete atomic global settings units. Verified ancestors are required. Code, session histories, deletion conflicts and path collisions are not model-resolved; unsupported/refused work pauses, unless existing partial-sync policy permits independent progress. No resources reload automatically. Disabling stops subsequent authorization, not completed writes or provider charges. Read [Agent mode settings, limits, privacy and recovery](./skills/configure-pi-sync/references/configuration.md#experimental-agent-mode) before enabling.
+The first implementation resolves bounded overlapping `AGENTS.md` and prompt/skill Markdown/plain-text edits, and selects complete atomic global settings units. For `settings.json` packages, it keeps the higher explicit npm SemVer version from local and remote without a registry lookup; incompatible filters and non-comparable sources retain existing conflict handling. Verified ancestors are required. Code, session histories, deletion conflicts and path collisions are not model-resolved; unsupported/refused work pauses, unless existing partial-sync policy permits independent progress. No resources reload automatically. Disabling stops subsequent authorization, not completed writes or provider charges. Read [Agent mode settings, limits, privacy and recovery](./skills/configure-pi-sync/references/configuration.md#experimental-agent-mode) before enabling.
 
 ### Experimental Continuous sync
 

package/dist/chunks/{agent-candidate-3JN6DJKT.ts → agent-candidate-GNEYR225.ts}

@@ -5,8 +5,8 @@ import {
   buildAgentEvidence,
   digest,
   parseAgentCandidate
-} from "./chunk-FQOSHGJ7.ts";
-import "./chunk-5Q5SSKNG.ts";
+} from "./chunk-5QAE3G3K.ts";
+import "./chunk-S7QS4AWK.ts";
 import "./chunk-QOFMXPM5.ts";
 import "./chunk-IWZH5KYS.ts";
 import "./chunk-76NB4R7U.ts";
@@ -23,4 +23,4 @@ export {
   digest,
   parseAgentCandidate
 };
-//# sourceMappingURL=agent-candidate-3JN6DJKT.ts.map
+//# sourceMappingURL=agent-candidate-GNEYR225.ts.map

package/dist/chunks/{agent-plan-QCUJWBP4.ts → agent-plan-K3CRYVXV.ts}

@@ -19,8 +19,8 @@ import {
   applyAgentCandidate,
   buildAgentEvidence,
   digest
-} from "./chunk-FQOSHGJ7.ts";
-import "./chunk-5Q5SSKNG.ts";
+} from "./chunk-5QAE3G3K.ts";
+import "./chunk-S7QS4AWK.ts";
 import {
   createSnapshot
 } from "./chunk-QOFMXPM5.ts";
@@ -96,4 +96,4 @@ async function resolveAgentPlan(ctx, options, config, backend, state, local, loc
 export {
   resolveAgentPlan
 };
-//# sourceMappingURL=agent-plan-QCUJWBP4.ts.map
+//# sourceMappingURL=agent-plan-K3CRYVXV.ts.map

package/dist/chunks/{chunk-QSHMOL3I.ts → chunk-4TQWFLOQ.ts}

@@ -553,6 +553,7 @@ import {
   decodeKittyPrintable,
   Key,
   matchesKey,
+  renderFakeCursor,
   Text,
   truncateToWidth
 } from "@earendil-works/pi-tui";
@@ -590,7 +591,8 @@ async function promptSecret(ctx, title, options = { required: true }) {
           input.focused = focused;
         },
         render(width) {
-          const safeWidth = Math.max(1, width);
+          const safeWidth = Number.isFinite(width) ? Math.max(0, Math.floor(width)) : 0;
+          if (safeWidth === 0) return [];
           return [...heading.render(safeWidth), ...input.render(safeWidth), ...hint.render(safeWidth)].map(
             (line) => truncateToWidth(line, safeWidth)
           );
@@ -709,7 +711,7 @@ var MaskedInput = class {
   render(width) {
     const prompt = "> ";
     const available = width - prompt.length;
-    if (available <= 0) return [truncateToWidth(prompt, Math.max(1, width))];
+    if (available <= 0) return [truncateToWidth(prompt, Math.max(0, width))];
     const contentWidth = Math.max(0, available - 1);
     let start = 0;
     if (this.value.length > contentWidth) {
@@ -722,7 +724,7 @@ var MaskedInput = class {
     const atCursor = visibleCursor < masks.length ? MASK : " ";
     const after = masks.slice(visibleCursor + (visibleCursor < masks.length ? 1 : 0)).join("");
     const marker = this.focused ? CURSOR_MARKER : "";
-    const line = `${prompt}${before}${marker}\x1B[7m${atCursor}\x1B[27m${after}`;
+    const line = `${prompt}${before}${marker}${renderFakeCursor(atCursor)}${after}`;
     return [truncateToWidth(line, width, "")];
   }
   invalidate() {
@@ -1198,4 +1200,4 @@ export {
   showAddWebDavStorageProfile,
   showEditWebDavStorageProfile
 };
-//# sourceMappingURL=chunk-QSHMOL3I.ts.map
+//# sourceMappingURL=chunk-4TQWFLOQ.ts.map

package/dist/chunks/chunk-4TQWFLOQ.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/commands/setup-completions.ts", "../../src/ui/setup/text-input.ts", "../../src/ui/setup/setup-location-ui.ts", "../../src/ui/setup/setup-prompts.ts", "../../src/ui/setup/setup-review.ts", "../../src/ui/setup/git-ui.ts", "../../src/ui/secret-input.ts", "../../src/ui/setup/s3-credentials-ui.ts", "../../src/ui/setup/s3-ui.ts", "../../src/ui/setup/webdav-ui.ts"],
+  "sourcesContent": ["import { configuredSyncSetupNames } from \"../settings/settings-store.js\";\nimport { setSyncSetupCompletions } from \"./command.js\";\n\nexport async function refreshTargetCompletions() {\n  setSyncSetupCompletions(await configuredSyncSetupNames());\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { normalizeS3Bucket, requiredString } from \"../../settings/settings-validation.js\";\nimport { errorMessage } from \"../../sync/sync-errors.js\";\nimport { safeTerminalText } from \"../terminal-text.js\";\n\nexport type ValidateInput = (value: string) => string | Promise<string>;\n\nexport async function requiredExistingBucket(ctx: ExtensionCommandContext, example: string, signal?: AbortSignal) {\n  return requiredValueInput(\n    ctx,\n    \"Existing bucket\\n\\nThe bucket must already exist; pi-sync will not create it.\",\n    example,\n    signal,\n    normalizeS3Bucket,\n  );\n}\n\nexport async function requiredInput(\n  ctx: ExtensionCommandContext,\n  title: string,\n  defaultValue: string,\n  signal?: AbortSignal,\n  validate?: ValidateInput,\n) {\n  return promptTextInput(ctx, title, { defaultValue, validate, rejectPlaceholders: true }, signal);\n}\n\nexport async function requiredValueInput(\n  ctx: ExtensionCommandContext,\n  title: string,\n  example: string,\n  signal?: AbortSignal,\n  validate?: ValidateInput,\n) {\n  return promptTextInput(ctx, title, { example, validate, rejectPlaceholders: true }, signal);\n}\n\nexport async function promptTextInput(\n  ctx: ExtensionCommandContext,\n  title: string,\n  options: {\n    defaultValue?: string;\n    example?: string;\n    validate?: ValidateInput;\n    rejectPlaceholders?: boolean;\n  },\n  signal?: AbortSignal,\n) {\n  // Pi ignores placeholders. Keep defaults/examples visible; only an explicit blank accepts a default.\n  const hint =\n    options.defaultValue !== undefined\n      ? `Default: ${safeTerminalText(options.defaultValue)} (leave blank to keep)`\n      : `Example: ${safeTerminalText(options.example ?? \"\")}\\nEnter your own value; this example is not a default.`;\n  while (true) {\n    signal?.throwIfAborted();\n    const value = await ctx.ui.input(`${title}\\n\\n${hint}`, undefined, { signal });\n    signal?.throwIfAborted();\n    if (value === undefined) return undefined;\n    try {\n      const normalized = value.trim() || options.defaultValue;\n      if (!normalized) throw new Error(`${title.split(\"\\n\")[0]} is required.`);\n      if (options.rejectPlaceholders && /[<>]/u.test(normalized)) {\n        throw new Error(\"Replace example placeholders such as <account-id> with your own value.\");\n      }\n      const checked = requiredString(normalized, title.split(\"\\n\")[0] ?? \"value\");\n      const result = options.validate ? await options.validate(checked) : checked;\n      signal?.throwIfAborted();\n      return result;\n    } catch (error) {\n      signal?.throwIfAborted();\n      ctx.ui.notify(`${errorMessage(error)} Enter a corrected value, or cancel.`, \"warning\");\n    }\n  }\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { normalizeGitBranch } from \"../../backends/git/git-config.js\";\nimport { readLocalConfigObject } from \"../../settings/settings-store.js\";\nimport type { StorageConnectionSettings, SyncSetupSettings } from \"../../settings/settings-types.js\";\nimport {\n  effectiveSyncSetupRemoteIdentity,\n  normalizeStoragePath,\n  ownRecord,\n} from \"../../settings/settings-validation.js\";\nimport { errorMessage } from \"../../sync/sync-errors.js\";\nimport { safeTerminalText } from \"../terminal-text.js\";\nimport { promptTextInput, requiredExistingBucket, requiredInput, requiredValueInput } from \"./text-input.js\";\n\ninterface ChosenRemoteLocation {\n  connectionName: string;\n  bucket: string;\n  path: string;\n}\n\nexport async function chooseInitialRemoteLocation(\n  ctx: ExtensionCommandContext,\n  _preset: string,\n  setupName: string,\n  signal?: AbortSignal,\n): Promise<ChosenRemoteLocation | undefined> {\n  const choice = await ctx.ui.select(\n    \"Choose storage location\\n\\nUse an existing bucket. ./ stores snapshots at the bucket root; a custom path keeps them in a separate folder.\",\n    [\"Use an existing bucket at ./\", \"Customize remote location\", \"Cancel\"],\n    { signal },\n  );\n  if (signal?.aborted || !choice || choice === \"Cancel\") return undefined;\n  if (choice === \"Customize remote location\") return chooseCustomRemoteLocation(ctx, setupName, signal);\n  const bucket = await requiredExistingBucket(ctx, \"pi-sync\", signal);\n  return bucket ? { connectionName: setupName, bucket, path: \"./\" } : undefined;\n}\n\nexport async function chooseAdditionalRemoteLocation(\n  ctx: ExtensionCommandContext,\n  settings: Record<string, unknown>,\n  connectionName: string,\n  setupName: string,\n  signal?: AbortSignal,\n): Promise<Omit<ChosenRemoteLocation, \"connectionName\"> | undefined> {\n  const setups = ownRecord(settings.syncSetups) ?? {};\n  const currentSetup = typeof settings.activeSyncSetup === \"string\" ? settings.activeSyncSetup : undefined;\n  const candidates = Object.entries(setups)\n    .map(([name, value]) => ({ name, storage: ownRecord(ownRecord(value)?.storage) }))\n    .filter(\n      (item): item is { name: string; storage: Record<string, unknown> } =>\n        item.storage?.connection === connectionName && typeof item.storage.bucket === \"string\",\n    );\n  const source =\n    candidates.find((item) => item.name === currentSetup) ??\n    candidates.sort((left, right) => left.name.localeCompare(right.name))[0];\n  if (source) {\n    const suggestedPath = \"./\";\n    const sameBucketLabel = `Same bucket as \u201C${safeTerminalText(source.name)}\u201D`;\n    const choice = await ctx.ui.select(\n      [\n        `Storage location for \u201C${safeTerminalText(setupName)}\u201D`,\n        \"\",\n        `Existing bucket: ${safeTerminalText(String(source.storage.bucket))}`,\n        `Remote path: ${safeTerminalText(suggestedPath)}`,\n        \"./ uses the bucket root. Use a different path or bucket for independent setups.\",\n      ].join(\"\\n\"),\n      [sameBucketLabel, \"Use a different bucket\", \"Customize remote location\", \"Cancel\"],\n      { signal },\n    );\n    if (signal?.aborted || !choice || choice === \"Cancel\") return undefined;\n    if (choice === sameBucketLabel) {\n      return { bucket: String(source.storage.bucket), path: suggestedPath };\n    }\n    if (choice === \"Use a different bucket\") {\n      const bucket = await requiredExistingBucket(ctx, \"pi-sync\", signal);\n      return bucket ? { bucket, path: \"./\" } : undefined;\n    }\n    const custom = await chooseCustomRemoteLocation(ctx, connectionName, signal);\n    return custom ? { bucket: custom.bucket, path: custom.path } : undefined;\n  }\n\n  const location = await chooseInitialRemoteLocation(ctx, \"S3\", setupName, signal);\n  return location ? { bucket: location.bucket, path: location.path } : undefined;\n}\n\nasync function chooseCustomRemoteLocation(\n  ctx: ExtensionCommandContext,\n  connectionName: string,\n  signal?: AbortSignal,\n): Promise<ChosenRemoteLocation | undefined> {\n  const bucket = await requiredExistingBucket(ctx, \"pi-sync\", signal);\n  if (!bucket) return undefined;\n  const storagePath = await requiredInput(\n    ctx,\n    \"Storage path\\n\\nPath inside the bucket, not your local filesystem.\\n./ uses the bucket root. Use different paths for independent setups.\",\n    \"./\",\n    signal,\n    normalizeStoragePath,\n  );\n  if (!storagePath) return undefined;\n  return { connectionName, bucket, path: normalizeStoragePath(storagePath) };\n}\n\n/** Early UI check only; the settings writer still validates uniqueness under its lock. */\nexport async function promptAvailableSetupStorage<T extends SyncSetupSettings[\"storage\"]>(\n  ctx: ExtensionCommandContext,\n  initial: T,\n  signal?: AbortSignal,\n): Promise<T | undefined> {\n  let storage = initial;\n  while (!signal?.aborted) {\n    const settings = await readLocalConfigObject();\n    if (signal?.aborted) return undefined;\n    const connection = settings?.storageConnections[storage.connection];\n    if (!settings || !connection) throw new Error(\"Storage connection changed; reopen setup.\");\n    const identity = setupPublicationIdentity(storage, connection);\n    const occupied = Object.entries(settings.syncSetups).find(\n      ([, setup]) =>\n        setupPublicationIdentity(setup.storage, settings.storageConnections[setup.storage.connection]) === identity,\n    );\n    if (!occupied) return storage;\n    const git = connection.type === \"git\";\n    const message = `${git ? \"Git branch\" : \"Storage location\"} is already used by \u201C${safeTerminalText(occupied[0])}\u201D. ${git ? \"Use a different branch; pi-sync owns the entire branch.\" : \"Enter a different storage path, or cancel to choose another connection or bucket.\"}`;\n    ctx.ui.notify(message, \"warning\");\n    const title = `${git ? \"Git branch for the new setup\" : \"Storage path for the new setup\"}\\n\\n${message}`;\n    const example = git ? \"pi-sync/work\" : \"backups/work\";\n    const value =\n      connection.type === \"webdav\"\n        ? await promptTextInput(ctx, title, { example }, signal)\n        : await requiredValueInput(ctx, title, example, signal);\n    if (signal?.aborted || value === undefined) return undefined;\n    try {\n      storage = git\n        ? { ...storage, branch: normalizeGitBranch(value) }\n        : { ...storage, path: normalizeStoragePath(value) };\n    } catch (error) {\n      ctx.ui.notify(safeTerminalText(errorMessage(error)), \"warning\");\n    }\n  }\n  return undefined;\n}\n\nfunction setupPublicationIdentity(storage: SyncSetupSettings[\"storage\"], connection: StorageConnectionSettings) {\n  // Git publications own a complete branch tree; changing only its directory is not isolation.\n  return effectiveSyncSetupRemoteIdentity(\n    {\n      storage: connection.type === \"git\" ? { ...storage, path: \"./\" } : storage,\n      sync: { include: [], automatic: false },\n    },\n    connection,\n  );\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { readLocalConfigObject } from \"../../settings/settings-store.js\";\nimport { validateConfigName } from \"../../settings/settings-validation.js\";\nimport { DEFAULT_SYNC_INCLUDE } from \"../../sync/sync-policy.js\";\nimport { AUTOMATIC_SYNC_DESCRIPTION } from \"../sync-behavior.js\";\nimport { safeTerminalText } from \"../terminal-text.js\";\n\nexport { AUTOMATIC_SYNC_DESCRIPTION } from \"../sync-behavior.js\";\n\nimport { promptTextInput } from \"./text-input.js\";\n\nexport async function readSetupConnection(name: string, signal?: AbortSignal) {\n  const connection = (await readLocalConfigObject())?.storageConnections[name];\n  signal?.throwIfAborted();\n  if (!connection) throw new Error(\"Storage connection changed; reopen setup.\");\n  return connection;\n}\n\nexport async function chooseSetupContent(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  const choice = await ctx.ui.select(\n    \"Choose included content\\n\\nRecommended: Pi settings, instructions, skills, prompts, themes, and extensions.\\nMinimal: settings.json and AGENTS.md.\\nReview the exact paths before saving.\",\n    [\"Recommended Pi settings\", \"Minimal settings\", \"Cancel\"],\n    { signal },\n  );\n  signal?.throwIfAborted();\n  if (!choice || choice === \"Cancel\") return undefined;\n  return choice === \"Minimal settings\" ? [\"settings.json\", \"AGENTS.md\"] : [...DEFAULT_SYNC_INCLUDE];\n}\n\nexport async function chooseAutomaticSync(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  const choice = await ctx.ui.select(\n    `Automatic sync for this setup\\n\\n${AUTOMATIC_SYNC_DESCRIPTION}`,\n    [\"Keep automatic sync off\", \"Enable automatic sync\", \"Cancel\"],\n    { signal },\n  );\n  signal?.throwIfAborted();\n  return !choice || choice === \"Cancel\" ? undefined : choice === \"Enable automatic sync\";\n}\n\nexport async function chooseSessions(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  const choice = await ctx.ui.select(\n    \"Session conversations\\n\\nSessions can contain prompts, tool output, paths, screenshots, and secrets.\",\n    [\"Keep sessions off (recommended)\", \"Include session conversations\", \"Cancel\"],\n    { signal },\n  );\n  signal?.throwIfAborted();\n  if (!choice || choice === \"Cancel\") return undefined;\n  if (choice !== \"Include session conversations\") return false;\n  const confirmed = await ctx.ui.confirm(\n    \"Include session conversations?\",\n    \"I understand that session JSONL can contain prompts, tool output, paths, screenshots, and secrets.\",\n    { signal },\n  );\n  signal?.throwIfAborted();\n  return confirmed ? true : undefined;\n}\n\nexport function includedContentLines(include: readonly string[], sessions = false) {\n  const paths = [...include, ...(sessions && !include.includes(\"sessions\") ? [\"sessions\"] : [])];\n  return [\n    `Included content: ${paths.length} paths`,\n    ...paths.map((item) => `  ${safeTerminalText(item)}`),\n    `Sessions: ${sessions ? \"On \u2014 privacy warning acknowledged\" : \"Off\"}`,\n  ];\n}\n\nexport async function promptResourceName(\n  ctx: ExtensionCommandContext,\n  kind: \"sync setup\" | \"storage connection\",\n  defaultValue: string,\n  signal?: AbortSignal,\n  literalBrackets = false,\n) {\n  return promptTextInput(\n    ctx,\n    `Name this ${kind}\\n\\nA local label, such as home or work.`,\n    {\n      defaultValue,\n      rejectPlaceholders: !literalBrackets,\n      validate: async (name) => {\n        validateConfigName(name, kind);\n        const settings = await readLocalConfigObject();\n        signal?.throwIfAborted();\n        const names = kind === \"sync setup\" ? settings?.syncSetups : settings?.storageConnections;\n        if (names && Object.hasOwn(names, name)) {\n          throw new Error(`A ${kind} with this name already exists. Choose a different name.`);\n        }\n        return name;\n      },\n    },\n    signal,\n  );\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { defineMenu, runMenu } from \"@narumitw/pi-tui-kit\";\nimport { syncErrorGuidance } from \"../../sync/sync-error-guidance.js\";\n\n/** A settings draft is committed only after review; retryable I/O failures retain the same draft. */\nexport async function saveReviewedDraft(\n  ctx: ExtensionCommandContext,\n  title: string,\n  lines: readonly string[],\n  label: string,\n  save: (signal: AbortSignal) => Promise<unknown>,\n  signal?: AbortSignal,\n) {\n  let saved = false;\n  let failure: unknown;\n  let failureText: string | undefined;\n  const menu = defineMenu<undefined, \"review\", \"save\", ExtensionCommandContext>({\n    start: \"review\",\n    screens: {\n      review: () => ({\n        kind: \"review\",\n        title,\n        content: [...(failureText ? [failureText, \"\"] : []), ...lines].join(\"\\n\"),\n        lines: [\"Review before saving. Back cancels this draft.\"],\n        format: { kind: \"text\" },\n        viewportSize: \"adaptive\",\n        confirm: { id: \"save\", label, action: \"save\" },\n        hint: \"back\",\n      }),\n    },\n    actions: {\n      save: async ({ signal: actionSignal }) => {\n        try {\n          actionSignal.throwIfAborted();\n          await save(actionSignal);\n          saved = true;\n          return { kind: \"close\" };\n        } catch (error) {\n          if (actionSignal.aborted) return { kind: \"close\" };\n          // Do not silently rebase a stale review or overwrite an invalid settings file.\n          // The caller must reopen current settings for those failures.\n          if (!retryableSettingsError(error)) {\n            failure = error;\n            return { kind: \"close\" };\n          }\n          failureText = `Not saved. ${syncErrorGuidance(error)}\\nYour draft is retained. Fix the problem, then save again, or cancel.`;\n          ctx.ui.notify(failureText, \"error\");\n          return { kind: \"stay\" };\n        }\n      },\n    },\n  });\n  const result = await runMenu(ctx, menu, {\n    getState: () => undefined,\n    signal,\n    isCurrent: () => !signal?.aborted,\n  });\n  if (signal?.aborted) return false;\n  if (failure) throw failure;\n  if (result.kind === \"error\") throw result.error;\n  return saved;\n}\n\nfunction retryableSettingsError(error: unknown) {\n  const code = (error as NodeJS.ErrnoException | undefined)?.code;\n  return (\n    code !== undefined && [\"EACCES\", \"EPERM\", \"ENOSPC\", \"EBUSY\", \"EIO\", \"EMFILE\", \"ENFILE\", \"EROFS\"].includes(code)\n  );\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { normalizeGitBranch, normalizeGitDirectory, normalizeGitRemote } from \"../../backends/git/git-config.js\";\nimport {\n  addStorageConnection,\n  addSyncSetup,\n  saveNewV3Settings,\n  updateStorageConnection,\n  updateSyncSetup,\n} from \"../../settings/settings-management.js\";\nimport type { PartialConfig } from \"../../settings/settings-types.js\";\nimport { automaticSyncSummary } from \"../automatic-sync-summary.js\";\nimport { safeTerminalText } from \"../terminal-text.js\";\nimport { promptAvailableSetupStorage } from \"./setup-location-ui.js\";\nimport {\n  chooseAutomaticSync,\n  chooseSetupContent,\n  includedContentLines,\n  promptResourceName,\n  readSetupConnection,\n} from \"./setup-prompts.js\";\nimport { saveReviewedDraft } from \"./setup-review.js\";\nimport { requiredInput, requiredValueInput } from \"./text-input.js\";\n\nexport async function showGitSetup(ctx: ExtensionCommandContext, targetName: string, signal?: AbortSignal) {\n  const remote = await promptGitRemote(ctx, signal);\n  if (!remote) return false;\n  const destination = await promptGitDestination(ctx, signal);\n  if (!destination) return false;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return false;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review Git sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(targetName)}`,\n      `Storage connection: ${safeTerminalText(targetName)} (Git)`,\n      `Remote: ${safeTerminalText(remote)}`,\n      `Sync branch: ${safeTerminalText(destination.branch)}`,\n      `Storage location: ${safeTerminalText(destination.directory)}`,\n      ...includedContentLines(include),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      \"Authentication: existing Git credential helper or SSH configuration (not stored by pi-sync).\",\n      \"pi-sync manages the entire branch. The repository must already exist; a new branch is created on first push.\",\n      \"Saving does not contact remote storage or start syncing.\",\n    ],\n    \"Save setup\",\n    (saveSignal) =>\n      saveNewV3Settings(\n        {\n          setupName: targetName,\n          connectionName: targetName,\n          connection: { type: \"git\", remote },\n          setup: {\n            storage: {\n              connection: targetName,\n              branch: destination.branch,\n              path: destination.directory,\n            },\n            sync: { include, automatic },\n          },\n        },\n        saveSignal,\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted)\n    ctx.ui.notify(`Saved Git sync setup \u201C${safeTerminalText(targetName)}\u201D. Choose Sync now to start.`, \"info\");\n  return saved;\n}\n\nexport async function showAddGitStorageProfile(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  const name = await promptResourceName(ctx, \"storage connection\", \"git\", signal);\n  if (!name) return false;\n  const remote = await promptGitRemote(ctx, signal);\n  if (!remote) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review storage connection\",\n    [\n      `Name: ${safeTerminalText(name)}`,\n      \"Type: Git\",\n      `Remote: ${safeTerminalText(remote)}`,\n      \"Credentials: existing Git/SSH authentication (not stored)\",\n      \"Adding a connection does not contact the remote or start syncing.\",\n    ],\n    \"Add storage connection\",\n    (saveSignal) => addStorageConnection(name, { type: \"git\", remote }, saveSignal),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Added storage connection \u201C${safeTerminalText(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showEditGitStorageProfile(\n  ctx: ExtensionCommandContext,\n  name: string,\n  profile: Record<string, unknown>,\n  signal?: AbortSignal,\n  affectedSetups?: string[],\n) {\n  const remote = await promptGitRemote(ctx, signal, typeof profile.remote === \"string\" ? profile.remote : undefined);\n  if (!remote) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review storage connection\",\n    [\n      `Storage connection: ${safeTerminalText(name)}`,\n      `Remote: ${safeTerminalText(String(profile.remote ?? \"missing\"))} \u2192 ${safeTerminalText(remote)}`,\n      `Affected sync setups: ${affectedSetups?.length ? affectedSetups.map(safeTerminalText).join(\", \") : \"None\"}`,\n      \"Saving changes future storage access for every affected setup; it does not move or delete remote history.\",\n    ],\n    \"Save storage connection\",\n    (saveSignal) =>\n      updateStorageConnection(\n        name,\n        (current) => {\n          if (current.type !== \"git\" || current.remote !== profile.remote)\n            throw new Error(\"Storage connection changed while it was open; reopen it.\");\n          return { ...current, remote };\n        },\n        affectedSetups,\n        saveSignal,\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Saved storage connection \u201C${safeTerminalText(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showAddGitTarget(\n  ctx: ExtensionCommandContext,\n  name: string,\n  profile: string,\n  signal?: AbortSignal,\n) {\n  const selected = await promptGitDestination(ctx, signal);\n  if (!selected) return false;\n  const storage = await promptAvailableSetupStorage(\n    ctx,\n    { connection: profile, branch: selected.branch, path: selected.directory },\n    signal,\n  );\n  if (!storage) return false;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return false;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return false;\n  const connection = await readSetupConnection(profile, signal);\n  if (connection?.type !== \"git\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review Git sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(name)}`,\n      `Storage connection: ${safeTerminalText(profile)}`,\n      `Remote: ${safeTerminalText(connection.remote)}`,\n      `Sync branch: ${safeTerminalText(storage.branch)}`,\n      `Storage location: ${safeTerminalText(storage.path)}`,\n      ...includedContentLines(include),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      \"pi-sync manages the entire branch. Adding this setup does not sync or modify remote data.\",\n    ],\n    \"Add sync setup\",\n    (saveSignal) => addSyncSetup(name, { storage, sync: { include, automatic } }, saveSignal, connection),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Added sync setup \u201C${safeTerminalText(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showEditGitTarget(ctx: ExtensionCommandContext, partial: PartialConfig, signal?: AbortSignal) {\n  let destination = await promptGitDestination(ctx, signal, partial);\n  if (!destination) return false;\n  while (destination.directory !== partial.storagePath && destination.branch === partial.branch) {\n    ctx.ui.notify(\n      \"Changing a Git storage path requires a new Git branch so the existing branch remains readable.\",\n      \"warning\",\n    );\n    const branch = await requiredValueInput(\n      ctx,\n      \"New Git branch\\n\\nKeep the previous branch unchanged; enter a new branch for this path.\",\n      \"pi-sync/archive\",\n      signal,\n      normalizeGitBranch,\n    );\n    if (!branch) return false;\n    destination = { ...destination, branch };\n  }\n  const chosen = destination;\n  const connection = await readSetupConnection(partial.connectionName, signal);\n  if (connection.type !== \"git\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(partial.setupName)}`,\n      `Storage connection: ${safeTerminalText(partial.connectionName)}`,\n      `Remote: ${safeTerminalText(connection.remote)}`,\n      `Branch: ${safeTerminalText(partial.branch ?? \"missing\")} \u2192 ${safeTerminalText(chosen.branch)}`,\n      `Storage path: ${safeTerminalText(partial.storagePath)} \u2192 ${safeTerminalText(chosen.directory)}`,\n      \"Saving changes the future storage location only; it does not move or delete remote history.\",\n    ],\n    \"Save sync setup\",\n    (saveSignal) =>\n      updateSyncSetup(\n        partial.setupName,\n        (setup) => {\n          if (typeof setup.storage.branch !== \"string\") throw new Error(\"Sync setup storage type changed; reopen it.\");\n          return {\n            ...setup,\n            storage: { ...setup.storage, branch: chosen.branch, path: chosen.directory },\n          };\n        },\n        { expectedStorage: partial, expectedConnection: connection, signal: saveSignal },\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, \"info\");\n  return saved;\n}\n\nasync function promptGitRemote(ctx: ExtensionCommandContext, signal?: AbortSignal, current?: string) {\n  const title =\n    \"Git remote URL (SSH or HTTPS)\\n\\nUse an existing private repository with Git/SSH authentication already configured.\";\n  const validate = (value: string) => {\n    const remote = normalizeGitRemote(value);\n    if (!remote) throw new Error(\"Git remote URL is required.\");\n    return remote;\n  };\n  return current\n    ? requiredInput(ctx, title, current, signal, validate)\n    : requiredValueInput(\n        ctx,\n        title,\n        \"git@github.com:owner/private-pi-sync.git (SSH) or https://github.com/owner/private-pi-sync.git (HTTPS)\",\n        signal,\n        validate,\n      );\n}\n\nasync function promptGitDestination(\n  ctx: ExtensionCommandContext,\n  signal?: AbortSignal,\n  current: Partial<PartialConfig> = {},\n) {\n  const branch = await requiredInput(\n    ctx,\n    \"Git branch for sync snapshots\\n\\npi-sync manages this entire branch, not your local working branch.\\nUse a new branch or one already used by pi-sync; unrelated content is rejected.\",\n    current.branch ?? \"main\",\n    signal,\n    normalizeGitBranch,\n  );\n  if (!branch) return undefined;\n  const directory = await requiredInput(\n    ctx,\n    \"Git storage path\\n\\nRelative to the repository root, not your local filesystem.\\n./ stores manifest.json and files/ at the repository root.\",\n    current.storagePath ?? \"./\",\n    signal,\n    normalizeGitDirectory,\n  );\n  return directory ? { branch, directory } : undefined;\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport {\n  CURSOR_MARKER,\n  decodeKittyPrintable,\n  type Focusable,\n  Key,\n  type KeybindingsManager,\n  matchesKey,\n  renderFakeCursor,\n  Text,\n  truncateToWidth,\n} from \"@earendil-works/pi-tui\";\nimport { formatInteractionHints, runCustomInteraction } from \"@narumitw/pi-tui-kit\";\n\nconst MASK = \"\u2022\";\n\nexport async function promptSecret(\n  ctx: ExtensionCommandContext,\n  title: string,\n  options: { required?: boolean; signal?: AbortSignal } = { required: true },\n) {\n  if (ctx.mode !== \"tui\" || options.signal?.aborted) return undefined;\n  const result = await runCustomInteraction<string | undefined>(ctx, {\n    signal: options.signal,\n    isCurrent: () => !options.signal?.aborted,\n    create: ({ tui, theme, keybindings, complete }) => {\n      const heading = new Text(\"\", 0, 0);\n      const hint = new Text(\"\", 0, 0);\n      const interactionHint = formatInteractionHints(keybindings, [\n        {\n          keys: keybindings.getKeys(\"tui.input.submit\").filter((key) => !hasControlCharacter(key)),\n          label: \"continue\",\n        },\n        {\n          keys: [...keybindings.getKeys(\"tui.select.cancel\").filter((key) => !hasControlCharacter(key)), \"ctrl+c\"],\n          label: \"cancel\",\n        },\n      ]);\n      const applyTheme = () => {\n        heading.setText(theme.fg(\"accent\", theme.bold(title)));\n        hint.setText(theme.fg(\"dim\", `${interactionHint} \u2022 Input is hidden`));\n      };\n      applyTheme();\n      const input = new MaskedInput(keybindings);\n      const component: Focusable & {\n        render(width: number): string[];\n        invalidate(): void;\n        handleInput(data: string): void;\n        dispose(): void;\n      } = {\n        get focused() {\n          return input.focused;\n        },\n        set focused(focused: boolean) {\n          input.focused = focused;\n        },\n        render(width: number) {\n          const safeWidth = Number.isFinite(width) ? Math.max(0, Math.floor(width)) : 0;\n          if (safeWidth === 0) return [];\n          return [...heading.render(safeWidth), ...input.render(safeWidth), ...hint.render(safeWidth)].map((line) =>\n            truncateToWidth(line, safeWidth),\n          );\n        },\n        invalidate() {\n          applyTheme();\n          heading.invalidate();\n          input.invalidate();\n          hint.invalidate();\n        },\n        handleInput(data: string) {\n          if (matchesKey(data, Key.ctrl(\"c\"))) {\n            complete(undefined);\n          } else if (input.isPasting || data.includes(\"\\u001b[200~\")) {\n            input.handleInput(data);\n          } else if (keybindings.matches(data, \"tui.select.cancel\")) {\n            complete(undefined);\n          } else if (keybindings.matches(data, \"tui.input.submit\")) {\n            if (options.required !== false && input.getValue().length === 0) {\n              ctx.ui.notify(`${title} is required. Enter a value, or cancel.`, \"warning\");\n            } else if (hasControlCharacter(input.getValue())) {\n              ctx.ui.notify(\n                `${title} contains control characters. Remove them or re-enter the value, then continue.`,\n                \"warning\",\n              );\n            } else complete(input.getValue());\n          } else input.handleInput(data);\n          tui.requestRender();\n        },\n        dispose() {\n          input.clear();\n        },\n      };\n      return component;\n    },\n  });\n  if (result.kind === \"error\") throw result.error;\n  if (result.kind !== \"completed\" || result.value === undefined) return undefined;\n  const value = result.value;\n  if (options.required !== false && value.length === 0) {\n    ctx.ui.notify(`${title} is required.`, \"warning\");\n    return undefined;\n  }\n  return value;\n}\n\nclass MaskedInput implements Focusable {\n  focused = false;\n  private value: string[] = [];\n  private cursor = 0;\n  private paste = \"\";\n  private pasting = false;\n\n  constructor(private readonly keybindings: KeybindingsManager) {}\n\n  get isPasting() {\n    return this.pasting;\n  }\n\n  getValue() {\n    return this.value.join(\"\");\n  }\n\n  handleInput(data: string) {\n    if (data.includes(\"\\u001b[200~\")) {\n      this.pasting = true;\n      this.paste = \"\";\n      data = data.replace(\"\\u001b[200~\", \"\");\n    }\n    if (this.pasting) {\n      this.paste += data;\n      const end = this.paste.indexOf(\"\\u001b[201~\");\n      if (end < 0) return;\n      const pasted = this.paste\n        .slice(0, end)\n        .replace(/[\\r\\n]/gu, \"\")\n        .replace(/\\t/gu, \"    \");\n      this.insert(pasted);\n      const remaining = this.paste.slice(end + 6);\n      this.paste = \"\";\n      this.pasting = false;\n      if (remaining) this.handleInput(remaining);\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.deleteCharBackward\")) {\n      if (this.cursor > 0) this.value.splice(--this.cursor, 1);\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.deleteCharForward\")) {\n      if (this.cursor < this.value.length) this.value.splice(this.cursor, 1);\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.cursorLeft\")) {\n      this.cursor = Math.max(0, this.cursor - 1);\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.cursorRight\")) {\n      this.cursor = Math.min(this.value.length, this.cursor + 1);\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.cursorLineStart\")) {\n      this.cursor = 0;\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.cursorLineEnd\")) {\n      this.cursor = this.value.length;\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.deleteToLineStart\")) {\n      this.value.splice(0, this.cursor);\n      this.cursor = 0;\n      return;\n    }\n    if (this.keybindings.matches(data, \"tui.editor.deleteToLineEnd\")) {\n      this.value.splice(this.cursor);\n      return;\n    }\n    const printable = decodeKittyPrintable(data) ?? data;\n    if (!hasControlCharacter(printable)) this.insert(printable);\n  }\n\n  render(width: number) {\n    const prompt = \"> \";\n    const available = width - prompt.length;\n    if (available <= 0) return [truncateToWidth(prompt, Math.max(0, width))];\n    const contentWidth = Math.max(0, available - 1);\n    let start = 0;\n    if (this.value.length > contentWidth) {\n      start = Math.max(0, Math.min(this.cursor - Math.floor(contentWidth / 2), this.value.length - contentWidth));\n    }\n    const end = Math.min(this.value.length, start + contentWidth);\n    const visibleCursor = Math.max(0, Math.min(this.cursor - start, end - start));\n    const masks = Array.from({ length: end - start }, () => MASK);\n    const before = masks.slice(0, visibleCursor).join(\"\");\n    const atCursor = visibleCursor < masks.length ? MASK : \" \";\n    const after = masks.slice(visibleCursor + (visibleCursor < masks.length ? 1 : 0)).join(\"\");\n    const marker = this.focused ? CURSOR_MARKER : \"\";\n    const line = `${prompt}${before}${marker}${renderFakeCursor(atCursor)}${after}`;\n    return [truncateToWidth(line, width, \"\")];\n  }\n\n  invalidate() {}\n\n  clear() {\n    this.value.fill(\"\");\n    this.value = [];\n    this.paste = \"\";\n    this.cursor = 0;\n    this.pasting = false;\n  }\n\n  private insert(value: string) {\n    const characters = Array.from(value);\n    this.value.splice(this.cursor, 0, ...characters);\n    this.cursor += characters.length;\n  }\n}\n\nfunction hasControlCharacter(value: string) {\n  return [...value].some((character) => {\n    const code = character.codePointAt(0) ?? 0;\n    return code < 0x20 || (code >= 0x7f && code <= 0x9f);\n  });\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { throwIfAborted } from \"../../sync/signals.js\";\nimport { promptSecret } from \"../secret-input.js\";\nimport { requiredValueInput } from \"./text-input.js\";\n\nexport interface ChosenS3Credentials {\n  profileFields: { accessKeyId?: string; secretAccessKey?: string };\n  summary: string;\n  ready: boolean;\n  replace?: boolean;\n}\n\nexport async function chooseS3CredentialUpdate(\n  ctx: ExtensionCommandContext,\n  profile: Record<string, unknown>,\n  signal?: AbortSignal,\n) {\n  const hasStored =\n    typeof profile.accessKeyId === \"string\" &&\n    profile.accessKeyId.length > 0 &&\n    typeof profile.secretAccessKey === \"string\" &&\n    profile.secretAccessKey.length > 0;\n  if (hasStored) {\n    const action = await ctx.ui.select(\"Credentials\", [\"Keep current credentials\", \"Replace credentials\", \"Cancel\"], {\n      signal,\n    });\n    throwIfAborted(signal);\n    if (!action || action === \"Cancel\") return undefined;\n    if (action === \"Keep current credentials\") {\n      return { profileFields: {}, summary: \"Unchanged (values hidden)\", ready: true };\n    }\n  }\n  const selected = await chooseS3Credentials(ctx, signal);\n  return selected ? { ...selected, replace: true } : undefined;\n}\n\nexport function applyS3CredentialUpdate(profile: Record<string, unknown>, credentials: ChosenS3Credentials) {\n  const next = { ...profile };\n  if (credentials.replace) {\n    delete next.accessKeyId;\n    delete next.secretAccessKey;\n    delete next.sessionToken;\n  }\n  return { ...next, ...credentials.profileFields };\n}\n\nexport async function chooseS3Credentials(\n  ctx: ExtensionCommandContext,\n  signal?: AbortSignal,\n): Promise<ChosenS3Credentials | undefined> {\n  const choice = await ctx.ui.select(\n    \"Credentials\\n\\nCredentials are stored in the private pi-sync settings file. Secret values are masked during input and never shown afterward.\",\n    [\"Store credentials privately\", \"Cancel\"],\n    { signal },\n  );\n  throwIfAborted(signal);\n  if (choice !== \"Store credentials privately\") return undefined;\n  const accessKeyId = await requiredValueInput(\n    ctx,\n    \"Access key ID\\n\\nUse the S3 API access key ID issued by your provider, not the secret access key.\",\n    \"access-key-id\",\n    signal,\n  );\n  if (!accessKeyId) return undefined;\n  const secretAccessKey = await promptSecret(ctx, \"Secret access key\", { signal });\n  throwIfAborted(signal);\n  if (secretAccessKey === undefined) return undefined;\n  return {\n    profileFields: { accessKeyId, secretAccessKey },\n    summary: \"Stored privately (values hidden)\",\n    ready: true,\n  };\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport { refreshTargetCompletions } from \"../../commands/setup-completions.js\";\nimport { addSyncSetup, saveNewV3Settings, updateSyncSetup } from \"../../settings/settings-management.js\";\nimport type { PartialConfig } from \"../../settings/settings-types.js\";\nimport { normalizeS3Bucket, normalizeS3Endpoint, normalizeStoragePath } from \"../../settings/settings-validation.js\";\nimport { automaticSyncSummary } from \"../automatic-sync-summary.js\";\nimport { safeTerminalText } from \"../terminal-text.js\";\nimport { chooseS3Credentials } from \"./s3-credentials-ui.js\";\nimport {\n  chooseAdditionalRemoteLocation,\n  chooseInitialRemoteLocation,\n  promptAvailableSetupStorage,\n} from \"./setup-location-ui.js\";\nimport {\n  chooseAutomaticSync,\n  chooseSessions,\n  chooseSetupContent,\n  includedContentLines,\n  readSetupConnection,\n} from \"./setup-prompts.js\";\nimport { saveReviewedDraft } from \"./setup-review.js\";\nimport { requiredInput, requiredValueInput } from \"./text-input.js\";\n\nexport async function showS3Setup(\n  ctx: ExtensionCommandContext,\n  preset: string,\n  targetName: string,\n  signal?: AbortSignal,\n) {\n  const endpoint = await requiredValueInput(\n    ctx,\n    preset === \"Cloudflare R2\"\n      ? \"Cloudflare R2 endpoint\\n\\nCopy the S3 API endpoint from your R2 account; replace <account-id>.\"\n      : \"S3-compatible endpoint\\n\\nUse your provider's S3 API URL, not its web console.\",\n    preset === \"Cloudflare R2\" ? \"https://<account-id>.r2.cloudflarestorage.com\" : \"https://s3.example.com\",\n    signal,\n    normalizeS3Endpoint,\n  );\n  if (!endpoint) return false;\n  const region =\n    preset === \"Cloudflare R2\"\n      ? \"auto\"\n      : await requiredInput(\n          ctx,\n          \"Storage region\\n\\nUse the region assigned to your bucket by the provider.\",\n          \"us-east-1\",\n          signal,\n        );\n  if (!region) return false;\n  const location = await chooseInitialRemoteLocation(ctx, preset, targetName, signal);\n  if (!location) return false;\n  const credentials = await chooseS3Credentials(ctx, signal);\n  if (!credentials) return false;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return false;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return false;\n  const sessions = await chooseSessions(ctx, signal);\n  if (sessions === undefined) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(targetName)}`,\n      `Storage connection: ${safeTerminalText(location.connectionName)} (${preset})`,\n      `Endpoint: ${safeTerminalText(endpoint)}`,\n      `Region: ${safeTerminalText(region)}`,\n      `Bucket: ${safeTerminalText(location.bucket)}`,\n      `Storage location: ${safeTerminalText(location.path)}`,\n      ...includedContentLines(include, sessions),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      `Credentials: ${credentials.summary}`,\n      \"The bucket must already exist. Saving does not contact remote storage or start syncing.\",\n    ],\n    \"Save sync setup\",\n    (saveSignal) =>\n      saveNewV3Settings(\n        {\n          setupName: targetName,\n          connectionName: location.connectionName,\n          connection: {\n            type: \"s3\",\n            endpoint,\n            region,\n            credentials: {\n              accessKeyId: credentials.profileFields.accessKeyId ?? \"\",\n              secretAccessKey: credentials.profileFields.secretAccessKey ?? \"\",\n            },\n          },\n          setup: {\n            storage: {\n              connection: location.connectionName,\n              bucket: location.bucket,\n              path: location.path,\n            },\n            sync: { include: [...include, ...(sessions ? [\"sessions\"] : [])], automatic },\n          },\n        },\n        saveSignal,\n      ),\n    signal,\n  );\n  if (!saved || signal?.aborted) return false;\n  await refreshTargetCompletions();\n  if (!signal?.aborted)\n    ctx.ui.notify(`Sync setup \u201C${safeTerminalText(targetName)}\u201D saved. Choose Sync now to start.`, \"info\");\n  return true;\n}\n\nexport async function showAddS3Target(\n  ctx: ExtensionCommandContext,\n  raw: Record<string, unknown>,\n  profile: string,\n  name: string,\n  signal?: AbortSignal,\n) {\n  const location = await chooseAdditionalRemoteLocation(ctx, raw, profile, name, signal);\n  if (!location) return;\n  const storage = await promptAvailableSetupStorage(ctx, { connection: profile, ...location }, signal);\n  if (!storage) return;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return;\n  const connection = await readSetupConnection(profile, signal);\n  if (connection.type !== \"s3\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review new sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(name)}`,\n      `Storage connection: ${safeTerminalText(profile)}`,\n      `Endpoint: ${safeTerminalText(connection.endpoint)}`,\n      `Bucket: ${safeTerminalText(storage.bucket)}`,\n      `Storage location: ${safeTerminalText(storage.path)}`,\n      ...includedContentLines(include),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      \"Only the current setup is checked at startup. Shutdown can push selected content when sessions are included.\",\n      \"The bucket must already exist. Adding this setup does not sync or modify remote data.\",\n    ],\n    \"Add sync setup\",\n    (saveSignal) => addSyncSetup(name, { storage, sync: { include, automatic } }, saveSignal, connection),\n    signal,\n  );\n  if (!saved || signal?.aborted) return;\n  await refreshTargetCompletions();\n  if (!signal?.aborted) ctx.ui.notify(`Added sync setup \u201C${safeTerminalText(name)}\u201D.`, \"info\");\n}\n\nexport async function showEditS3Target(ctx: ExtensionCommandContext, partial: PartialConfig, signal?: AbortSignal) {\n  const bucket = await requiredInput(\n    ctx,\n    \"Bucket\\n\\nUse an existing bucket; pi-sync will not create it.\",\n    partial.bucket ?? \"pi-sync\",\n    signal,\n    normalizeS3Bucket,\n  );\n  if (!bucket) return;\n  const storagePath = await requiredInput(\n    ctx,\n    \"Storage path\\n\\nPath inside the bucket, not your local filesystem. ./ uses the bucket root.\",\n    partial.storagePath,\n    signal,\n    normalizeStoragePath,\n  );\n  if (!storagePath) return;\n  const connection = await readSetupConnection(partial.connectionName, signal);\n  if (connection.type !== \"s3\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review sync setup\",\n    [\n      `Sync setup: ${safeTerminalText(partial.setupName)}`,\n      `Storage connection: ${safeTerminalText(partial.connectionName)}`,\n      `Endpoint: ${safeTerminalText(connection.endpoint)}`,\n      `Bucket: ${safeTerminalText(partial.bucket ?? \"missing\")} \u2192 ${safeTerminalText(bucket)}`,\n      `Storage path: ${safeTerminalText(partial.storagePath)} \u2192 ${safeTerminalText(storagePath)}`,\n      \"Saving changes the future storage location only; it does not move or delete remote data.\",\n    ],\n    \"Save sync setup\",\n    (saveSignal) =>\n      updateSyncSetup(\n        partial.setupName,\n        (setup) => {\n          if (typeof setup.storage.bucket !== \"string\") throw new Error(\"Sync setup storage type changed; reopen it.\");\n          return { ...setup, storage: { ...setup.storage, bucket, path: storagePath } };\n        },\n        { expectedStorage: partial, expectedConnection: connection, signal: saveSignal },\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, \"info\");\n}\n", "import type { ExtensionCommandContext } from \"@earendil-works/pi-coding-agent\";\nimport {\n  normalizeWebDavPath,\n  normalizeWebDavUrl,\n  validateWebDavCredentials,\n} from \"../../backends/webdav/webdav-config.js\";\nimport {\n  addStorageConnection,\n  addSyncSetup,\n  saveNewV3Settings,\n  updateStorageConnection,\n  updateSyncSetup,\n} from \"../../settings/settings-management.js\";\nimport type { PartialConfig } from \"../../settings/settings-types.js\";\nimport { automaticSyncSummary } from \"../automatic-sync-summary.js\";\nimport { promptSecret } from \"../secret-input.js\";\nimport { safeTerminalText as safe } from \"../terminal-text.js\";\nimport { promptAvailableSetupStorage } from \"./setup-location-ui.js\";\nimport {\n  chooseAutomaticSync,\n  chooseSessions,\n  chooseSetupContent,\n  includedContentLines,\n  promptResourceName,\n  readSetupConnection,\n} from \"./setup-prompts.js\";\nimport { saveReviewedDraft } from \"./setup-review.js\";\nimport { promptTextInput } from \"./text-input.js\";\n\nexport async function showWebDavSetup(ctx: ExtensionCommandContext, targetName: string, signal?: AbortSignal) {\n  const url = await promptWebDavUrl(ctx, signal);\n  if (!url) return false;\n  const username = await promptUsername(ctx, signal);\n  if (!username) return false;\n  const password = await promptSecret(ctx, \"WebDAV password\", { signal });\n  signal?.throwIfAborted();\n  if (password === undefined) return false;\n  const remotePath = await chooseDestination(ctx, signal);\n  if (!remotePath) return false;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return false;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return false;\n  const sessions = await chooseSessions(ctx, signal);\n  if (sessions === undefined) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review WebDAV setup\",\n    [\n      `Sync setup: ${safe(targetName)}`,\n      `Storage connection: ${safe(targetName)} (WebDAV)`,\n      `URL: ${safe(url)}`,\n      `Storage location: ${safe(remotePath)}`,\n      \"Username and password: stored privately (values hidden)\",\n      ...includedContentLines(include, sessions),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      \"Check setup tests whether this server can safely save sync updates using a temporary probe.\",\n      \"Saving does not contact remote storage or start syncing.\",\n    ],\n    \"Save setup\",\n    (saveSignal) =>\n      saveNewV3Settings(\n        {\n          setupName: targetName,\n          connectionName: targetName,\n          connection: { type: \"webdav\", url, credentials: { username, password } },\n          setup: {\n            storage: { connection: targetName, path: remotePath },\n            sync: { include: [...include, ...(sessions ? [\"sessions\"] : [])], automatic },\n          },\n        },\n        saveSignal,\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted)\n    ctx.ui.notify(`Sync setup \u201C${safe(targetName)}\u201D saved. Choose Sync now to start.`, \"info\");\n  return saved;\n}\n\nexport async function showAddWebDavTarget(\n  ctx: ExtensionCommandContext,\n  name: string,\n  profile: string,\n  signal?: AbortSignal,\n) {\n  const remotePath = await chooseDestination(ctx, signal);\n  if (!remotePath) return false;\n  const storage = await promptAvailableSetupStorage(ctx, { connection: profile, path: remotePath }, signal);\n  if (!storage) return false;\n  const include = await chooseSetupContent(ctx, signal);\n  if (!include) return false;\n  const automatic = await chooseAutomaticSync(ctx, signal);\n  if (automatic === undefined) return false;\n  const connection = await readSetupConnection(profile, signal);\n  if (connection.type !== \"webdav\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review WebDAV sync setup\",\n    [\n      `Sync setup: ${safe(name)}`,\n      `Storage connection: ${safe(profile)}`,\n      `URL: ${safe(connection.url)}`,\n      `Storage location: ${safe(storage.path)}`,\n      ...includedContentLines(include),\n      `Automatic sync: ${automaticSyncSummary(automatic)}`,\n      \"Adding this setup does not sync or modify remote data.\",\n    ],\n    \"Add sync setup\",\n    (saveSignal) => addSyncSetup(name, { storage, sync: { include, automatic } }, saveSignal, connection),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Added sync setup \u201C${safe(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showEditWebDavTarget(ctx: ExtensionCommandContext, partial: PartialConfig, signal?: AbortSignal) {\n  const remotePath = await chooseDestination(ctx, signal, partial.storagePath);\n  if (!remotePath) return false;\n  const connection = await readSetupConnection(partial.connectionName, signal);\n  if (connection.type !== \"webdav\") throw new Error(\"Storage connection changed; reopen setup.\");\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review sync setup\",\n    [\n      `Sync setup: ${safe(partial.setupName)}`,\n      `Storage connection: ${safe(partial.connectionName)}`,\n      `URL: ${safe(connection.url)}`,\n      `Storage path: ${safe(partial.storagePath)} \u2192 ${safe(remotePath)}`,\n      \"Saving changes the future storage location only; it does not move or delete remote data.\",\n    ],\n    \"Save sync setup\",\n    (saveSignal) =>\n      updateSyncSetup(\n        partial.setupName,\n        (setup) => ({\n          ...setup,\n          storage: { ...setup.storage, path: remotePath },\n        }),\n        { expectedStorage: partial, expectedConnection: connection, signal: saveSignal },\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safe(partial.setupName)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showAddWebDavStorageProfile(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  const name = await promptResourceName(ctx, \"storage connection\", \"webdav\", signal, true);\n  if (!name) return false;\n  const url = await promptWebDavUrl(ctx, signal);\n  if (!url) return false;\n  const username = await promptUsername(ctx, signal);\n  if (!username) return false;\n  const password = await promptSecret(ctx, \"WebDAV password\", { signal });\n  signal?.throwIfAborted();\n  if (password === undefined) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review storage connection\",\n    [\n      `Name: ${safe(name)}`,\n      \"Type: WebDAV\",\n      `URL: ${safe(url)}`,\n      \"Username and password: stored privately (values hidden)\",\n      \"Adding a connection does not contact the server or start syncing.\",\n    ],\n    \"Add storage connection\",\n    (saveSignal) =>\n      addStorageConnection(name, { type: \"webdav\", url, credentials: { username, password } }, saveSignal),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Added storage connection \u201C${safe(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nexport async function showEditWebDavStorageProfile(\n  ctx: ExtensionCommandContext,\n  name: string,\n  profile: Record<string, unknown>,\n  signal?: AbortSignal,\n  affectedSetups?: string[],\n) {\n  const url = await promptWebDavUrl(ctx, signal, typeof profile.url === \"string\" ? profile.url : undefined);\n  if (!url) return false;\n  const username = await promptUsername(ctx, signal);\n  if (!username) return false;\n  const hasPassword = typeof profile.password === \"string\" && profile.password.length > 0;\n  const passwordAction = hasPassword\n    ? await select(ctx, \"WebDAV password\", [\"Keep current password\", \"Replace password\", \"Cancel\"], signal)\n    : \"Replace password\";\n  if (!passwordAction || passwordAction === \"Cancel\") return false;\n  const replacePassword = passwordAction === \"Replace password\";\n  const password = replacePassword ? await promptSecret(ctx, \"New WebDAV password\", { signal }) : undefined;\n  signal?.throwIfAborted();\n  if (replacePassword && password === undefined) return false;\n  const saved = await saveReviewedDraft(\n    ctx,\n    \"Review storage connection\",\n    [\n      `Storage connection: ${safe(name)}`,\n      `URL: ${safe(String(profile.url))} \u2192 ${safe(url)}`,\n      \"Username: stored privately (value hidden)\",\n      `Password: ${replacePassword ? \"will be replaced\" : \"unchanged\"} (value hidden)`,\n      `Affected sync setups: ${affectedSetups?.length ? affectedSetups.map(safe).join(\", \") : \"None\"}`,\n      \"Saving changes future storage access for every affected setup; it does not move remote data.\",\n    ],\n    \"Save storage connection\",\n    (saveSignal) =>\n      updateStorageConnection(\n        name,\n        (current) => {\n          if (\n            current.type !== \"webdav\" ||\n            current.url !== profile.url ||\n            current.credentials.username !== profile.username ||\n            current.credentials.password !== profile.password\n          )\n            throw new Error(\"Storage connection changed while it was open; reopen it.\");\n          return {\n            ...current,\n            url,\n            credentials: {\n              ...current.credentials,\n              username,\n              password: password ?? current.credentials.password,\n            },\n          };\n        },\n        affectedSetups,\n        saveSignal,\n      ),\n    signal,\n  );\n  if (saved && !signal?.aborted) ctx.ui.notify(`Saved storage connection \u201C${safe(name)}\u201D.`, \"info\");\n  return saved;\n}\n\nasync function chooseDestination(ctx: ExtensionCommandContext, signal?: AbortSignal, current = \"./\") {\n  return promptTextInput(\n    ctx,\n    \"WebDAV storage path\\n\\nFolder relative to the collection URL, not your local filesystem.\\n./ uses the collection root. Use different folders for independent setups.\",\n    { defaultValue: current, validate: normalizeWebDavPath },\n    signal,\n  );\n}\n\nasync function promptUsername(ctx: ExtensionCommandContext, signal?: AbortSignal) {\n  return promptTextInput(\n    ctx,\n    \"WebDAV username\\n\\nEnter the account username; stored values remain hidden.\",\n    {\n      example: \"user\",\n      validate: (value) => {\n        validateWebDavCredentials(value);\n        return value;\n      },\n    },\n    signal,\n  );\n}\n\nasync function promptWebDavUrl(ctx: ExtensionCommandContext, signal?: AbortSignal, current?: string) {\n  return promptTextInput(\n    ctx,\n    \"WebDAV collection URL\\n\\nUse the HTTPS WebDAV URL from your provider, not its web login page.\",\n    {\n      ...(current ? { defaultValue: current } : { example: \"https://cloud.example.com/remote.php/dav/files/user\" }),\n      validate: (value) => {\n        const url = normalizeWebDavUrl(value);\n        if (!url) throw new Error(\"WebDAV URL is required.\");\n        return url;\n      },\n    },\n    signal,\n  );\n}\n\nasync function select(ctx: ExtensionCommandContext, title: string, options: string[], signal?: AbortSignal) {\n  const value = await ctx.ui.select(title, options, { signal });\n  signal?.throwIfAborted();\n  return value;\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{chunk-FQOSHGJ7.ts → chunk-5QAE3G3K.ts}

@@ -4,7 +4,7 @@ import {
   COUPLED_FIELDS,
   mergeSettingsJson,
   snapshotFile
-} from "./chunk-5Q5SSKNG.ts";
+} from "./chunk-S7QS4AWK.ts";
 import {
   scanSnapshot
 } from "./chunk-QOFMXPM5.ts";
@@ -87,9 +87,13 @@ function buildAgentEvidence(plan, local, remote, ancestors) {
       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 merge = mergeSettingsJson(
+          ...versions.map((value) => Buffer.from(value)),
+          void 0,
+          true
+        );
+        if (merge.kind === "review" && merge.reason !== "field-conflict") throw new Error("unsupported settings");
+        const fields = new Set(merge.kind === "review" ? 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]));
@@ -187,7 +191,8 @@ function applyAgentCandidate(plan, evidence, candidate) {
         Buffer.from(file.base),
         Buffer.from(file.local),
         Buffer.from(file.remote),
-        selections
+        selections,
+        true
       );
       if (merged.kind !== "merged") throw new Error("Agent settings units remain unresolved.");
       parseSettingsDocument(merged.content);
@@ -212,4 +217,4 @@ export {
   parseAgentCandidate,
   applyAgentCandidate
 };
-//# sourceMappingURL=chunk-FQOSHGJ7.ts.map
+//# sourceMappingURL=chunk-5QAE3G3K.ts.map

package/dist/chunks/chunk-5QAE3G3K.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(\n          ...(versions.map((value) => Buffer.from(value)) as [Buffer, Buffer, Buffer]),\n          undefined,\n          true,\n        );\n        if (merge.kind === \"review\" && merge.reason !== \"field-conflict\") throw new Error(\"unsupported settings\");\n        const fields = new Set(merge.kind === \"review\" ? 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        true,\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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,kBAAkB;AAuCpB,IAAM,SAAS,CAAC,UAAmB,WAAW,QAAQ,EAAE,OAAO,KAAK,UAAU,KAAK,CAAC,EAAE,OAAO,KAAK;AAEzG,SAAS,SAAS,GAAS,GAAS;AAClC,SAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MACtC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MACjC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE;AACrC;AAGA,SAAS,UAAU,UAAkB,UAAkB,WAAmB,YAA4C;AACpH,QAAM,OAAO,MAAM,QAAQ;AAC3B,QAAM,UAAU;AAAA,IACd,GAAG,MAAM,MAAM,MAAM,SAAS,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,MAAM,QAAiB,EAAE;AAAA,IACpF,GAAG,MAAM,MAAM,MAAM,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,MAAM,SAAkB,EAAE;AAAA,EACxF,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG;AACnD,QAAM,WAA+B,CAAC;AACtC,aAAW,UAAU,SAAS;AAC5B,UAAM,OAAO,SAAS,GAAG,EAAE;AAC3B,QAAI,MAAM,KAAK,CAAC,SAAS,SAAS,MAAM,MAAM,CAAC,EAAG,MAAK,KAAK,MAAM;AAAA,QAC7D,UAAS,KAAK,CAAC,MAAM,CAAC;AAAA,EAC7B;AACA,QAAM,SAAiC,CAAC;AACxC,MAAI,SAAS;AACb,aAAW,WAAW,UAAU;AAC9B,UAAM,QAAQ,KAAK,IAAI,GAAG,QAAQ,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC;AAC3D,UAAM,MAAM,KAAK,IAAI,GAAG,QAAQ,IAAI,CAAC,SAAS,KAAK,GAAG,CAAC;AACvD,WAAO,KAAK,KAAK,MAAM,QAAQ,KAAK,EAAE,KAAK,EAAE,CAAC;AAC9C,UAAM,QAAQ,CAAC,SAA6B;AAC1C,UAAI,WAAW;AACf,YAAM,SAAmB,CAAC;AAC1B,iBAAW,QAAQ,QAAQ,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG;AAC/D,eAAO,KAAK,GAAG,KAAK,MAAM,UAAU,KAAK,KAAK,GAAG,GAAG,KAAK,KAAK;AAC9D,mBAAW,KAAK;AAAA,MAClB;AACA,aAAO,CAAC,GAAG,QAAQ,GAAG,KAAK,MAAM,UAAU,GAAG,CAAC,EAAE,KAAK,EAAE;AAAA,IAC1D;AACA,UAAM,QAAQ,MAAM,OAAO;AAC3B,UAAM,SAAS,MAAM,QAAQ;AAC7B,UAAM,WAAW,KAAK,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE;AAC/C,QAAI,UAAU,UAAU,UAAU,YAAY,WAAW,SAAU,QAAO,KAAK,UAAU,WAAW,SAAS,KAAK;AAAA,QAC7G,QAAO,KAAK,EAAE,IAAI,IAAI,MAAM,UAAU,MAAM,QAAQ,MAAM,UAAU,OAAO,OAAO,CAAC;AACxF,aAAS;AAAA,EACX;AACA,SAAO,KAAK,KAAK,MAAM,MAAM,EAAE,KAAK,EAAE,CAAC;AACvC,SAAO;AACT;AAEO,SAAS,mBACd,MACA,OACA,QACA,WACe;AACf,QAAM,WAA0B,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,aAAa,CAAC,EAAE;AACxE,MAAI,KAAK,SAAS,UAAW,QAAO;AACpC,MAAI,KAAK,UAAU,SAAS;AAC1B,UAAM,IAAI,MAAM,kEAAkE;AACpF,aAAW,YAAY,KAAK,WAAW;AACrC,QAAI;AACF,UAAI,SAAS,WAAW,eAAgB,OAAM,IAAI,MAAM,sBAAsB;AAC9E,YAAM,WAAW,CAAC,WAAW,MAAM,OAAO,OAAO,KAAK,EAAE,IAAI,CAAC,UAAU;AACrE,cAAMA,QAAO,MAAM,KAAK,CAAC,SAAS,KAAK,SAAS,SAAS,IAAI;AAC7D,YAAI,CAACA,MAAM,OAAM,IAAI,MAAM,0BAA0B;AACrD,cAAM,QAAQ,OAAO,KAAKA,MAAK,eAAe,QAAQ;AACtD,YAAI,MAAM,SAAS,KAAM,OAAM,IAAI,MAAM,YAAY;AACrD,eAAO,KAAK,KAAK;AAAA,MACnB,CAAC;AACD,YAAM,CAAC,MAAM,MAAM,KAAK,IAAI;AAC5B,YAAM,OAAsB,EAAE,MAAM,SAAS,MAAM,MAAM,OAAO,MAAM,QAAQ,MAAM;AACpF,UAAI;AACJ,UAAI,SAAS,SAAS,iBAAiB;AACrC,cAAM,YAAY,SAAS,IAAI,CAAC,UAAU,sBAAsB,OAAO,KAAK,KAAK,CAAC,CAAC;AACnF,cAAM,QAAQ;AAAA,UACZ,GAAI,SAAS,IAAI,CAAC,UAAU,OAAO,KAAK,KAAK,CAAC;AAAA,UAC9C;AAAA,UACA;AAAA,QACF;AACA,YAAI,MAAM,SAAS,YAAY,MAAM,WAAW,iBAAkB,OAAM,IAAI,MAAM,sBAAsB;AACxG,cAAM,SAAS,IAAI,IAAI,MAAM,SAAS,WAAW,MAAM,SAAS,CAAC,CAAC;AAClE,cAAM,SAAS,eAAe,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,CAAa;AACnE,cAAM,UAAU,IAAI,IAAI,OAAO,KAAK,CAAC;AACrC,eAAO,KAAK,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACjF,aAAK,SAAS,CAAC;AACf,gBAAQ,OACL,OAAO,CAAC,UAAU,MAAM,KAAK,CAAC,QAAQ,OAAO,IAAI,GAAG,CAAC,CAAC,EACtD,IAAI,CAAC,UAAU;AACd,gBAAM,SAAS,UAAU;AAAA,YAAI,CAAC,aAC5B,KAAK;AAAA,cACH,OAAO;AAAA,gBACL,MAAM,QAAQ,CAAC,QAAQ;AACrB,wBAAM,OAAO,SAAS,KAAK,QAAQ,IAAI,GAAG,GAAG;AAC7C,yBAAO,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC;AAAA,gBACvC,CAAC;AAAA,cACH;AAAA,YACF;AAAA,UACF;AACA,gBAAM,OAAkB;AAAA,YACtB,IAAI;AAAA,YACJ,MAAM,KAAK;AAAA,YACX,MAAM;AAAA,YACN,MAAM,OAAO,CAAC,KAAK;AAAA,YACnB,OAAO,OAAO,CAAC,KAAK;AAAA,YACpB,QAAQ,OAAO,CAAC,KAAK;AAAA,UACvB;AACA,eAAK,QAAQ,KAAK,EAAE,IAAI,OAAO,SAAS,MAAM,SAAS,KAAK,OAAO,MAAM,GAAG,KAAK,MAAM,CAAC,KAAK,GAAG,CAAC;AACjG,iBAAO;AAAA,QACT,CAAC;AAAA,MACL,OAAO;AACL,YAAI,CAAC,gBAAgB,SAAS,IAAI,EAAG,OAAM,IAAI,MAAM,kBAAkB;AACvE,aAAK,QAAQ,UAAU,KAAK,MAAM,MAAM,MAAM,KAAK;AACnD,gBAAQ,KAAK,MAAM,OAAO,CAAC,SAA4B,OAAO,SAAS,QAAQ;AAAA,MACjF;AACA,iBAAW,QAAQ,OAAO;AACxB,aAAK,KAAK,OAAO,SAAS,MAAM,MAAM;AACtC,iBAAS,MAAM,KAAK,IAAI;AAAA,MAC1B;AACA,eAAS,MAAM,KAAK,IAAI;AAAA,IAC1B,QAAQ;AACN,eAAS,YAAY,KAAK,SAAS,IAAI;AAAA,IACzC;AAAA,EACF;AACA,MAAI,SAAS,MAAM,SAAS,mBAAmB,OAAO,WAAW,KAAK,UAAU,SAAS,KAAK,CAAC,IAAI;AACjG,UAAM,IAAI,MAAM,+DAA+D;AAEjF,MACE,aAAa;AAAA,IACX,GAAG;AAAA,IACH,OAAO,SAAS,MAAM;AAAA,MAAQ,CAAC,SAC7B,CAAC,KAAK,MAAM,KAAK,MAAM,KAAK,OAAO,KAAK,MAAM,EAAE,IAAI,CAAC,UAAU,aAAa,KAAK,MAAM,OAAO,KAAK,KAAK,CAAC,CAAC;AAAA,IAC5G;AAAA,EACF,CAAC,EAAE;AAEH,UAAM,IAAI,MAAM,+EAA+E;AACjG,SAAO;AACT;AAEO,SAAS,oBAAoB,KAAa,UAAyC;AACxF,MAAI,OAAO,WAAW,GAAG,IAAI,mBAAoB,OAAM,IAAI,MAAM,iCAAiC;AAClG,QAAM,SAAS,wBAAwB,OAAO,KAAK,GAAG,CAAC,EAAE,KAAK;AAC9D,MACE,OAAO,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,qBACzC,OAAO,YAAY,KACnB,CAAC,MAAM,QAAQ,OAAO,OAAO,KAC7B,OAAO,QAAQ,WAAW,SAAS,MAAM;AAEzC,UAAM,IAAI,MAAM,mCAAmC;AACrD,QAAM,OAAO,oBAAI,IAAY;AAC7B,aAAW,UAAU,OAAO,SAAS;AACnC,QAAI,CAAC,UAAU,OAAO,WAAW,YAAY,MAAM,QAAQ,MAAM,EAAG,OAAM,IAAI,MAAM,uBAAuB;AAC3G,UAAM,MAAM;AACZ,UAAM,OAAO,SAAS,MAAM,KAAK,CAACC,UAASA,MAAK,OAAO,IAAI,EAAE;AAC7D,QAAI,CAAC,QAAQ,KAAK,IAAI,KAAK,EAAE,EAAG,OAAM,IAAI,MAAM,kCAAkC;AAClF,SAAK,IAAI,KAAK,EAAE;AAChB,UAAM,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG;AAC7C,QAAI,SAAS,eAAe,IAAI,WAAW,KAAM;AACjD,QAAI,KAAK,SAAS,cAAc,SAAS,gBAAgB,IAAI,WAAW,WAAW,IAAI,WAAW;AAChG;AACF,QAAI,KAAK,SAAS,UAAU,SAAS,gBAAgB,OAAO,IAAI,YAAY,YAAY,IAAI,QAAQ,SAAS,GAAG;AAC9G,WAAK,OAAO,KAAK,IAAI,OAAO,CAAC;AAC7B,UAAI,8BAA8B,KAAK,IAAI,OAAO,EAAG,OAAM,IAAI,MAAM,8BAA8B;AACnG;AAAA,IACF;AACA,UAAM,IAAI,MAAM,2BAA2B;AAAA,EAC7C;AACA,SAAO;AACT;AAEO,SAAS,oBACd,MACA,UACA,WACe;AAEf,sBAAoB,KAAK,UAAU,SAAS,GAAG,QAAQ;AACvD,MAAI,KAAK,SAAS,UAAW,OAAM,IAAI,MAAM,wBAAwB;AACrE,QAAM,UAAU,IAAI,IAAI,UAAU,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;AACrE,QAAM,eAAe,oBAAI,IAA0B;AACnD,aAAW,QAAQ,SAAS,OAAO;AACjC,UAAM,QAAQ,SAAS,MAAM,OAAO,CAAC,SAAS,KAAK,SAAS,KAAK,IAAI;AACrE,QAAI,MAAM,KAAK,CAAC,SAAS,QAAQ,IAAI,KAAK,EAAE,KAAK,aAAa,QAAQ,IAAI,KAAK,EAAE,KAAK,CAAC,EAAE,EAAG;AAC5F,QAAI;AACJ,QAAI,KAAK,OAAO;AACd,cAAQ,OAAO;AAAA,QACb,KAAK,MACF,IAAI,CAAC,SAAU,OAAO,SAAS,WAAW,OAAQ,QAAQ,IAAI,KAAK,EAAE,EAA0B,OAAQ,EACvG,KAAK,EAAE;AAAA,MACZ;AAAA,IACF,OAAO;AACL,YAAM,aAAa,IAAI;AAAA,SACpB,KAAK,UAAU,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,MAAM,CAAC,KAAM,QAAQ,IAAI,EAAE,EAAqC,MAAM,CAAC;AAAA,MAC5G;AACA,YAAM,SAAS;AAAA,QACb,OAAO,KAAK,KAAK,IAAI;AAAA,QACrB,OAAO,KAAK,KAAK,KAAK;AAAA,QACtB,OAAO,KAAK,KAAK,MAAM;AAAA,QACvB;AAAA,QACA;AAAA,MACF;AACA,UAAI,OAAO,SAAS,SAAU,OAAM,IAAI,MAAM,yCAAyC;AAEvF,4BAAsB,OAAO,OAAO;AACpC,iBAAW,EAAE,IAAI,KAAK,KAAK,UAAU,CAAC,GAAG;AACvC,YAAI,CAAC,WAAW,IAAI,GAAG,EAAG,OAAM,IAAI,MAAM,oCAAoC;AAAA,MAChF;AACA,cAAQ,OAAO;AAAA,IACjB;AACA,QAAI,MAAM,SAAS,mBAAoB,OAAM,IAAI,MAAM,kCAAkC;AACzF,iBAAa,IAAI,KAAK,MAAM,aAAa,KAAK,MAAM,KAAK,CAAC;AAAA,EAC5D;AACA,QAAM,YAAY,KAAK,UAAU,IAAI,CAAC,aAAa;AACjD,UAAM,OAAO,aAAa,IAAI,SAAS,IAAI;AAC3C,WAAO,QAAQ,SAAS,SAAS,aAC7B,EAAE,MAAM,YAAqB,MAAM,KAAK,MAAM,QAAQ,UAAmB,KAAK,IAC9E;AAAA,EACN,CAAC;AACD,SAAO,EAAE,MAAM,WAAW,WAAW,WAAW,UAAU,OAAO,CAAC,SAAS,KAAK,SAAS,UAAU,EAAE;AACvG;",
+  "names": ["file", "unit"]
+}

package/dist/chunks/{chunk-S2FMH5FT.ts → chunk-QOC47PBC.ts}

@@ -27,7 +27,7 @@ async function withAgentSyncLock(ctx, options, run) {
     request = error;
   }
   const { withAgentClaim, readAgentCandidate, saveAgentCandidate } = await import("./agent-store-A3F6IYWZ.ts");
-  const { parseAgentCandidate } = await import("./agent-candidate-3JN6DJKT.ts");
+  const { parseAgentCandidate } = await import("./agent-candidate-GNEYR225.ts");
   const { runAgentResolver } = await import("./agent-runner-E2JU2VZ6.ts");
   return withAgentClaim(async (assertOwner) => {
     const clearStatus = () => setSyncStatus(ctx, void 0);
@@ -94,4 +94,4 @@ async function withAgentSyncLock(ctx, options, run) {
 export {
   withAgentSyncLock
 };
-//# sourceMappingURL=chunk-S2FMH5FT.ts.map
+//# sourceMappingURL=chunk-QOC47PBC.ts.map

package/dist/chunks/{chunk-5Q5SSKNG.ts → chunk-S7QS4AWK.ts}

@@ -74,6 +74,58 @@ async function resolveContentConflicts(config, state, local, remote, plan, prote
   };
 }
 
+// src/sync/package-merge.ts
+import { compare, valid } from "semver";
+function entries(value) {
+  if (!Array.isArray(value)) return void 0;
+  const result = /* @__PURE__ */ new Map();
+  for (const item of value) {
+    if (typeof item !== "string" && (!item || Array.isArray(item) || typeof item !== "object")) return void 0;
+    const source = typeof item === "string" ? item : item.source;
+    if (typeof source !== "string") return void 0;
+    const spec = source.startsWith("npm:") ? source.slice(4).trim() : void 0;
+    const match = spec?.match(/^(@?[^@]+(?:\/[^@]+)?)(?:@(.+))?$/u);
+    const key = match ? `npm:${match[1]}` : source;
+    if (result.has(key)) return void 0;
+    const options = typeof item === "string" ? null : Object.fromEntries(Object.entries(item).filter(([key2]) => key2 !== "source"));
+    result.set(key, { value: item, options, version: match?.[2] });
+  }
+  return result;
+}
+function mergePackageVersions(base, local, remote) {
+  const ancestor = entries(base ?? []);
+  const left = entries(local);
+  const right = entries(remote);
+  if (!ancestor || !left || !right) return void 0;
+  const otherEntries = (items) => [...items].filter(([key]) => !key.startsWith("npm:")).map(([, entry]) => entry.value);
+  if (!jsonEqual(otherEntries(ancestor), otherEntries(left)) || !jsonEqual(otherEntries(ancestor), otherEntries(right)))
+    return void 0;
+  const baseKeys = [...ancestor.keys()];
+  const leftKeys = [...left.keys()];
+  const rightKeys = [...right.keys()];
+  const order = jsonEqual(leftKeys, rightKeys) ? leftKeys : jsonEqual(leftKeys, baseKeys) ? rightKeys : jsonEqual(rightKeys, baseKeys) ? leftKeys : void 0;
+  if (!order) return void 0;
+  const output = [];
+  for (const key of /* @__PURE__ */ new Set([...order, ...baseKeys])) {
+    const a = ancestor.get(key);
+    const l = left.get(key);
+    const r = right.get(key);
+    let chosen;
+    if (l && r && key.startsWith("npm:") && l.version && r.version && valid(l.version) && valid(r.version) && jsonEqual(l.options, r.options)) {
+      const precedence = compare(l.version, r.version);
+      if (precedence !== 0) chosen = precedence > 0 ? l : r;
+    }
+    if (!chosen) {
+      if (jsonEqual(l?.value, r?.value)) chosen = l;
+      else if (jsonEqual(l?.value, a?.value)) chosen = r;
+      else if (jsonEqual(r?.value, a?.value)) chosen = l;
+      else return void 0;
+    }
+    if (chosen) output.push(chosen.value);
+  }
+  return output;
+}
+
 // src/sync/settings-merge.ts
 var COUPLED_FIELDS = [
   ["defaultProvider", "defaultModel"],
@@ -82,7 +134,34 @@ var COUPLED_FIELDS = [
   ["skills", "enableSkillCommands"],
   ["enableAnalytics", "trackingId"]
 ];
-function mergeSettingsJson(ancestor, local, remote, selections = /* @__PURE__ */ new Map()) {
+function selectPackages(base, left, right) {
+  const packages = mergePackageVersions(
+    base.root.members.get("packages")?.node.value,
+    left.root.members.get("packages")?.node.value,
+    right.root.members.get("packages")?.node.value
+  );
+  if (!packages) return void 0;
+  const document = [left, right].find((source) => jsonEqual(source.root.members.get("packages")?.node.value, packages)) ?? parseSettingsDocument(Buffer.from(JSON.stringify({ packages })));
+  const node = document.root.members.get("packages")?.node;
+  return node ? { document, node } : void 0;
+}
+function mergeAcceptedSettingsPackages(ancestor, local, remote, accepted) {
+  try {
+    const base = parseSettingsDocument(ancestor);
+    const left = parseSettingsDocument(local);
+    const right = parseSettingsDocument(remote);
+    const document = parseSettingsDocument(accepted);
+    const packages = selectPackages(base, left, right);
+    if (!packages || jsonEqual(packages.node.value, document.root.members.get("packages")?.node.value))
+      return void 0;
+    const selected = new Map([...document.root.members].map(([key, member]) => [key, { document, node: member.node }]));
+    selected.set("packages", packages);
+    return renderSettingsMembers(document, selected);
+  } catch {
+    return void 0;
+  }
+}
+function mergeSettingsJson(ancestor, local, remote, selections = /* @__PURE__ */ new Map(), preferHigherPackageVersions = false) {
   let documents;
   try {
     documents = [ancestor, local, remote].map(parseSettingsDocument);
@@ -97,6 +176,13 @@ function mergeSettingsJson(ancestor, local, remote, selections = /* @__PURE__ */
   units.push(...[...fields].filter((field) => !coupled.has(field)).map((field) => [field]));
   const conflicts = [];
   for (const unit of units) {
+    if (preferHigherPackageVersions && unit[0] === "packages") {
+      const packages = selectPackages(base, left, right);
+      if (packages) {
+        selected.set("packages", packages);
+        continue;
+      }
+    }
     const equal = (first, second) => unit.every(
       (field) => jsonEqual(first.root.members.get(field)?.node.value, second.root.members.get(field)?.node.value)
     );
@@ -123,6 +209,7 @@ export {
   snapshotFile,
   resolveContentConflicts,
   COUPLED_FIELDS,
+  mergeAcceptedSettingsPackages,
   mergeSettingsJson
 };
-//# sourceMappingURL=chunk-5Q5SSKNG.ts.map
+//# sourceMappingURL=chunk-S7QS4AWK.ts.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/content-conflicts.ts", "../../src/sync/package-merge.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 { compare, valid } from \"semver\";\nimport { type JsonValue, jsonEqual } from \"./json-document.js\";\n\ninterface Entry {\n  value: JsonValue;\n  version?: string;\n  options: JsonValue;\n}\n\nfunction entries(value: JsonValue | undefined): Map<string, Entry> | undefined {\n  if (!Array.isArray(value)) return undefined;\n  const result = new Map<string, Entry>();\n  for (const item of value) {\n    if (typeof item !== \"string\" && (!item || Array.isArray(item) || typeof item !== \"object\")) return undefined;\n    const source = typeof item === \"string\" ? item : item.source;\n    if (typeof source !== \"string\") return undefined;\n    const spec = source.startsWith(\"npm:\") ? source.slice(4).trim() : undefined;\n    const match = spec?.match(/^(@?[^@]+(?:\\/[^@]+)?)(?:@(.+))?$/u);\n    const key = match ? `npm:${match[1]}` : source;\n    if (result.has(key)) return undefined;\n    const options =\n      typeof item === \"string\" ? null : Object.fromEntries(Object.entries(item).filter(([key]) => key !== \"source\"));\n    result.set(key, { value: item, options, version: match?.[2] });\n  }\n  return result;\n}\n\n/** Compare only explicit npm versions; do not resolve ranges, tags, Git refs or registry state. */\nexport function mergePackageVersions(\n  base: JsonValue | undefined,\n  local: JsonValue | undefined,\n  remote: JsonValue | undefined,\n): JsonValue[] | undefined {\n  const ancestor = entries(base ?? []);\n  const left = entries(local);\n  const right = entries(remote);\n  if (!ancestor || !left || !right) return undefined;\n  // Raw Git refs and local path aliases do not prove distinct package identities.\n  // Leave changes to those sources under the existing atomic field policy.\n  const otherEntries = (items: Map<string, Entry>) =>\n    [...items].filter(([key]) => !key.startsWith(\"npm:\")).map(([, entry]) => entry.value);\n  if (!jsonEqual(otherEntries(ancestor), otherEntries(left)) || !jsonEqual(otherEntries(ancestor), otherEntries(right)))\n    return undefined;\n\n  // Package order affects resource precedence. Merge the ordered identity list\n  // atomically, then select versions without changing that order.\n  const baseKeys = [...ancestor.keys()];\n  const leftKeys = [...left.keys()];\n  const rightKeys = [...right.keys()];\n  const order = jsonEqual(leftKeys, rightKeys)\n    ? leftKeys\n    : jsonEqual(leftKeys, baseKeys)\n      ? rightKeys\n      : jsonEqual(rightKeys, baseKeys)\n        ? leftKeys\n        : undefined;\n  if (!order) return undefined;\n  const output: JsonValue[] = [];\n  for (const key of new Set([...order, ...baseKeys])) {\n    const a = ancestor.get(key);\n    const l = left.get(key);\n    const r = right.get(key);\n    let chosen: Entry | undefined;\n    if (\n      l &&\n      r &&\n      key.startsWith(\"npm:\") &&\n      l.version &&\n      r.version &&\n      valid(l.version) &&\n      valid(r.version) &&\n      jsonEqual(l.options, r.options)\n    ) {\n      const precedence = compare(l.version, r.version);\n      if (precedence !== 0) chosen = precedence > 0 ? l : r;\n    }\n    // Build metadata and equivalent version spelling do not establish a higher version.\n    if (!chosen) {\n      if (jsonEqual(l?.value, r?.value)) chosen = l;\n      else if (jsonEqual(l?.value, a?.value)) chosen = r;\n      else if (jsonEqual(r?.value, a?.value)) chosen = l;\n      else return undefined;\n    }\n    if (chosen) output.push(chosen.value);\n  }\n  return output;\n}\n", "import {\n  type JsonDocument,\n  type JsonNode,\n  jsonEqual,\n  parseSettingsDocument,\n  renderSettingsMembers,\n} from \"./json-document.js\";\n\nimport { mergePackageVersions } from \"./package-merge.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\nfunction selectPackages(base: JsonDocument, left: JsonDocument, right: JsonDocument) {\n  const packages = mergePackageVersions(\n    base.root.members.get(\"packages\")?.node.value,\n    left.root.members.get(\"packages\")?.node.value,\n    right.root.members.get(\"packages\")?.node.value,\n  );\n  if (!packages) return undefined;\n  const document =\n    [left, right].find((source) => jsonEqual(source.root.members.get(\"packages\")?.node.value, packages)) ??\n    parseSettingsDocument(Buffer.from(JSON.stringify({ packages })));\n  const node = document.root.members.get(\"packages\")?.node;\n  return node ? { document, node } : undefined;\n}\n\n/** Accepted files need only a package override, not another full-document field merge. */\nexport function mergeAcceptedSettingsPackages(\n  ancestor: Buffer,\n  local: Buffer,\n  remote: Buffer,\n  accepted: Buffer,\n): Buffer | undefined {\n  try {\n    const base = parseSettingsDocument(ancestor);\n    const left = parseSettingsDocument(local);\n    const right = parseSettingsDocument(remote);\n    const document = parseSettingsDocument(accepted);\n    const packages = selectPackages(base, left, right);\n    if (!packages || jsonEqual(packages.node.value, document.root.members.get(\"packages\")?.node.value))\n      return undefined;\n    const selected = new Map([...document.root.members].map(([key, member]) => [key, { document, node: member.node }]));\n    selected.set(\"packages\", packages);\n    return renderSettingsMembers(document, selected);\n  } catch {\n    // Unsupported settings must not replace an accepted file with a reconstructed document.\n    return undefined;\n  }\n}\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  preferHigherPackageVersions = false,\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    if (preferHigherPackageVersions && unit[0] === \"packages\") {\n      const packages = selectPackages(base, left, right);\n      if (packages) {\n        selected.set(\"packages\", packages);\n        continue;\n      }\n    }\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": ["key"]
+}