@agent-native/core 0.92.3 → 0.92.5

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @agent-native/core
 
+## 0.92.5
+
+### Patch Changes
+
+- eed1710: Fix `/visual-edit` live-edit 401s. The design server now mints the bridge token in `connect-localhost` and returns it from `open-visual-edit`, and `design connect` adopts it via a new `--bridge-token` flag (or `AGENT_NATIVE_BRIDGE_TOKEN`) instead of minting its own. The local bridge and the user's connection row now share the secret without the CLI needing its own auth to self-register — which was impossible under OAuth-based MCP and was the root cause of the 401s. The `visual-edit` skill is updated to call `open-visual-edit` first and start the bridge with the returned token.
+
+## 0.92.4
+
+### Patch Changes
+
+- 86697e9: Depend on `@agent-native/toolkit` via `workspace:^` instead of `workspace:*`. Publishing now pins a caret range (e.g. `^0.4.3`) rather than an exact version, so an app that scaffolds `@agent-native/toolkit@latest` separately can dedupe against it through normal semver resolution instead of installing two mismatched toolkit copies side by side (which crashed Vite with `"./collab-ui" is not exported`).
+
 ## 0.92.3
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.92.3",
+  "version": "0.92.5",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -235,7 +235,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@agent-native/toolkit": "workspace:*",
+    "@agent-native/toolkit": "workspace:^",
     "@amplitude/analytics-browser": "^2.41.1",
     "@anthropic-ai/sdk": "^0.90.0",
     "@anthropic-ai/tokenizer": "0.0.4",

package/corpus/core/src/cli/design-connect.ts

@@ -60,6 +60,10 @@ export interface DesignConnectArgs {
    *  are present) the CLI POSTs to `/_agent-native/actions/connect-localhost`
    *  with the real bridge token so the server can store it for grant minting. */
   appUrl?: string;
+  /** Server-minted bridge token to adopt instead of minting one, so the bridge
+   *  matches the token already stored on the user's connection row (no
+   *  self-registration). Also read from AGENT_NATIVE_BRIDGE_TOKEN. */
+  bridgeToken?: string;
   json: boolean;
   once: boolean;
   dryRun: boolean;
@@ -174,6 +178,11 @@ export function parseDesignConnectArgs(argv: string[]): DesignConnectArgs {
       index += 1;
     } else if (arg.startsWith("--app-url=")) {
       parsed.appUrl = arg.slice("--app-url=".length);
+    } else if (arg === "--bridge-token") {
+      parsed.bridgeToken = stringFlagValue(args, index, arg);
+      index += 1;
+    } else if (arg.startsWith("--bridge-token=")) {
+      parsed.bridgeToken = arg.slice("--bridge-token=".length);
     } else if (arg === "--json") {
       parsed.json = true;
       parsed.once = true;
@@ -1215,12 +1224,16 @@ async function walkBridgeFiles(rootPath: string): Promise<ListFilesResult> {
 
 export async function startDesignConnectBridge(
   manifest: DesignConnectManifest,
+  seedToken?: string,
 ): Promise<DesignConnectBridge> {
-  // Mint a cryptographically random per-rootPath bridge token.  This token is
-  // kept in-process only and is never emitted via the public GET routes so that
-  // an unauthenticated caller cannot read it.  The server-side grant action
-  // obtains it out-of-band (via the exported bridge reference).
-  const bridgeToken = crypto.randomBytes(32).toString("hex");
+  // Shared secret the browser sends (x-bridge-token) to unlock live-edit/read/
+  // write. Bridge and the user's connection row must agree on it. Adopt a
+  // server-minted seed when given (MCP flow); otherwise mint one and rely on
+  // --app-url self-registration to push it up. Kept in-process, never served.
+  const bridgeToken =
+    seedToken ||
+    process.env["AGENT_NATIVE_BRIDGE_TOKEN"] ||
+    crypto.randomBytes(32).toString("hex");
   let liveEditBridgeScript = "";
 
   const server = http.createServer(
@@ -1795,6 +1808,12 @@ Options:
   --route-manifest <path> Non-destructive route manifest output path
   --app-url <url>         Deployed design app URL for self-registration
                           (also reads AGENT_NATIVE_URL / DESIGN_APP_URL env)
+  --bridge-token <token>  Adopt a bridge token minted server-side by the
+                          authenticated connect-localhost / open-visual-edit
+                          action instead of minting one. Used by the remote-MCP
+                          /visual-edit flow so the bridge and the user's stored
+                          connection token match with no self-registration.
+                          (also reads AGENT_NATIVE_BRIDGE_TOKEN env)
   --daemon                Start the bridge detached, wait for /health, then exit
   --json                  Print the manifest JSON and exit
   --once                  Prepare/scaffold the manifest and exit
@@ -1931,25 +1950,33 @@ export async function runDesign(argv: string[]) {
     return 0;
   }
 
-  const bridge = await startDesignConnectBridge(manifest);
+  const seedToken =
+    parsed.bridgeToken || process.env["AGENT_NATIVE_BRIDGE_TOKEN"] || undefined;
+  const bridge = await startDesignConnectBridge(manifest, seedToken);
   console.error("Design localhost bridge running");
   console.error(`Bridge:   ${manifest.bridgeUrl}`);
   console.error(`Manifest: ${manifest.bridgeUrl}/manifest.json`);
   console.error(`Routes:   ${manifest.routeCount}`);
   console.error(`Dev URL:  ${manifest.devServerUrl}`);
 
-  // Self-register with the design app server (best-effort): POST the bridge
-  // token to connect-localhost so the server row stores the real token. Without
-  // it, the bridge and server tokens diverge and every write returns 401.
-  const appUrl = resolveAppUrl(parsed.appUrl);
-  if (appUrl) {
-    void registerConnectionWithServer(appUrl, bridge, resolveAuthToken());
-  } else {
-    // No app URL means the token never reaches the DB — surface it instead of
-    // silently skipping, since live-edit will then 401.
+  if (seedToken) {
+    // Server already stored this token on the row; bridge matches it, so no
+    // self-registration needed. Zero-config path for the remote-MCP flow.
     console.error(
-      "[design connect] No app URL resolved (pass --app-url or set AGENT_NATIVE_URL); skipping self-registration — live-edit will fail to authorize.",
+      "[design connect] Using server-provided bridge token; skipping self-registration.",
     );
+  } else {
+    // No seed: fall back to self-registration — POST the minted token to
+    // connect-localhost. Needs an auth token in env or it 401s (the old gap).
+    const appUrl = resolveAppUrl(parsed.appUrl);
+    if (appUrl) {
+      void registerConnectionWithServer(appUrl, bridge, resolveAuthToken());
+    } else {
+      // No token source at all — warn rather than 401 silently at edit time.
+      console.error(
+        "[design connect] No bridge token or app URL resolved (pass --bridge-token, or --app-url / AGENT_NATIVE_URL); skipping self-registration — live-edit will fail to authorize.",
+      );
+    }
   }
 
   return await new Promise<number>((resolve) => {

package/corpus/core/src/cli/skills.ts

@@ -486,34 +486,66 @@ iframe-backed screens on the infinite canvas.
 
 ## Required Local Bridge
 
-From the target app repo, make sure its dev server is running, then run:
+The live-edit bridge is unlocked by a shared secret (the "bridge token") that
+must match on two sides: the local bridge process, and the user's connection row
+in Design (which the browser reads to authorize \`/live-edit-bridge\`,
+\`/read-file\`, \`/write-file\`). Get them to match by letting the
+**authenticated** \`open-visual-edit\` action mint the token, then starting the
+bridge with it. This is the only ordering that works for the remote-MCP flow —
+the bridge cannot push its own token to the server without a CLI auth token, so
+the server mints instead and the bridge adopts.
+
+From the target app repo, make sure its dev server is running, then:
+
+**1. Discover routes without starting a durable bridge** (one-shot, exits):
 
 \`\`\`bash
-npx @agent-native/core@latest design connect --url http://localhost:5173 --root . --daemon
+npx @agent-native/core@latest design connect --url http://localhost:5173 --root . --json
 \`\`\`
 
-Use the app's real port. The command starts a detached local bridge on
-\`http://127.0.0.1:7331\` by default, waits for \`/health\`, prints the
-manifest JSON, and keeps the bridge alive after the agent command exits.
+This prints the manifest (routes + capabilities). Parse it to build
+\`routeManifest\` for the next step. (Skip this if the user already gave explicit
+paths/URLs to place.)
+
+**2. Call \`open-visual-edit\`** (see Action Flow below) with NO \`bridgeToken\`.
+The server mints one, stores it on the user's connection row, copies it into the
+placed screens' metadata, and returns it to you as \`bridgeToken\`. Capture it.
 
-For a manual health/manifest check:
+**3. Start the persistent bridge adopting that token** (single line; prefer the
+env var so the secret does not appear in \`ps\`):
+
+\`\`\`bash
+AGENT_NATIVE_BRIDGE_TOKEN="<bridgeToken from step 2>" npx @agent-native/core@latest design connect --url http://localhost:5173 --root . --daemon
+\`\`\`
+
+(Equivalently, pass \`--bridge-token <token>\`.) This starts a detached bridge on
+\`http://127.0.0.1:7331\`, adopts the server-minted token — so bridge and row
+agree and live-edit authorizes with no self-registration — and stays alive after
+the command exits.
+
+For a manual health/manifest check on the running bridge:
 
 \`\`\`bash
 curl http://127.0.0.1:7331/manifest.json
 \`\`\`
 
-Do not use \`--json\` for an editable session. \`--json\`, \`--once\`, and
-\`--dry-run\` print the manifest and exit, so Design will fall back to a
-non-editable live iframe as soon as it tries to refresh the snapshot.
+Only use \`--json\` for the step-1 route probe. Never use \`--json\`, \`--once\`,
+or \`--dry-run\` for the durable step-3 bridge: they print the manifest and exit,
+so Design falls back to a non-editable live iframe.
 
 ## Action Flow
 
 Prefer the single authenticated \`open-visual-edit\` action. It registers or
-refreshes the localhost bridge, creates or reuses a Design project, places
-URL-backed screens, stores the active visual-edit context, and navigates to
-overview mode in one call. This avoids creating a private design under a
-synthetic CLI user and then handing the browser a tokenized URL that may be
-shadowed by an existing session.
+refreshes the localhost bridge connection, mints and stores the bridge token,
+creates or reuses a Design project, places URL-backed screens, stores the active
+visual-edit context, and navigates to overview mode in one call. This avoids
+creating a private design under a synthetic CLI user and then handing the browser
+a tokenized URL that may be shadowed by an existing session.
+
+Call it BEFORE starting the durable bridge (step 3 above): it does not contact
+the bridge, so the bridge need not be running yet, and you need its returned
+\`bridgeToken\` to start the bridge with a matching secret. Omit \`bridgeToken\`
+on the call so the server mints one.
 
 \`\`\`bash
 pnpm action open-visual-edit '{
@@ -526,8 +558,12 @@ pnpm action open-visual-edit '{
 }'
 \`\`\`
 
-The action returns \`designId\`, \`connectionId\`, \`screens\`, \`urlPath\`, and
-\`openUrl\`. Keep those IDs in the chat context for follow-ups.
+The action returns \`designId\`, \`connectionId\`, \`bridgeToken\`, \`screens\`,
+\`urlPath\`, and \`openUrl\`. Keep \`designId\`/\`connectionId\` in the chat context
+for follow-ups, and pass \`bridgeToken\` to \`design connect\` (step 3) to start
+the bridge. On follow-up calls reusing an existing \`connectionId\`, the same
+token is returned (it is minted once and reused), so the running bridge stays
+valid.
 
 For a numbered flow the user describes in chat, keep the labels and order:
 

package/corpus/templates/design/.agents/skills/visual-edit/SKILL.md

@@ -60,31 +60,43 @@ iframe-backed screens on the infinite canvas.
 
 ## Required Local Bridge
 
-From the target app repo, make sure its dev server is running, then run the
-Design bridge with `npx`:
+The live-edit bridge is unlocked by a shared secret (the "bridge token") that
+must match on two sides: the local bridge process and the user's connection row
+(which the browser reads to authorize `/live-edit-bridge`, `/read-file`,
+`/write-file`). Let the authenticated `connect-localhost` / `open-visual-edit`
+action mint the token, then start the bridge adopting it — the bridge cannot
+push its own token to the server without a CLI auth token, so the server mints.
+
+From the target app repo, make sure its dev server is running, then:
+
+**1. Discover routes without a durable bridge** (one-shot, exits):
 
 ```bash
-npx @agent-native/core@latest design connect --url http://localhost:5173 --root .
+npx @agent-native/core@latest design connect --url http://localhost:5173 --root . --json
 ```
 
-Use the app's real port. The command starts a local bridge on
-`http://127.0.0.1:7331` by default and exposes:
+Prints the manifest (routes + capabilities). Use it to build `routeManifest` for
+the action call. Skip if the user already gave explicit paths/URLs.
 
-- `GET /manifest.json` — dev server URL, bridge URL, discovered routes, root.
-- `GET /routes.json` — route manifest only.
-- `GET /health` — bridge liveness.
+**2. Register the connection** via `connect-localhost` / `open-visual-edit`
+(Action Flow below) with NO `bridgeToken`. The server mints one, stores it on the
+connection row, and returns it as `bridgeToken`. Capture it.
 
-For one-shot agent setup, ask for JSON and keep the long-running bridge open in
-a second terminal if the user needs live updates:
+**3. Start the persistent bridge adopting that token:**
 
 ```bash
-npx @agent-native/core@latest design connect --url http://localhost:5173 --root .
-curl http://127.0.0.1:7331/manifest.json
+AGENT_NATIVE_BRIDGE_TOKEN="<bridgeToken from step 2>" \
+  npx @agent-native/core@latest design connect \
+  --url http://localhost:5173 --root . --daemon
 ```
 
-Do not use `--json` for an editable session. `--json`, `--once`, and
-`--dry-run` print the manifest and exit, so Design will fall back to a
-non-editable live iframe as soon as it tries to refresh the snapshot.
+(Or pass `--bridge-token <token>`; prefer the env var to keep the secret out of
+`ps`.) The bridge exposes `GET /manifest.json`, `GET /routes.json`,
+`GET /health`, and now authorizes live-edit because its token matches the row.
+
+Only use `--json` for the step-1 route probe. Never use `--json`, `--once`, or
+`--dry-run` for the durable step-3 bridge: they print the manifest and exit, so
+Design falls back to a non-editable live iframe.
 
 ## Action Flow
 

package/corpus/templates/design/actions/connect-localhost.ts

@@ -5,7 +5,7 @@ import {
   getRequestOrgId,
   getRequestUserEmail,
 } from "@agent-native/core/server/request-context";
-import { eq } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
@@ -202,8 +202,14 @@ export default defineAction({
       );
     }
 
-    const nextBridgeToken = args.bridgeToken?.trim() || undefined;
-    const values = {
+    // Token for a new row: explicit, else existing, else mint. The authenticated
+    // action owning the mint is what lets the CLI skip its own auth (the 401 gap).
+    const explicitToken = args.bridgeToken?.trim() || undefined;
+    const nextBridgeToken =
+      explicitToken ||
+      existing[0]?.bridgeToken ||
+      crypto.randomBytes(32).toString("hex");
+    const baseValues = {
       id,
       name: args.name ?? new URL(devServerUrl).host,
       sourceType: "localhost" as const,
@@ -212,7 +218,6 @@ export default defineAction({
       rootPath: routeManifest.rootPath ?? null,
       routeManifest: JSON.stringify(routeManifest),
       capabilities: JSON.stringify(capabilities),
-      bridgeToken: nextBridgeToken ?? existing[0]?.bridgeToken ?? null,
       status: args.status,
       lastSeenAt: now,
       ownerEmail,
@@ -220,23 +225,44 @@ export default defineAction({
       updatedAt: now,
     };
 
-    // Atomic upsert keyed on the id primary key — no check-then-insert race.
-    // setWhere keeps a concurrent insert by another user (TOCTOU on the
-    // ownership check above) from being overwritten: on a cross-user conflict
-    // the update filters to a no-op instead of hijacking the other row.
+    // On conflict, an explicit token overwrites; a server-minted one uses
+    // coalesce(existing, minted) evaluated at write time — it fills a null token
+    // but never clobbers one, so concurrent first-time callers converge on the
+    // first writer (read->mint->write isn't atomic). setWhere keeps a cross-user
+    // conflict a no-op.
     await db
       .insert(schema.designLocalhostConnections)
-      .values({ ...values, createdAt: now })
+      .values({ ...baseValues, bridgeToken: nextBridgeToken, createdAt: now })
       .onConflictDoUpdate({
         target: schema.designLocalhostConnections.id,
-        set: values,
+        set: {
+          ...baseValues,
+          bridgeToken: explicitToken
+            ? nextBridgeToken
+            : sql`coalesce(${schema.designLocalhostConnections.bridgeToken}, excluded.bridge_token)`,
+        },
         setWhere: eq(schema.designLocalhostConnections.ownerEmail, ownerEmail),
       });
 
+    // Return the token the row actually holds (owner-scoped, so a cross-user
+    // no-op never leaks another user's token), not the one we minted — so
+    // concurrent callers converge on the winner (no 401 on a lost race).
+    const [stored] = await db
+      .select({ bridgeToken: schema.designLocalhostConnections.bridgeToken })
+      .from(schema.designLocalhostConnections)
+      .where(
+        and(
+          eq(schema.designLocalhostConnections.id, id),
+          eq(schema.designLocalhostConnections.ownerEmail, ownerEmail),
+        ),
+      )
+      .limit(1);
+    const effectiveBridgeToken = stored?.bridgeToken ?? nextBridgeToken;
+
     return {
       id,
       sourceType: "localhost",
-      name: values.name,
+      name: baseValues.name,
       devServerUrl,
       bridgeUrl: bridgeUrl ?? null,
       rootPath: routeManifest.rootPath ?? null,
@@ -245,6 +271,9 @@ export default defineAction({
       capabilities,
       status: args.status,
       lastSeenAt: now,
+      // Returned so the caller can start the bridge with
+      // `design connect --bridge-token <this>`, matching this row.
+      bridgeToken: effectiveBridgeToken,
     };
   },
 });

package/corpus/templates/design/actions/open-visual-edit.ts

@@ -162,7 +162,10 @@ export default defineAction({
       .string()
       .optional()
       .describe(
-        "Real bridge token from the running bridge. Stored server-side only; never returned.",
+        "Optional bridge token to store on the connection (e.g. one a CLI " +
+          "self-registered). Omit it and the server mints one, stores it, and " +
+          "returns it as `bridgeToken` so the caller can start the local bridge " +
+          "with `design connect --bridge-token <token>`.",
       ),
     routes: jsonArray(z.array(screenRouteSchema))
       .optional()
@@ -315,6 +318,9 @@ export default defineAction({
       overview: true,
       urlPath,
       openUrl: designOverviewDeepLink(designId),
+      // Minted/stored by connect-localhost; the skill starts the bridge with
+      // `design connect --bridge-token <this>` so bridge and row agree.
+      bridgeToken: connection.bridgeToken,
     };
   },
   link: ({ result }) => {

package/dist/cli/design-connect.d.ts

@@ -17,6 +17,10 @@ export interface DesignConnectArgs {
      *  are present) the CLI POSTs to `/_agent-native/actions/connect-localhost`
      *  with the real bridge token so the server can store it for grant minting. */
     appUrl?: string;
+    /** Server-minted bridge token to adopt instead of minting one, so the bridge
+     *  matches the token already stored on the user's connection row (no
+     *  self-registration). Also read from AGENT_NATIVE_BRIDGE_TOKEN. */
+    bridgeToken?: string;
     json: boolean;
     once: boolean;
     dryRun: boolean;
@@ -105,7 +109,7 @@ export interface ListFilesResult {
     files: ListedBridgeFile[];
     truncated: boolean;
 }
-export declare function startDesignConnectBridge(manifest: DesignConnectManifest): Promise<DesignConnectBridge>;
+export declare function startDesignConnectBridge(manifest: DesignConnectManifest, seedToken?: string): Promise<DesignConnectBridge>;
 /**
  * Resolve the design app URL from an explicit value or environment variables.
  * Returns undefined when no URL is configured (registration is optional).

package/dist/cli/design-connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"design-connect.d.ts","sourceRoot":"","sources":["../../src/cli/design-connect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"design-connect.d.ts","sourceRoot":"","sources":["../../src/cli/design-connect.ts"],"names":[],"mappings":"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"}

package/dist/cli/design-connect.js

@@ -110,6 +110,13 @@ export function parseDesignConnectArgs(argv) {
         else if (arg.startsWith("--app-url=")) {
             parsed.appUrl = arg.slice("--app-url=".length);
         }
+        else if (arg === "--bridge-token") {
+            parsed.bridgeToken = stringFlagValue(args, index, arg);
+            index += 1;
+        }
+        else if (arg.startsWith("--bridge-token=")) {
+            parsed.bridgeToken = arg.slice("--bridge-token=".length);
+        }
         else if (arg === "--json") {
             parsed.json = true;
             parsed.once = true;
@@ -1004,12 +1011,14 @@ async function walkBridgeFiles(rootPath) {
     await walk(resolvedRoot, "");
     return { files, truncated };
 }
-export async function startDesignConnectBridge(manifest) {
-    // Mint a cryptographically random per-rootPath bridge token.  This token is
-    // kept in-process only and is never emitted via the public GET routes so that
-    // an unauthenticated caller cannot read it.  The server-side grant action
-    // obtains it out-of-band (via the exported bridge reference).
-    const bridgeToken = crypto.randomBytes(32).toString("hex");
+export async function startDesignConnectBridge(manifest, seedToken) {
+    // Shared secret the browser sends (x-bridge-token) to unlock live-edit/read/
+    // write. Bridge and the user's connection row must agree on it. Adopt a
+    // server-minted seed when given (MCP flow); otherwise mint one and rely on
+    // --app-url self-registration to push it up. Kept in-process, never served.
+    const bridgeToken = seedToken ||
+        process.env["AGENT_NATIVE_BRIDGE_TOKEN"] ||
+        crypto.randomBytes(32).toString("hex");
     let liveEditBridgeScript = "";
     const server = http.createServer((req, res) => {
         if (req.method === "OPTIONS") {
@@ -1492,6 +1501,12 @@ Options:
   --route-manifest <path> Non-destructive route manifest output path
   --app-url <url>         Deployed design app URL for self-registration
                           (also reads AGENT_NATIVE_URL / DESIGN_APP_URL env)
+  --bridge-token <token>  Adopt a bridge token minted server-side by the
+                          authenticated connect-localhost / open-visual-edit
+                          action instead of minting one. Used by the remote-MCP
+                          /visual-edit flow so the bridge and the user's stored
+                          connection token match with no self-registration.
+                          (also reads AGENT_NATIVE_BRIDGE_TOKEN env)
   --daemon                Start the bridge detached, wait for /health, then exit
   --json                  Print the manifest JSON and exit
   --once                  Prepare/scaffold the manifest and exit
@@ -1599,23 +1614,29 @@ export async function runDesign(argv) {
         console.log(JSON.stringify(manifest, null, 2));
         return 0;
     }
-    const bridge = await startDesignConnectBridge(manifest);
+    const seedToken = parsed.bridgeToken || process.env["AGENT_NATIVE_BRIDGE_TOKEN"] || undefined;
+    const bridge = await startDesignConnectBridge(manifest, seedToken);
     console.error("Design localhost bridge running");
     console.error(`Bridge:   ${manifest.bridgeUrl}`);
     console.error(`Manifest: ${manifest.bridgeUrl}/manifest.json`);
     console.error(`Routes:   ${manifest.routeCount}`);
     console.error(`Dev URL:  ${manifest.devServerUrl}`);
-    // Self-register with the design app server (best-effort): POST the bridge
-    // token to connect-localhost so the server row stores the real token. Without
-    // it, the bridge and server tokens diverge and every write returns 401.
-    const appUrl = resolveAppUrl(parsed.appUrl);
-    if (appUrl) {
-        void registerConnectionWithServer(appUrl, bridge, resolveAuthToken());
+    if (seedToken) {
+        // Server already stored this token on the row; bridge matches it, so no
+        // self-registration needed. Zero-config path for the remote-MCP flow.
+        console.error("[design connect] Using server-provided bridge token; skipping self-registration.");
     }
     else {
-        // No app URL means the token never reaches the DB — surface it instead of
-        // silently skipping, since live-edit will then 401.
-        console.error("[design connect] No app URL resolved (pass --app-url or set AGENT_NATIVE_URL); skipping self-registration — live-edit will fail to authorize.");
+        // No seed: fall back to self-registration — POST the minted token to
+        // connect-localhost. Needs an auth token in env or it 401s (the old gap).
+        const appUrl = resolveAppUrl(parsed.appUrl);
+        if (appUrl) {
+            void registerConnectionWithServer(appUrl, bridge, resolveAuthToken());
+        }
+        else {
+            // No token source at all — warn rather than 401 silently at edit time.
+            console.error("[design connect] No bridge token or app URL resolved (pass --bridge-token, or --app-url / AGENT_NATIVE_URL); skipping self-registration — live-edit will fail to authorize.");
+        }
     }
     return await new Promise((resolve) => {
         const stop = () => {