@archme/cli 0.11.1 → 0.11.2

package/dist/cli.js

@@ -13127,6 +13127,21 @@ Everything a reader sees in a sequence \u2014 arrow labels, Note text, and the c
   }
 });
 
+// ../shared/waypoints.ts
+var init_waypoints = __esm({
+  "../shared/waypoints.ts"() {
+  }
+});
+
+// ../shared/leafEndpoints.ts
+var LEAF_ENDPOINT_GUIDANCE;
+var init_leafEndpoints = __esm({
+  "../shared/leafEndpoints.ts"() {
+    init_waypoints();
+    LEAF_ENDPOINT_GUIDANCE = `- **Arrows connect leaves.** Name the component that does the work, never the parent it sits in. A component with children (other than its input/output interface ports) is a group: an arrow to it lands on the group's box and can't be followed inside, while an arrow to a leaf still draws on the parent's box whenever the parent is collapsed. If a parent's own code acts, model that code as one more child and name that child. An arrow between a component and one of its own children is always this mistake.`;
+  }
+});
+
 // ../shared/componentOrganization.ts
 var COMPONENT_ORGANIZATION_GUIDANCE;
 var init_componentOrganization = __esm({
@@ -13181,9 +13196,10 @@ ${draftBlock}Sequence diagram format:
 - Use "as" aliases for display names: participant root.api.gateway as API Gateway
 - Supports combined fragments: alt/else, opt, par/and, loop, critical/option, break
 - All participant references MUST be absolute paths prefixed with "root." (e.g., root.backend.api, never backend.api). Scope-relative paths are rejected on write \u2014 they break move_architecture's path-rewriter and the UML grouping logic.
+${LEAF_ENDPOINT_GUIDANCE}
 - Example: "sequenceDiagram\\n    root.mobile_user->>root.client: opens app\\n    root.client->>root.api.post_users: POST /users\\n    root.api.post_users->>root.db: Save new user\\n    root.db-->>root.api.post_users: user record\\n    root.api.post_users-->>root.client: Account created"
-- With branching: "sequenceDiagram\\n    root.client->>root.api: POST /upload\\n    alt File accepted\\n        root.api-->>root.client: Upload saved\\n    else Wrong type or too large\\n        root.api-->>root.client: Upload rejected\\n    end"
-- With parallelism: "sequenceDiagram\\n    root.api->>root.db: Record the upload\\n    par\\n        root.api->>root.storage: Store the file\\n    and\\n        root.api->>root.search: Make it searchable\\n    end"
+- With branching: "sequenceDiagram\\n    root.client->>root.api.upload: POST /upload\\n    alt File accepted\\n        root.api.upload-->>root.client: Upload saved\\n    else Wrong type or too large\\n        root.api.upload-->>root.client: Upload rejected\\n    end"
+- With parallelism: "sequenceDiagram\\n    root.api.upload->>root.db: Record the upload\\n    par\\n        root.api.upload->>root.storage: Store the file\\n    and\\n        root.api.upload->>root.search: Make it searchable\\n    end"
 
 ${SEQUENCE_WORDING_GUIDANCE}
 
@@ -13221,6 +13237,7 @@ var init_scanPrompts = __esm({
     init_storyNaming();
     init_storyChapterGuidance();
     init_sequenceWording();
+    init_leafEndpoints();
     init_componentOrganization();
     BUILD_METHODOLOGY = `You are a build sub-agent. You are part of a multi-agent system that builds a comprehensive visual architecture of a codebase \u2014 components, connections, and user stories that trace data flow end-to-end. Your role is to translate research findings into actual architecture: creating components backed by real code references, wiring connections between them, and building story sequence diagrams that trace how data flows through the system.
 
@@ -13229,7 +13246,7 @@ var init_scanPrompts = __esm({
 - Only build what the research findings and code evidence support. Do not invent components, connections, or user stories that aren't backed by real code. If findings are insufficient, flag gaps rather than guessing.
 - Every connection MUST have a non-empty method
 - Keep component hierarchies nested (e.g., backend > api > routes)
-- Use at: "parent" to target nested scopes for connectionUpdates
+- Name connectionUpdates endpoints with "root."-prefixed paths; each connection is stored where its endpoints meet
 - External services must be created as components with \`role: "external"\` (and \`kind: "human"\` for human actors), then referenced by dot-path in sequences like any other component
 - Small utility modules are implementation details \u2014 omit unless architecturally significant
 - Components must exist before non-draft stories can reference them. Add components first, then wire stories.
@@ -13341,8 +13358,9 @@ Component annotations:
 - Example: { id: "user-org", from: "user", to: "org", method: "belongs_to", reference: true }
 
 Connection format:
-- Use dot-paths to target interface children: "api_server.post_users"
-- ID format: "from-to" (e.g., "client-api_server.post_users")
+- Name both endpoints with "root."-prefixed dot-paths, as in sequences (or paths relative to the entry's "at"); interface children too: "root.api_server.post_users"
+- You don't choose the scope: each connection is stored where its endpoints' parents meet, and the result says where and under which id \u2014 use that "at" + id to remove it
+- id is optional: omitted, it is minted as "<from>-><to>"
 - method describes how components communicate (e.g., REST, gRPC, GraphQL, WebSocket, Kafka, function, event)`;
     FORMAT_REF_DRAFT_STORIES_BLOCK = `Draft stories:
 - Set draft: true for stories where the architecture isn't built yet
@@ -13571,6 +13589,16 @@ var init_validationCodes = __esm({
       // ──────────────────────────────────────────────────────────────────────────
       /** componentUpdates[].remove references an id that doesn't exist at scope. */
       COMPONENT_REMOVE_ID_NOT_FOUND: "component.remove.id-not-found",
+      /**
+       * WARNING (non-blocking): this write removed components, so the connections
+       * naming them (or their descendants), in any scope, were removed with them.
+       */
+      COMPONENT_REMOVE_CONNECTIONS_REMOVED: "component.remove.connections-removed",
+      /**
+       * WARNING (non-blocking): this write removed components that story sequences
+       * still name. The sequences are left as they are for the agent to fix.
+       */
+      COMPONENT_REMOVE_STORY_STILL_REFERENCES: "component.remove.story-still-references",
       // ──────────────────────────────────────────────────────────────────────────
       // connection.add
       // ──────────────────────────────────────────────────────────────────────────
@@ -13584,9 +13612,16 @@ var init_validationCodes = __esm({
       CONNECTION_ADD_MISSING_TO: "connection.add.missing-to",
       /** Missing or empty `method`. */
       CONNECTION_ADD_MISSING_METHOD: "connection.add.missing-method",
-      /** Connection emitted at a parent scope outside the current scope. */
+      /**
+       * @deprecated No longer emitted: a connection add is stored where its
+       * endpoints meet (`resolveConnectionUpdates`), whatever scope it names.
+       * Connection emitted at a parent scope outside the current scope.
+       */
       CONNECTION_AT_WRONG_SCOPE_OUTSIDE: "connection.add.wrong-scope-outside",
-      /** Connection internal to a child but added at the parent level. */
+      /**
+       * @deprecated No longer emitted, as above.
+       * Connection internal to a child but added at the parent level.
+       */
       CONNECTION_AT_WRONG_SCOPE_INTERNAL: "connection.add.wrong-scope-internal",
       // ──────────────────────────────────────────────────────────────────────────
       // connection.remove
@@ -13606,6 +13641,12 @@ var init_validationCodes = __esm({
        * One code, both sites: to an agent it's the same rule.
        */
       CONNECTION_PAIR_ALREADY_CONNECTED: "connection.add.pair-already-connected",
+      /**
+       * WARNING (non-blocking): an explicit `connectionUpdates.add` was NOT stored —
+       * a finer edge on the same pair (one endpoint a child of this one's) already
+       * says it, and the subsumption prune keeps only the finer edge.
+       */
+      CONNECTION_ADD_SUBSUMED_BY_CHILD: "connection.add.subsumed-by-child",
       // ──────────────────────────────────────────────────────────────────────────
       // story.add — story-add fields
       // ──────────────────────────────────────────────────────────────────────────
@@ -13696,6 +13737,14 @@ var init_validationCodes = __esm({
       PARTICIPANT_NOT_ROOT_PREFIXED: "sequence.participant.not-root-prefixed",
       /** Participant dot-path references a component that doesn't exist. */
       PARTICIPANT_COMPONENT_NOT_FOUND: "sequence.participant.component-not-found",
+      /**
+       * WARNING (non-blocking): an arrow in a sequence the write authored, or a
+       * `connectionUpdates` add, ends on a component with children
+       * (`LEAF_ENDPOINT_GUIDANCE`). The connection lands on the group's box instead
+       * of the part that does the work. One code for both sites, as with
+       * CONNECTION_PAIR_ALREADY_CONNECTED. Silent on a byte-identical re-send.
+       */
+      PARTICIPANT_HAS_CHILDREN: "sequence.participant.has-children",
       // ──────────────────────────────────────────────────────────────────────────
       // sequence.ref — validateSequenceRefs
       // ──────────────────────────────────────────────────────────────────────────
@@ -16540,7 +16589,19 @@ function stripPromptEcho(haystack, prompt) {
 function rateLimitDeferPlanForExit(channels, nowMs = Date.now(), defaultTimeZone = localTimeZone()) {
   const haystack = stripPromptEcho(`${channels.message}
 ${channels.stderr}`, channels.prompt);
-  return rateLimitDeferPlan(haystack, nowMs, defaultTimeZone);
+  const plan = rateLimitDeferPlan(haystack, nowMs, defaultTimeZone);
+  if (plan?.parsed) return plan;
+  return claudeErrorDeferPlan(channels.claudeError, nowMs, defaultTimeZone) ?? plan;
+}
+function claudeErrorDeferPlan(error, nowMs, defaultTimeZone) {
+  if (!error) return null;
+  const text = error.text.trim();
+  const parsed = rateLimitPauseUntil(text, nowMs, defaultTimeZone);
+  const opensWithLimit = parsed != null && text.startsWith(parsed.info.matched);
+  if (error.apiErrorStatus === 429 || error.apiErrorStatus == null && opensWithLimit) {
+    return parsed ? { parsed: true, pauseUntil: parsed.pauseUntil, info: parsed.info } : { parsed: false, pauseUntil: new Date(nowMs + RATE_LIMIT_TENTATIVE_PAUSE_MS), info: null };
+  }
+  return null;
 }
 var RATE_LIMIT_RE, MONTHS, RATE_LIMIT_TENTATIVE_PAUSE_MS, DATED_RESET_ROLLOVER_GRACE_MS, RATE_LIMIT_PAUSE_PADDING_MS, RATE_LIMIT_SHAPED_RE;
 var init_rateLimit = __esm({
@@ -17840,16 +17901,20 @@ __export(run_exports, {
   buildClaudeExitMessage: () => buildClaudeExitMessage,
   buildDevices: () => buildDevices,
   buildDiffPrompt: () => buildDiffPrompt,
+  claudeErrorDetails: () => claudeErrorDetails,
+  claudeErrorResult: () => claudeErrorResult,
   claudeFailureDetail: () => claudeFailureDetail,
   computeDiff: () => computeDiff,
   forkRepoScope: () => forkRepoScope,
+  isClaudeAuthFailure: () => isClaudeAuthFailure,
   parseClaudeResult: () => parseClaudeResult,
   parseJobTokenResponse: () => parseJobTokenResponse,
   probeMcpAuth: () => probeMcpAuth,
   readBranchMarker: () => readBranchMarker,
   routeShutdownInterrupt: () => routeShutdownInterrupt,
   runDaemon: () => runDaemon,
-  teeStream: () => teeStream
+  teeStream: () => teeStream,
+  withFailureDetail: () => withFailureDetail
 });
 import { createClient } from "@supabase/supabase-js";
 import { randomUUID } from "node:crypto";
@@ -17866,12 +17931,29 @@ function attributeKillCause(result, recorded) {
 function buildClaudeExitMessage(exitCode, causeSuffix, stderr) {
   return `claude exited ${exitCode}${causeSuffix}: ${stderr.slice(0, 4e3)}`;
 }
+function claudeErrorResult(stdout) {
+  return claudeErrorDetails(stdout)?.text || null;
+}
+function claudeErrorDetails(stdout) {
+  const parsed = parseClaudeResult(stdout);
+  return parsed.parsed && parsed.isError ? { text: parsed.summary.trim(), apiErrorStatus: parsed.apiErrorStatus } : null;
+}
 function claudeFailureDetail(stderr, stdout) {
+  const result = claudeErrorResult(stdout);
+  if (result) return result.slice(-FAILURE_DETAIL_MAX);
   if (stderr.trim() || !stdout.trim()) return null;
   const parsed = parseClaudeResult(stdout);
   const text = (parsed.parsed ? parsed.summary : stdout).trim();
   return text ? text.slice(-FAILURE_DETAIL_MAX) : null;
 }
+function isClaudeAuthFailure(errorResult, stderr) {
+  return /failed to authenticate|oauth session expired|not logged in|please run \/login/i.test(`${errorResult ?? ""}
+${stderr}`);
+}
+function withFailureDetail(message, detail) {
+  return detail ? `claude said: ${detail}
+${message}` : message;
+}
 async function routeShutdownInterrupt(id, cancelled2, fail, exitCode) {
   if (cancelled2.has(id)) return;
   if (exitCode === 0) {
@@ -18625,10 +18707,11 @@ function parseClaudeResult(stdout) {
       usage: modelUsage ? sumModelUsage(modelUsage) : null,
       costUsd: typeof d.total_cost_usd === "number" ? d.total_cost_usd : null,
       isError: d.is_error === true,
+      apiErrorStatus: typeof d.api_error_status === "number" ? d.api_error_status : null,
       parsed: true
     };
   } catch {
-    return { summary: raw, modelServed: null, usage: null, costUsd: null, isError: false, parsed: false };
+    return { summary: raw, modelServed: null, usage: null, costUsd: null, isError: false, apiErrorStatus: null, parsed: false };
   }
 }
 async function setupDigestMcp(ctx, job, deviceId) {
@@ -18917,16 +19000,30 @@ async function runJob(ctx, job, claimDeviceId) {
     if (result.exitCode !== 0) {
       const causeSuffix = cause ? ` (${result.signal ?? "exit"}, cause: ${cause})` : "";
       const stderr = result.stderr ? String(result.stderr) : "";
-      const detail = claudeFailureDetail(stderr, result.stdout ? String(result.stdout) : "");
+      const stdout = result.stdout ? String(result.stdout) : "";
+      const detail = claudeFailureDetail(stderr, stdout);
       if (detail) log(`claude output: ${detail.replace(/\n/g, " ")}`);
-      throw new Error(buildClaudeExitMessage(result.exitCode, causeSuffix, stderr));
+      throw new ClaudeRunError(
+        buildClaudeExitMessage(result.exitCode, causeSuffix, stderr),
+        detail,
+        isClaudeAuthFailure(claudeErrorResult(stdout), stderr),
+        claudeErrorDetails(stdout)
+      );
     }
     const runResult = parseClaudeResult(result.stdout ? String(result.stdout) : "");
     if (!runResult.parsed) {
       log(`warning: claude --output-format json stdout was not a JSON result object; using raw text as summary`);
     }
     if (runResult.isError) {
-      throw new Error(`claude reported is_error in its JSON result (no successful completion)`);
+      throw new ClaudeRunError(
+        `claude reported is_error in its JSON result (no successful completion)`,
+        runResult.summary.trim().slice(-FAILURE_DETAIL_MAX) || null,
+        isClaudeAuthFailure(
+          claudeErrorResult(result.stdout ? String(result.stdout) : ""),
+          result.stderr ? String(result.stderr) : ""
+        ),
+        claudeErrorDetails(result.stdout ? String(result.stdout) : "")
+      );
     }
     const summary2 = runResult.summary.trim().slice(0, 4e3);
     if (summary2) log(`claude> ${summary2.slice(0, 500).replace(/\n/g, " ")}`);
@@ -18983,20 +19080,22 @@ async function runJob(ctx, job, claimDeviceId) {
       return;
     }
     const msg = err4 instanceof Error ? err4.message : String(err4);
+    const runErr = err4 instanceof ClaudeRunError ? err4 : null;
     const haystack = stripPromptEcho(`${msg}
 ${logs.stderr}`, sentPrompt);
     const plan = rateLimitDeferPlanForExit({
       message: msg,
       stderr: logs.stderr,
       stdout: logs.stdout,
-      prompt: sentPrompt
+      prompt: sentPrompt,
+      claudeError: runErr?.claudeError
     });
     if (plan) {
       const { parsed, pauseUntil, info } = plan;
       if (!parsed) {
         void rpcReportEvent(ctx, job.org_id, "rate_limit_unmatched_exit", {
           job_id: job.id,
-          excerpt: haystack.slice(0, 500)
+          excerpt: [runErr?.claudeError?.text, haystack].filter(Boolean).join("\n").slice(0, 500)
         });
       }
       console.log(
@@ -19016,8 +19115,21 @@ ${logs.stderr}`, sentPrompt);
       if (deferred) return;
       console.warn(`[${job.id}] defer no-op \u2014 falling through to fail`);
     }
-    console.log(`[${job.id}] failed: ${msg}`);
-    await rpcFail(ctx, job.id, deviceId, msg, metrics, logs);
+    if (!plan && runErr?.authFailure) {
+      const pauseUntil = new Date(Date.now() + AUTH_PAUSE_MS);
+      console.error(
+        `[${job.id}] CLAUDE CODE IS NOT AUTHENTICATED on this host (${runErr.detail ?? "auth failure"}). Run \`claude /login\` from this machine's DESKTOP session, not over SSH: on macOS an SSH login writes ~/.claude/.credentials.json while this daemon reads the keychain. Deferring job + pausing daemon until ${pauseUntil.toISOString()}.`
+      );
+      const detail = { job_id: job.id, claude_said: runErr.detail };
+      await rpcSetDaemonPause(ctx, pauseUntil, "claude_auth_expired", detail);
+      setLocalPause(pauseUntil.getTime());
+      const deferred = await rpcDefer(ctx, job.id, deviceId, "claude_auth_expired", detail);
+      if (deferred) return;
+      console.warn(`[${job.id}] defer no-op \u2014 falling through to fail`);
+    }
+    const failMessage = withFailureDetail(msg, runErr?.detail ?? null);
+    console.log(`[${job.id}] failed: ${failMessage}`);
+    await rpcFail(ctx, job.id, deviceId, failMessage, metrics, logs);
   } finally {
     clearInterval(heartbeat);
     inFlight.delete(job.id);
@@ -19422,7 +19534,7 @@ ${signal} received, shutting down`);
   process.on("SIGINT", () => shutdown("SIGINT"));
   process.on("SIGTERM", () => shutdown("SIGTERM"));
 }
-var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, FAILURE_DETAIL_MAX, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, JOB_TOKEN_PREFIX, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
+var HEARTBEAT_INTERVAL_MS, CLAUDE_TIMEOUT_MS, CLAUDE_LARGE_DIFF_TIMEOUT_MS, SAFETY_SWEEP_MS, LOG_STDOUT_CAP_BYTES, LOG_STDERR_CAP_BYTES, FAILURE_DETAIL_MAX, AUTH_PAUSE_MS, ClaudeRunError, PRE_SPAWN_TOKEN_MIN_LIFETIME_MS, SUPABASE_URL, SUPABASE_ANON_KEY, ARCHME_DAEMON_CLIENT_ID, ARCHME_MCP_BASE_URL, CLONE_BASE_DIR, DAEMON_ID, LEASE_SECONDS, inFlight, cancelled, killReasons, activeCleanups, cloneMutex, shuttingDown, daemonVersion, pauseUntilMs, resumeTimer, currentSched, MAX_CONCURRENT_JOBS, ctxByJob, deviceByJob, DEFAULT_CLONE_BASE_DIR, JOB_TOKEN_PREFIX, INLINE_PATCH_BYTE_CAP, GIT_SHA_RE, CURATOR_PREAMBLE, CORE_PRINCIPLES, STORY_COVERAGE_GATE, NEW_STORY_GUIDANCE, STORY_DESCRIPTION_EDIT_RULE, PHASE_GUIDANCE, BASE_RULES, DIFF_RULES, finite, channelSeq, MultipleAccountsError, __testDispatch;
 var init_run = __esm({
   "src/daemon/run.ts"() {
     "use strict";
@@ -19472,6 +19584,15 @@ var init_run = __esm({
     LOG_STDOUT_CAP_BYTES = 30 * 1024;
     LOG_STDERR_CAP_BYTES = 30 * 1024;
     FAILURE_DETAIL_MAX = 400;
+    AUTH_PAUSE_MS = 15 * 60 * 1e3;
+    ClaudeRunError = class extends Error {
+      constructor(message, detail, authFailure, claudeError) {
+        super(message);
+        this.detail = detail;
+        this.authFailure = authFailure;
+        this.claudeError = claudeError;
+      }
+    };
     PRE_SPAWN_TOKEN_MIN_LIFETIME_MS = CLAUDE_LARGE_DIFF_TIMEOUT_MS + 5 * 60 * 1e3;
     inFlight = /* @__PURE__ */ new Map();
     cancelled = /* @__PURE__ */ new Set();
@@ -22514,9 +22635,9 @@ var init_run_init = __esm({
   }
 });
 
-// ../shared/waypoints.ts
-var init_waypoints = __esm({
-  "../shared/waypoints.ts"() {
+// ../shared/connectionPair.ts
+var init_connectionPair = __esm({
+  "../shared/connectionPair.ts"() {
   }
 });
 
@@ -22645,80 +22766,87 @@ function toAbsolute(endpoint, scopePath) {
   if (scopePath.length === 0) return "root." + endpoint;
   return "root." + scopePath.join(".") + "." + endpoint;
 }
-function toRelative(absolute, scopePath) {
-  const prefix = scopePath.length === 0 ? "root." : "root." + scopePath.join(".") + ".";
-  if (absolute.startsWith(prefix)) return absolute.slice(prefix.length);
-  return absolute;
-}
-function rewriteAllConnections(arch, rewriter) {
-  const entries = [];
-  function walkConns(connections, scopePath) {
+function listAllConnections(arch) {
+  const out = [];
+  const walkConns = (connections, scopePath) => {
     for (const conn of connections) {
-      const absFrom = toAbsolute(conn.from, scopePath);
-      const absTo = toAbsolute(conn.to, scopePath);
-      const newAbsFrom = rewriter(absFrom);
-      const newAbsTo = rewriter(absTo);
-      const changed = newAbsFrom !== absFrom || newAbsTo !== absTo;
-      entries.push({
+      out.push({
         conn,
         scopePath,
-        newFrom: newAbsFrom,
-        newTo: newAbsTo,
-        changed
+        absFrom: toAbsolute(conn.from, scopePath),
+        absTo: toAbsolute(conn.to, scopePath)
       });
     }
-  }
-  function walkComponents(components, basePath) {
+  };
+  const walkComponents = (components, basePath) => {
     for (const comp of components) {
       const compPath = [...basePath, comp.id];
       if (comp.connections) walkConns(comp.connections, compPath);
       if (comp.components) walkComponents(comp.components, compPath);
     }
-  }
+  };
   walkConns(arch.connections, []);
   walkComponents(arch.components, []);
-  const changedCount = entries.filter((e) => e.changed).length;
-  if (changedCount === 0) return { arch, connectionsUpdated: 0 };
+  return out;
+}
+function dropConnections(arch, doomed) {
+  const byScope = /* @__PURE__ */ new Map();
+  for (const { conn, scopePath } of doomed) {
+    const key = scopePath.join(".");
+    const ids = byScope.get(key) ?? /* @__PURE__ */ new Set();
+    ids.add(conn.id);
+    byScope.set(key, ids);
+  }
   let result = arch;
-  const removeByScopeKey = /* @__PURE__ */ new Map();
-  for (const entry of entries) {
-    if (!entry.changed) continue;
-    const key = entry.scopePath.join(".");
-    if (!removeByScopeKey.has(key)) removeByScopeKey.set(key, /* @__PURE__ */ new Set());
-    removeByScopeKey.get(key).add(entry.conn.id);
-  }
-  for (const [scopeKey, connIds] of removeByScopeKey) {
+  for (const [scopeKey, ids] of byScope) {
     const scopePath = scopeKey === "" ? [] : scopeKey.split(".");
     const nav = navigateToScope(result, scopePath);
     if (!nav) continue;
     result = replaceScopeAtPath(result, scopePath, {
       ...nav.scope,
-      connections: nav.scope.connections.filter((c3) => !connIds.has(c3.id))
+      connections: nav.scope.connections.filter((c3) => !ids.has(c3.id))
     });
   }
-  for (const entry of entries) {
-    if (!entry.changed) continue;
-    const fromSegments = entry.newFrom.split(".");
-    const toSegments = entry.newTo.split(".");
-    const lcaSegments = findLCA(fromSegments, toSegments);
-    const lcaScopePath = lcaSegments.length > 1 ? lcaSegments.slice(1) : [];
-    const lcaNav = navigateToScope(result, lcaScopePath);
-    if (!lcaNav) continue;
+  return result;
+}
+function connectionHome(absFrom, absTo) {
+  const a2 = absFrom.split(".").slice(1);
+  const b = absTo.split(".").slice(1);
+  const scopePath = findLCA(a2.slice(0, -1), b.slice(0, -1));
+  return { scopePath, from: a2.slice(scopePath.length).join("."), to: b.slice(scopePath.length).join(".") };
+}
+function rewriteAllConnections(arch, rewriter) {
+  const changed = listAllConnections(arch).map((e) => ({ ...e, newFrom: rewriter(e.absFrom), newTo: rewriter(e.absTo) })).filter((e) => e.newFrom !== e.absFrom || e.newTo !== e.absTo);
+  if (changed.length === 0) return { arch, connectionsUpdated: 0, notCarried: [] };
+  let result = dropConnections(arch, changed);
+  const notCarried = [];
+  for (const entry of changed) {
+    const home2 = connectionHome(entry.newFrom, entry.newTo);
+    const nav = navigateToScope(result, home2.scopePath);
+    if (!nav) continue;
     const newConn = {
       ...entry.conn,
-      from: toRelative(entry.newFrom, lcaScopePath),
-      to: toRelative(entry.newTo, lcaScopePath),
-      id: `${toRelative(entry.newFrom, lcaScopePath)}-${toRelative(entry.newTo, lcaScopePath)}`
-    };
-    const existingConns = lcaNav.scope.connections;
-    if (!existingConns.some((c3) => c3.id === newConn.id)) {
-      result = replaceScopeAtPath(result, lcaScopePath, {
-        ...lcaNav.scope,
-        connections: [...existingConns, newConn]
-      });
+      from: home2.from,
+      to: home2.to,
+      id: `${home2.from}-${home2.to}`
+    };
+    const existingConns = nav.scope.connections;
+    const taken = existingConns.find((c3) => c3.id === newConn.id);
+    if (taken) {
+      notCarried.push(
+        `connection \`${entry.conn.id}\` (${newConn.from} \u2192 ${newConn.to}) was not carried over: ${scopeLabel(home2.scopePath)} already has \`${taken.id}\` (${taken.from} \u2192 ${taken.to}).`
+      );
+      continue;
     }
+    result = replaceScopeAtPath(result, home2.scopePath, {
+      ...nav.scope,
+      connections: [...existingConns, newConn]
+    });
   }
-  return { arch: result, connectionsUpdated: changedCount };
+  return { arch: result, connectionsUpdated: changed.length, notCarried };
+}
+function scopeLabel(scopePath) {
+  return scopePath.length === 0 ? "root" : `root.${scopePath.join(".")}`;
 }
 function applyComponentMove(arch, move) {
   const fromPath = move.from === "root" || move.from === "" ? [] : move.from.replace(/^root\./, "").split(".");
@@ -22767,7 +22895,7 @@ function applyComponentMove(arch, move) {
   });
   const rewriter = buildPathRewriter(oldAbsolute, newAbsolute);
   result = rewriteArchPaths(result, rewriter);
-  const { arch: afterConns, connectionsUpdated } = rewriteAllConnections(
+  const { arch: afterConns, connectionsUpdated, notCarried } = rewriteAllConnections(
     result,
     rewriter
   );
@@ -22793,13 +22921,16 @@ function applyComponentMove(arch, move) {
     walk(a2.components);
   };
   countAllHops(result);
-  const summary2 = `Moved component '${move.id}' from ${move.from} to ${move.to}. As part of this move, ${hopsRewritten} story hop(s) and ${connectionsUpdated} connection(s) were updated to reflect the new path.`;
+  const notCarriedNote = notCarried.length > 0 ? ` Warning: ${notCarried.join(" ")}` : "";
+  const summary2 = `Moved component '${move.id}' from ${move.from} to ${move.to}. As part of this move, ${hopsRewritten} story hop(s) and ${connectionsUpdated} connection(s) were updated to reflect the new path.${notCarriedNote}`;
   return { arch: result, summary: summary2 };
 }
 var init_archUpdate = __esm({
   "../shared/archUpdate.ts"() {
     init_waypoints();
     init_validationCodes();
+    init_connectionPair();
+    init_leafEndpoints();
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Map your codebase into a living architecture diagram: run `archme init` in a repo to scan it, `archme daemon start` to keep it current on every commit.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",