@agent-native/core 0.102.1 → 0.103.0

package/corpus/core/docs/content/template-content.mdx

@@ -91,9 +91,8 @@ When you open the app, you'll see a page tree next to the editor. The agent alwa
 - **Organize pages in a tree** — nest infinitely, drag to reorder, favorite pages you use often.
 - **Search across everything** with full-text search across titles and content.
 - **Edit local Markdown/MDX files like Obsidian.** Use the `/local-files` view
-  to export your workspace to files, edit them in your own tools, preview
-  changes, and import them back. In Local File Mode, Content writes straight to
-  the selected `.md` or `.mdx` file.
+  to connect a folder to a space's Files database, edit with your own tools,
+  sync changes, and review conflicts without leaving the database-backed app.
 - **Generate rich interactive custom blocks.** Register local React components,
   insert them as MDX, and let the agent create or update component files for
   your docs.
@@ -136,31 +135,23 @@ as the review surface. The hosted app remains the source of truth for sharing,
 comments, permissions, and live collaboration; the local folder is an explicit
 sync surface.
 
-Content can also run in **Local File Mode**, where files are the source of
-truth instead of SQL documents. Add `agent-native.json` to a repo, set
-`mode: "local-files"`, and configure roots such as `docs/`, `blog/`,
-`content/`, and `resources/`. The standard Content editor then populates its
-left sidebar from those local `.md`/`.mdx` files and writes edits back to the
-selected file through the normal document actions. Use this for repo-first docs,
-blogs, resource libraries, or an Obsidian-style personal MDX-powered notes vault; switch back to
-database mode when you want hosted collaboration and SQL-backed sharing. See [Local File Mode](/docs/local-file-mode) for the
-standalone repo layout, configuration, custom MDX components, local
-`extensions/` widgets, and production safety guide.
+Local folders now use the same database model as every other page. Each page
+belongs to a space and its system Files database; a folder is a source adapter
+on that database. You can attach a folder to an existing space or create a
+private folder-backed space, then use database properties and saved sidebar
+views on the imported pages. See [Local folder sources](/docs/local-file-mode)
+for configuration, truth policies, conflicts, custom MDX components, and local
+`extensions/` widgets.
 
-To install the Content local-files skill into an existing repo:
+To open Content for an existing repo:
 
 ```bash
-npx @agent-native/core@latest skills add content --mode local-files --scope project
+npx @agent-native/core@latest content .
 ```
 
-The installer copies the `content` skill for your coding agent and writes or
-updates `agent-native.json` with Content roots for `docs/`, `blog/`, `content/`,
-and `resources/`. When a local Content app, Agent Native Desktop, or trusted
-local bridge is running, agents should use Content actions such as
-`list-documents`, `get-document`, `edit-document`, `update-document`, and
-`share-local-file-document` instead of raw filesystem writes. Without that local
-bridge, the installed skill still gives the agent the repo-editing contract for
-safe Markdown/MDX edits.
+The CLI starts normal database-backed Content, registers an opaque local-folder
+connection in `agent-native.json`, and opens the connection screen. It does not
+set a local-mode environment variable.
 
 ## For developers
 
@@ -189,28 +180,21 @@ Open `http://localhost:8083` and create your first page. Then ask the agent to "
 
 **Search and comments.** Full-text search, anchored comments, version history, and restore flows are built into the document surface.
 
-**Sync surfaces.** Documents can sync with Notion or local Markdown/MDX folders, with SQL acting as the collaborative cache/history layer.
+**Sync surfaces.** Documents can sync with Notion or local Markdown/MDX folders, while SQL remains the canonical collaborative data model.
 
 ### Local file sync
 
 The protected `/local-files` route uses the browser File System Access API, or a
-guarded native folder bridge inside Agent Native Desktop, to read and write
-Markdown/MDX files from a user-chosen folder. After the folder is linked and
-imported, the selected file is treated as the authority: opening the page reads
-the file, and normal editor saves write the file first. SQL is then updated as a
-cache/history layer for the existing document UI, search, and version panel, not
-as the source of truth. The top-right page menu exposes the local source path:
-relative path is always available, absolute path is available in true local-file
-mode and Agent Native Desktop, and Reveal in Finder is available through the
-desktop bridge or server-backed local-file mode.
-
-The bulk sync route calls:
-
-- `export-content-source` — reads the accessible document tree and returns a
-  deterministic `content/` file bundle.
-- `import-content-source` — validates files, creates new private documents,
-  updates documents where the caller has editor access, preserves version
-  history, and rejects invalid parent cycles.
+guarded native folder bridge inside Agent Native Desktop, to connect a folder to
+a Files database. SQL stores only an opaque connection ID, relative paths,
+hashes, and source metadata. Sync materializes ordinary database pages and
+records concurrent edits as reviewable change sets instead of silently
+overwriting either side. Disconnecting preserves both database pages and files.
+
+The folder workflow calls `connect-local-folder-source`,
+`sync-local-folder-source`, `resolve-local-folder-conflict`, and
+`disconnect-local-folder-source`. `export-content-source` can export one source
+using its original relative paths.
 
 The source format lives in `shared/content-source.ts`. Keep that file as the
 single contract for filenames, frontmatter, parsing, and serialization.
@@ -674,6 +658,6 @@ The agent can make all of these changes itself — ask it to "add a tags column
 
 - [**Templates**](/docs/cloneable-saas) — the clone-and-own model, and every other domain template to start from
 - [**Getting Started**](/docs/getting-started) — the framework fundamentals: actions, application state, and live sync
-- [**Local File Mode**](/docs/local-file-mode) — the standalone repo layout, config, and production safety guide
+- [**Local folder sources**](/docs/local-file-mode) — spaces, Files databases, folder adapters, migration, and safety
 - [**Real-Time Collaboration**](/docs/real-time-collaboration) — the Yjs pipeline documents share with other collaborative surfaces
 - [**Sharing**](/docs/sharing) — the share-grant model documents build on

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.102.1",
+  "version": "0.103.0",
   "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": {

package/corpus/core/src/cli/content-local.ts

@@ -1,4 +1,5 @@
 import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
 import fsSync from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -8,7 +9,7 @@ const CONTENT_APP_ID = "content";
 const MANIFEST_FILE = "agent-native.json";
 const DEFAULT_PORT = 8083;
 const DEFAULT_PROFILE = "docs/no-bookkeeping";
-const LOCAL_FILE_ID_PREFIX = "local-file:";
+const LOCAL_FOLDER_CONNECTION_PREFIX = "local-folder:";
 
 export interface ContentLocalArgs {
   target?: string;
@@ -25,6 +26,7 @@ export interface ContentLocalLaunchPlan {
   manifestPath: string;
   rootPath: string;
   filePath?: string;
+  connectionId: string;
   url: string;
   command: string;
   args: string[];
@@ -48,10 +50,18 @@ function titleFromPath(value: string) {
   );
 }
 
-function encodeLocalFileId(filePath: string) {
-  return `${LOCAL_FILE_ID_PREFIX}${Buffer.from(filePath, "utf8").toString(
-    "base64url",
-  )}`;
+function localFolderConnectionId(absoluteRootPath: string) {
+  let canonicalRootPath = path.resolve(absoluteRootPath);
+  try {
+    canonicalRootPath = fsSync.realpathSync(canonicalRootPath);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+  }
+  const digest = createHash("sha256")
+    .update(canonicalRootPath)
+    .digest("base64url")
+    .slice(0, 24);
+  return `${LOCAL_FOLDER_CONNECTION_PREFIX}${digest}`;
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -134,6 +144,7 @@ function resolveTarget(target: string, cwd: string) {
 
   return {
     absoluteTarget,
+    absoluteRootPath: targetDirectory,
     isFile: stat.isFile(),
     workspaceRoot,
     rootPath: normalizeSlash(rootPath),
@@ -161,8 +172,13 @@ async function readManifest(
 
 function upsertContentManifest(
   manifest: Record<string, unknown>,
+  workspaceRoot: string,
   rootPath: string,
-  options: { filePath?: string; profile?: string },
+  options: {
+    connectionId: string;
+    filePath?: string;
+    profile?: string;
+  },
 ) {
   const next: Record<string, unknown> = {
     ...manifest,
@@ -192,18 +208,62 @@ function upsertContentManifest(
       ? existingRoot.extensions
       : [".md", ".mdx"],
     ...(profile ? { profile } : {}),
-    ...(include && rootIndex === -1 ? { include } : {}),
+    ...(include && (rootIndex === -1 || Array.isArray(existingRoot?.include))
+      ? {
+          include: Array.from(
+            new Set([
+              ...(Array.isArray(existingRoot?.include)
+                ? existingRoot.include.filter(
+                    (value): value is string => typeof value === "string",
+                  )
+                : []),
+              ...include,
+            ]),
+          ),
+        }
+      : {}),
+    source: {
+      ...(isRecord(existingRoot?.source) ? existingRoot.source : {}),
+      type: "local-folder",
+      connectionId: options.connectionId,
+      truthPolicy: "source_primary",
+    },
   };
-  const roots =
+  let roots =
     rootIndex === -1
       ? [...existingRoots, root]
       : existingRoots.map((entry, index) =>
           index === rootIndex ? { ...entry, ...root } : entry,
         );
 
+  if (existingContent.mode === "local-files") {
+    roots = roots.map((entry) => {
+      if (entry === root || typeof entry.path !== "string") return entry;
+      const existingSource = isRecord(entry.source) ? entry.source : {};
+      return {
+        ...entry,
+        source: {
+          ...existingSource,
+          type: "local-folder",
+          connectionId:
+            typeof existingSource.connectionId === "string" &&
+            existingSource.connectionId
+              ? existingSource.connectionId
+              : localFolderConnectionId(
+                  path.resolve(workspaceRoot, entry.path),
+                ),
+          truthPolicy:
+            typeof existingSource.truthPolicy === "string"
+              ? existingSource.truthPolicy
+              : "source_primary",
+        },
+      };
+    });
+  }
+
+  delete existingContent.mode;
   apps[CONTENT_APP_ID] = {
     ...existingContent,
-    mode: "local-files",
     roots,
     hide: Array.isArray(existingContent.hide)
       ? existingContent.hide
@@ -234,9 +294,10 @@ export function findContentTemplateDir(cwd = process.cwd()) {
   );
 }
 
-function launchUrl(port: number, filePath?: string) {
-  const base = `http://127.0.0.1:${port}`;
-  return filePath ? `${base}/page/${encodeLocalFileId(filePath)}` : base;
+function launchUrl(port: number, connectionId: string, filePath?: string) {
+  const params = new URLSearchParams({ connectionId });
+  if (filePath) params.set("file", filePath);
+  return `http://127.0.0.1:${port}/local-files?${params.toString()}`;
 }
 
 export async function prepareContentLocalLaunch(options: {
@@ -249,10 +310,13 @@ export async function prepareContentLocalLaunch(options: {
   const cwd = path.resolve(options.cwd ?? process.cwd());
   const target = resolveTarget(options.target, cwd);
   const manifestPath = path.join(target.workspaceRoot, MANIFEST_FILE);
+  const connectionId = localFolderConnectionId(target.absoluteRootPath);
   const manifest = upsertContentManifest(
     await readManifest(manifestPath),
+    target.workspaceRoot,
     target.rootPath,
     {
+      connectionId,
       filePath: target.filePath,
       profile: options.profile,
     },
@@ -273,7 +337,8 @@ export async function prepareContentLocalLaunch(options: {
     manifestPath,
     rootPath: target.rootPath,
     filePath: target.filePath,
-    url: launchUrl(options.port ?? DEFAULT_PORT, target.filePath),
+    connectionId,
+    url: launchUrl(options.port ?? DEFAULT_PORT, connectionId, target.filePath),
     command: "corepack",
     args: [
       "pnpm",
@@ -287,7 +352,6 @@ export async function prepareContentLocalLaunch(options: {
       "--strictPort",
     ],
     env: {
-      AGENT_NATIVE_MODE: "local-files",
       AGENT_NATIVE_MANIFEST_PATH: manifestPath,
     },
     manifest,
@@ -316,7 +380,7 @@ function printHelp() {
   agent-native content <file-or-folder> [options]
 
 Options:
-  --profile <name>   Local file profile, for example docs/no-bookkeeping
+  --profile <name>   Local folder profile, for example docs/no-bookkeeping
   --port <number>    Dev server port (default ${DEFAULT_PORT})
   --open             Open the target in the browser (default)
   --no-open          Start the server without opening the browser
@@ -326,9 +390,13 @@ Options:
 
 export async function runContentLocal(argv: string[]) {
   const parsed = parseContentLocalArgs(argv);
-  if (parsed.help || !parsed.target) {
+  if (parsed.help) {
+    printHelp();
+    return 0;
+  }
+  if (!parsed.target) {
     printHelp();
-    return parsed.target ? 0 : 1;
+    return 1;
   }
 
   const plan = await prepareContentLocalLaunch({
@@ -343,7 +411,7 @@ export async function runContentLocal(argv: string[]) {
     return 0;
   }
 
-  console.log(`Content local files: ${plan.rootPath}`);
+  console.log(`Content folder source: ${plan.rootPath}`);
   console.log(`Manifest: ${plan.manifestPath}`);
   console.log(`Opening: ${plan.url}`);
 

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

@@ -1098,8 +1098,8 @@ Usage:
                                 --with-github-action also writes the PR Visual
                                 Recap workflow into .github/workflows/.
   agent-native content local-files <file-or-folder>
-                                Launch Content in local-file mode for a local
-                                docs/content folder. Use --no-open, --port N,
+                                Connect a local docs/content folder to normal
+                                database-backed Content. Use --no-open, --port N,
                                 or --profile docs/no-bookkeeping as needed.
   agent-native design connect  Start a localhost Design bridge for a running
                                 dev server. Use --url, --port, --root, or

package/corpus/core/src/cli/skills-content/content-skill.ts

@@ -2,8 +2,9 @@ export const CONTENT_SKILL_MD = `---
 name: content
 description: >-
   Use Content for repo-backed Markdown/MDX docs, blogs, resources, rich
-  document editing, local components, shareable copies, and Content local-file
-  workspaces. Prefer Content actions over raw filesystem writes when available.
+  document editing, local components, shareable copies, and database-backed
+  local-folder sources. Prefer Content actions over raw filesystem writes when
+  available.
 metadata:
   visibility: exported
 ---
@@ -14,21 +15,22 @@ Use the Content app when a workflow is about authoring, editing, reviewing, or
 publishing Markdown/MDX documents: docs sites, blogs, resource libraries,
 marketing pages, internal notes, and local MDX components. Content gives the
 agent a document tree, a rich editor, normal document actions, and optional
-local-file source of truth.
+local-folder synchronization.
 
 ## Choose The Path
 
 - Use Content actions when the Content MCP/action tools are available:
   \`list-documents\`, \`search-documents\`, \`get-document\`,
   \`pull-document\`, \`create-document\`, \`edit-document\`,
-  \`update-document\`, \`delete-document\`, \`share-local-file-document\`,
+  \`update-document\`, \`delete-document\`,
+  \`sync-manifest-local-folder-source\`, \`sync-local-folder-source\`,
   \`list-local-component-files\`, and \`write-local-component-file\`.
 - Use \`pull-document\` or \`get-document\` before editing a page. Use
   \`edit-document\` for precise find/replace changes and \`update-document\`
   for full rewrites or new content.
-- In Local File Mode, Content actions read and write the repo files declared in
-  \`agent-native.json\`; SQL remains cache/history/search glue, not the source of
-  truth for those pages.
+- Local folders declared in \`agent-native.json\` are sources for ordinary
+  SQL-backed Content pages. Use the trusted bridge's pull/check/push workflows to
+  synchronize them; normal document actions always operate on the database.
 - If Content tools are not visible and no local Content app or Desktop bridge is
   running, treat this skill as repo-editing guidance. Edit configured
   \`.md\`/\`.mdx\` files directly, preserve frontmatter and MDX imports, and tell
@@ -40,16 +42,15 @@ Prefer JSON input for action calls:
 
 \`\`\`bash
 pnpm action list-documents
-pnpm action get-document '{"id":"local-file:..."}'
-pnpm action edit-document '{"id":"local-file:...","find":"old copy","replace":"new copy"}'
-pnpm action update-document '{"id":"local-file:...","content":"# Updated\\n\\nBody"}'
-pnpm action share-local-file-document '{"id":"local-file:..."}'
+pnpm action get-document '{"id":"document-id"}'
+pnpm action edit-document '{"id":"document-id","find":"old copy","replace":"new copy"}'
+pnpm action update-document '{"id":"document-id","content":"# Updated\\n\\nBody"}'
 \`\`\`
 
 Run \`refresh-list\` after create/update/delete operations when you need the
 open Content UI sidebar to repaint immediately.
 
-## Local File Mode
+## Local Folder Sources
 
 Install into an existing repo with:
 
@@ -58,20 +59,30 @@ npx @agent-native/core@latest skills add content --mode local-files --scope proj
 \`\`\`
 
 The installer copies this skill and writes or updates \`agent-native.json\` with
-Content roots for \`docs/\`, \`blog/\`, \`content/\`, and \`resources/\`, plus a
-\`components/\` folder for local MDX components. A typical manifest looks like:
+database-backed local-folder sources for \`docs/\`, \`blog/\`, \`content/\`, and
+\`resources/\`, plus a \`components/\` folder for local MDX components. A trusted
+local bridge imports these files into the workspace's canonical Files database.
+Run \`sync-manifest-local-folder-source\` with a root's generated
+\`source.connectionId\`, or launch \`agent-native content local-files <target>\`,
+to connect and pull it. A typical root looks like:
 
 \`\`\`json
 {
   "version": 1,
   "apps": {
     "content": {
-      "mode": "local-files",
       "roots": [
-        { "name": "Docs", "path": "docs", "kind": "docs", "extensions": [".md", ".mdx"] },
-        { "name": "Blog", "path": "blog", "kind": "blog", "extensions": [".md", ".mdx"] },
-        { "name": "Content", "path": "content", "kind": "content", "extensions": [".md", ".mdx"] },
-        { "name": "Resources", "path": "resources", "kind": "resources", "extensions": [".md", ".mdx"] }
+        {
+          "name": "Docs",
+          "path": "docs",
+          "kind": "docs",
+          "extensions": [".md", ".mdx"],
+          "source": {
+            "type": "local-folder",
+            "connectionId": "local-folder:<opaque-id>",
+            "truthPolicy": "source_primary"
+          }
+        }
       ],
       "components": "components",
       "extensions": "extensions",
@@ -81,9 +92,9 @@ Content roots for \`docs/\`, \`blog/\`, \`content/\`, and \`resources/\`, plus a
 }
 \`\`\`
 
-Local File Mode does not make the host language model local, and the hosted
-Content app cannot read private repo files by itself. File access requires a
-local Content app, Agent Native Desktop, or another trusted local bridge.
+Local-folder synchronization does not make the host language model local, and
+the hosted Content app cannot read private repo files by itself. File access
+requires a local Content app, Agent Native Desktop, or another trusted bridge.
 
 ## MDX And Components
 
@@ -99,9 +110,9 @@ local Content app, Agent Native Desktop, or another trusted local bridge.
 
 ## Boundaries
 
-- Moving, renaming, and reordering local-file pages are not first-class Content
-  UI operations yet. Use normal file operations when the user asks for those,
-  then let Content rediscover the file tree.
+- A database page and its source file can change independently. Use folder
+  check/pull/push and resolve reported conflicts rather than silently overwriting
+  either revision.
 - Do not push/pull Notion, Builder.io, or other provider-backed content unless
   the user explicitly asks for provider sync.
 - Do not paste secrets, private provider data, or credential-looking values into

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

@@ -119,7 +119,7 @@ export const BUILT_IN_APP_SKILLS = {
       id: "content",
       displayName: "Content",
       description:
-        "Edit docs, blogs, resources, and MDX content through the Content app, including repo-backed Local File Mode.",
+        "Edit docs, blogs, resources, and MDX content through the Content app, including database-backed local-folder sources.",
       hosted: {
         url: "https://content.agent-native.com",
         mcpUrl: "https://content.agent-native.com/mcp",
@@ -128,7 +128,7 @@ export const BUILT_IN_APP_SKILLS = {
       auth: {
         mode: "oauth",
         setup:
-          "Authenticate with the Content MCP connector in the host app. Local File Mode requires a local Content app, Agent Native Desktop, or trusted local bridge for filesystem access.",
+          "Authenticate with the Content MCP connector in the host app. Local-folder synchronization requires a local Content app, Agent Native Desktop, or trusted local bridge for filesystem access.",
       },
       surfaces: [
         {
@@ -941,15 +941,15 @@ function contentModeInstructionBlock(input: {
   if (input.mode === "local-files") {
     return `## Installed Mode
 
-Default storage for this installation: Content Local File Mode. This repo should
-have an \`agent-native.json\` file with \`apps.content.mode: "local-files"\`;
-the installer writes one if missing and fills in default roots for \`docs/\`,
-\`blog/\`, \`content/\`, and \`resources/\`. Prefer Content document actions
-when a local Content app,
-Agent Native Desktop, or another trusted local bridge exposes them. If those
-tools are not currently available, edit the configured Markdown/MDX files and
-local components directly, preserving frontmatter, imports, JSX, and unknown MDX
-syntax. The hosted Content app cannot read private repo files by itself.`;
+Default storage for this installation is Content's SQL database. This repo's
+\`agent-native.json\` declares \`docs/\`, \`blog/\`, \`content/\`, and
+\`resources/\` as local-folder sources with opaque connection ids; it does not
+select a separate application mode. A trusted local Content app or Agent Native
+Desktop bridge imports those files into their workspace's canonical Files
+database, after which normal Content document actions read and edit the SQL-backed
+pages. Use \`sync-manifest-local-folder-source\` with each root's generated
+connection id, or launch \`agent-native content local-files <target>\`, to connect
+and pull it. The hosted Content app cannot read private repo files by itself.`;
   }
   if (input.mode === "self-hosted") {
     return `## Installed Mode
@@ -1139,8 +1139,23 @@ function shouldWriteContentLocalFilesManifest(
   return targetId === "content" && mode === "local-files";
 }
 
+function contentLocalFolderConnectionId(baseDir: string, rootPath: string) {
+  const absoluteRootPath = path.resolve(baseDir, rootPath);
+  let canonicalRootPath = absoluteRootPath;
+  try {
+    canonicalRootPath = fs.realpathSync(absoluteRootPath);
+  } catch (error: any) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+  return `local-folder:${createHash("sha256")
+    .update(canonicalRootPath)
+    .digest("base64url")
+    .slice(0, 24)}`;
+}
+
 function mergeContentLocalFilesManifest(
   existing: unknown,
+  baseDir: string,
 ): Record<string, unknown> {
   const manifest = isJsonRecord(existing) ? { ...existing } : {};
   if (manifest.version === undefined) manifest.version = 1;
@@ -1148,10 +1163,29 @@ function mergeContentLocalFilesManifest(
   const apps = isJsonRecord(manifest.apps) ? { ...manifest.apps } : {};
   const contentApp = isJsonRecord(apps.content) ? { ...apps.content } : {};
   const defaults = defaultContentLocalFilesAppConfig();
-  contentApp.mode = "local-files";
   if (!Array.isArray(contentApp.roots) || contentApp.roots.length === 0) {
     contentApp.roots = defaults.roots;
   }
+  contentApp.roots = contentApp.roots.map((root: unknown) => {
+    if (!isJsonRecord(root) || typeof root.path !== "string") return root;
+    const source = isJsonRecord(root.source) ? root.source : {};
+    return {
+      ...root,
+      source: {
+        ...source,
+        type: "local-folder",
+        connectionId:
+          typeof source.connectionId === "string" && source.connectionId
+            ? source.connectionId
+            : contentLocalFolderConnectionId(baseDir, root.path),
+        truthPolicy:
+          typeof source.truthPolicy === "string"
+            ? source.truthPolicy
+            : "source_primary",
+      },
+    };
+  });
+  delete contentApp.mode;
   if (contentApp.components === undefined) {
     contentApp.components = defaults.components;
   }
@@ -1181,7 +1215,7 @@ function writeContentLocalFilesManifest(
       );
     }
   }
-  const manifest = mergeContentLocalFilesManifest(existing);
+  const manifest = mergeContentLocalFilesManifest(existing, baseDir);
   if (!options.dryRun) {
     fs.writeFileSync(
       manifestPath,

package/corpus/core/src/client/AgentPanel.tsx

@@ -110,6 +110,7 @@ import type {
   MultiTabAssistantChatHeaderProps,
   MultiTabAssistantChatProps,
 } from "./MultiTabAssistantChat.js";
+import { recoverFromStaleChunkError } from "./route-chunk-recovery.js";
 import { AgentNativeRouteWarmup } from "./route-warmup.js";
 import { withBuilderConnectTrackingParams } from "./settings/useBuilderStatus.js";
 import { useScreenRefreshKey } from "./use-db-sync.js";
@@ -2371,6 +2372,12 @@ class AgentPanelErrorBoundary extends React.Component<
   }
 
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+    if (recoverFromStaleChunkError(error)) {
+      console.warn(
+        "[agent-native] Recovering agent panel after stale chunk error",
+      );
+      return;
+    }
     const recoverableKind = assistantUiRecoverableRenderErrorKind(error);
     if (recoverableKind) {
       console.warn(

package/corpus/core/src/client/AssistantChat.tsx

@@ -2354,6 +2354,11 @@ const AssistantChatInner = forwardRef<
   } | null>(null);
   const [authSessionAvailable, setAuthSessionAvailable] = useState(false);
   const [queuedMessages, setQueuedMessages] = useState<QueuedMessage[]>([]);
+  // The dequeue guard briefly stays locked after appending a queued turn so
+  // the adapter has time to claim the run. Wake the effect when that guard
+  // expires; otherwise a fast-completing turn can leave the remaining queue
+  // pending with no state transition left to trigger another dequeue.
+  const [queueWakeVersion, setQueueWakeVersion] = useState(0);
   const queuedMessagesRef = useRef<QueuedMessage[]>([]);
   const queueDirtyRef = useRef(false);
   const queueMutationVersionRef = useRef(0);
@@ -4041,6 +4046,7 @@ const AssistantChatInner = forwardRef<
           if (appended) {
             window.setTimeout(() => {
               dequeueInFlightRef.current = false;
+              setQueueWakeVersion((version) => version + 1);
             }, 500);
           } else {
             dequeueInFlightRef.current = false;
@@ -4062,6 +4068,7 @@ const AssistantChatInner = forwardRef<
     applyLocalQueuedMessages,
     isRestoring,
     isRunning,
+    queueWakeVersion,
     queuedMessages,
     threadId,
   ]);

package/corpus/core/src/client/agent-chat-adapter.ts

@@ -3392,7 +3392,13 @@ export function createAgentChatAdapter(
                   text: formatChatErrorText(
                     message,
                     preservedError?.upgradeUrl,
-                    errorCode,
+                    // `message` is already user-facing here: either a
+                    // recovery-specific explanation from exhaustedRecoveryMessage
+                    // or a normalized gateway message from errorInfo. Passing
+                    // the fallback connection_error code back through the
+                    // formatter would replace the useful recovery guidance
+                    // with the generic interruption copy.
+                    preservedError ? errorCode : undefined,
                   ),
                 });
                 yield {