@agent-native/core 0.86.0 → 0.87.0

package/corpus/core/docs/content/locales/pt-BR/components.mdx

@@ -25,6 +25,15 @@ Evite importar componentes UI do pacote `@agent-native/core` simples. Usar
 `@agent-native/core/client` ou um subcaminho `@agent-native/core/client/*` em foco
 para que os empacotadores escolham a entrada segura para o navegador.
 
+Use `@agent-native/toolkit` para peças reutilizáveis de construção de aplicativos que não fazem parte do contrato fundamental do runtime: primitivas UI no estilo shadcn, hooks compartilhados, helpers simples de shell do app e outros módulos de composição de templates. Core mantém reexports de compatibilidade durante a transição, mas novo código de templates e apps deve importar módulos do toolkit diretamente:
+
+```tsx
+import { Button } from "@agent-native/toolkit/ui/button";
+import { Toaster } from "@agent-native/toolkit/ui/sonner";
+import { useToast } from "@agent-native/toolkit/hooks/use-toast";
+import { useSetHeaderActions } from "@agent-native/toolkit/app-shell";
+```
+
 <Diagram id="doc-block-smqhxh" title={"Desça uma camada, não fora da estrutura"} summary={"Cada camada mantém o mesmo tempo de execução – ações, estado do thread e sincronização SQL-backed – enquanto oferece mais controle sobre o cromo."}>
 
 ```html

package/corpus/core/docs/content/locales/pt-BR/creating-templates.mdx

@@ -7,6 +7,8 @@ description: "Como criar e publicar seus próprios modelos de aplicativos nativo
 
 Os modelos são aplicativos nativos do agente completos e bifurcáveis que resolvem um fluxo de trabalho real. Os modelos primários são criados com a mesma superfície de estrutura que você usa: rotas React para UI, Drizzle SQL para dados, actions para operações, recursos de espaço de trabalho para comportamento do agente e sincronização de sondagem para que o agente e UI permaneçam alinhados.
 
+Use `@agent-native/core` para o contrato de runtime: actions, plugins de servidor, helpers de banco de dados, estado do app, helpers de rotas e chat do agente. Use `@agent-native/toolkit` para UI reutilizável e helpers de construção de apps, como primitivas compartilhadas, hooks de toast/mobile, seletores de data e slots simples de shell do app. Mantenha variantes específicas do template locais quando elas codificarem comportamento de produto ou identidade visual.
+
 Um bom modelo:
 
 - Resolve um fluxo de trabalho de ponta a ponta, com dados iniciais úteis ou um fluxo de estado vazio.

package/corpus/core/docs/content/locales/pt-BR/template-analytics.mdx

@@ -149,6 +149,12 @@ O CLI imprime o dev local URL. Faça login com o Google e abra a página **Fonte
 
 **Session replay agent handoff.** Session recordings stay private, but the session detail page can mint a temporary **Copy for agent** link. The two-hour `agent_access` URL lets an external agent read replay summaries, timelines, and bounded event details without exposing blob/provider URLs or making the recording public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep replay chunk authorization, diagnostics payloads, and the
+session detail UI local to Analytics.
+
 ### Trabalhando com o agente
 
 O agente sempre sabe o que você está vendo. O estado atual da tela é injetado em cada mensagem como um bloco `<current-screen>` — ele contém a visualização ativa, o painel ou análise aberta e quaisquer filtros selecionados.

package/corpus/core/docs/content/locales/pt-BR/template-clips.mdx

@@ -133,6 +133,13 @@ agente.
 
 Temporary private agent links are also supported: the Share dialog can mint a two-hour `agent_access` URL for any recording the viewer can access. Agents use that token with the share page and JSON APIs, and the clip does not become public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep Clips-specific visibility checks, transcript/frame payloads,
+and player UI local. New links use `agent_access`; routes should continue
+accepting the legacy `t` query where existing agent API URLs may already use it.
+
 Os endpoints seguem as mesmas regras de público/senha/expiração da página de compartilhamento.
 Clipes protegidos por senha exigem a senha uma vez; retorno de respostas bem-sucedidas
 links tokenizados de curta duração para que os agentes downstream não precisem do texto simples

package/corpus/core/docs/content/locales/pt-BR/tracking.mdx

@@ -241,6 +241,12 @@ O modelo Analytics armazena os metadados de replay em SQL (`session_recordings`)
 
 Quando você precisar entregar uma gravação privada a um agente externo, use o controle **Copy for agent** da página de detalhes da sessão. Ele emite um link `agent_access` com escopo de gravação e validade de duas horas, renderiza via SSR um pequeno payload de descoberta em `/sessions/:recordingId`, e expõe apenas as APIs JSON de contexto/eventos do agente. A visibilidade da gravação não muda.
 
+Implementation note: the reusable layer is the core agent-access URL contract,
+not a replay-specific UI abstraction. Use `createScopedAgentAccessGrant`,
+`verifyScopedAgentAccessToken`, `buildAgentAccessUrl`, and
+`buildAgentAccessApiUrl` for scoped SSR and JSON API links; keep replay storage,
+diagnostics shaping, and access policy inside the Analytics template.
+
 Apenas para desenvolvimento local, o Analytics pode recorrer a blocos embutidos em SQL com limite de tamanho quando o armazenamento privado de blob não estiver disponível. As implantações de produção devem configurar armazenamento de blob privado ou criptografado, em vez de depender do Postgres para os payloads de replay.
 
 ## Avançado: provedores personalizados e internos {#advanced}

package/corpus/core/docs/content/locales/zh-CN/components.mdx

@@ -25,6 +25,15 @@ import { ResourcesPanel } from "@agent-native/core/client/resources";
 `@agent-native/core/client` 或聚焦的 `@agent-native/core/client/*` 子路径
 因此捆绑商选择浏览器安全的条目。
 
+将 `@agent-native/toolkit` 用于不属于基础运行时契约的可复用应用构建部件：shadcn 风格 UI primitives、共享 hooks、简单应用 shell helpers，以及其他模板组合模块。迁移期间 Core 会保留兼容 re-export，但新的模板和应用代码应直接导入 toolkit 模块：
+
+```tsx
+import { Button } from "@agent-native/toolkit/ui/button";
+import { Toaster } from "@agent-native/toolkit/ui/sonner";
+import { useToast } from "@agent-native/toolkit/hooks/use-toast";
+import { useSetHeaderActions } from "@agent-native/toolkit/app-shell";
+```
+
 <Diagram id="doc-block-1tquzyh" title={"下拉一层，不脱离框架"} summary={"每个层都保持相同的运行时 - 操作、线程状态和 SQL-backed 同步 - 同时让您更好地控制镶边。"}>
 
 ```html

package/corpus/core/docs/content/locales/zh-CN/creating-templates.mdx

@@ -7,6 +7,8 @@ description: "如何创建和发布您自己的代理本机应用模板。"
 
 模板是完整的、可分叉的代理本机应用程序，可解决实际工作流程。第一方模板使用您使用的相同框架表面构建：用于 UI 的 React 路由、用于数据的 Drizzle SQL、用于操作的 actions、用于代理行为的工作区资源以及轮询同步，以便代理和 UI 保持一致。
 
+将 `@agent-native/core` 用于运行时契约：actions、server plugins、database helpers、app state、routing helpers 和 agent chat。将 `@agent-native/toolkit` 用于可复用的应用构建 UI 和 helpers，例如共享 primitives、toast/mobile hooks、date pickers 和简单 app shell slots。当变体承载产品行为或视觉身份时，请保留在模板本地。
+
 一个好的模板：
 
 - 使用有用的种子数据或空状态流端到端地解决一个工作流。

package/corpus/core/docs/content/locales/zh-CN/template-analytics.mdx

@@ -149,6 +149,12 @@ CLI 打印本地开发 URL。使用 Google 登录，然后打开 **数据源**
 
 **Session replay agent handoff.** Session recordings stay private, but the session detail page can mint a temporary **Copy for agent** link. The two-hour `agent_access` URL lets an external agent read replay summaries, timelines, and bounded event details without exposing blob/provider URLs or making the recording public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep replay chunk authorization, diagnostics payloads, and the
+session detail UI local to Analytics.
+
 ### 与代理合作
 
 代理始终知道您在看什么。当前屏幕状态作为 `<current-screen>` 块注入到每条消息中 - 它包含活动视图、打开的仪表板或分析以及任何选定的过滤器。

package/corpus/core/docs/content/locales/zh-CN/template-clips.mdx

@@ -133,6 +133,13 @@ APIs，因此仅接受文本或静态图像的模型仍然可以理解内容
 
 Temporary private agent links are also supported: the Share dialog can mint a two-hour `agent_access` URL for any recording the viewer can access. Agents use that token with the share page and JSON APIs, and the clip does not become public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep Clips-specific visibility checks, transcript/frame payloads,
+and player UI local. New links use `agent_access`; routes should continue
+accepting the legacy `t` query where existing agent API URLs may already use it.
+
 端点遵循与共享页面相同的公共/密码/过期规则。
 受密码保护的剪辑需要密码一次；成功响应返回
 短暂的标记化链接，因此下游代理不需要明文

package/corpus/core/docs/content/locales/zh-CN/tracking.mdx

@@ -241,6 +241,12 @@ Analytics 模板将重放元数据存储在 SQL（`session_recordings`）中，
 
 当需要将私有录制内容提供给外部代理时，可使用会话详情页面的**复制给代理**控件。它会生成一个两小时有效期、仅限该录制的 `agent_access` 链接，在 `/sessions/:recordingId` 上以服务器端渲染方式生成一个小型发现载荷，并只暴露代理上下文/事件的 JSON API。该录制本身的可见性不会改变。
 
+Implementation note: the reusable layer is the core agent-access URL contract,
+not a replay-specific UI abstraction. Use `createScopedAgentAccessGrant`,
+`verifyScopedAgentAccessToken`, `buildAgentAccessUrl`, and
+`buildAgentAccessApiUrl` for scoped SSR and JSON API links; keep replay storage,
+diagnostics shaping, and access policy inside the Analytics template.
+
 仅在本地开发环境下，当私有 blob 存储不可用时，Analytics 可以回退为使用有上限的 SQL 内联数据块。生产部署应配置私有或加密的 blob 存储，而不是依赖 Postgres 来存放重放数据。
 
 ## 高级：自定义提供程序和内部结构 {#advanced}

package/corpus/core/docs/content/locales/zh-TW/components.mdx

@@ -25,6 +25,15 @@ import { ResourcesPanel } from "@agent-native/core/client/resources";
 `@agent-native/core/client` 或聚焦的 `@agent-native/core/client/*` 子路徑
 因此捆綁商選取瀏覽器安全的條目。
 
+將 `@agent-native/toolkit` 用於不屬於基礎執行階段合約的可重用應用程式建構部件：shadcn 風格 UI primitives、共享 hooks、簡單應用程式 shell helpers，以及其他範本組合模組。遷移期間 Core 會保留相容 re-export，但新的範本和應用程式程式碼應直接匯入 toolkit 模組：
+
+```tsx
+import { Button } from "@agent-native/toolkit/ui/button";
+import { Toaster } from "@agent-native/toolkit/ui/sonner";
+import { useToast } from "@agent-native/toolkit/hooks/use-toast";
+import { useSetHeaderActions } from "@agent-native/toolkit/app-shell";
+```
+
 <Diagram id="doc-block-174p2n3" title={"下拉一層，不脫離框架"} summary={"每個層都保持相同的執行時 - 操作、對話串狀態和 SQL-backed 同步 - 同時讓您更好地控制鑲邊。"}>
 
 ```html

package/corpus/core/docs/content/locales/zh-TW/creating-templates.mdx

@@ -7,6 +7,8 @@ description: "如何建立和發布您自己的 Agent-Native 應用範本。"
 
 範本是完整的、可分叉的 Agent-Native 應用程式，可解決實際工作流程。第一方範本使用您使用的相同框架表面建置：用於 UI 的 React 路由、用於資料的 Drizzle SQL、用於操作的 actions、用於代理行為的工作區資源以及輪詢同步，以便代理和 UI 保持一致。
 
+將 `@agent-native/core` 用於執行階段合約：actions、server plugins、database helpers、app state、routing helpers 和 agent chat。將 `@agent-native/toolkit` 用於可重用的應用程式建構 UI 和 helpers，例如共享 primitives、toast/mobile hooks、date pickers 和簡單 app shell slots。當變體承載產品行為或視覺識別時，請保留在範本本地。
+
 一個好的範本：
 
 - 使用有用的種子資料或空狀態流端對端地解決一個工作流。

package/corpus/core/docs/content/locales/zh-TW/template-analytics.mdx

@@ -149,6 +149,12 @@ CLI 列印本機開發 URL。使用 Google 登入，然後開啟 **資料來源*
 
 **Session replay agent handoff.** Session recordings stay private, but the session detail page can mint a temporary **Copy for agent** link. The two-hour `agent_access` URL lets an external agent read replay summaries, timelines, and bounded event details without exposing blob/provider URLs or making the recording public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep replay chunk authorization, diagnostics payloads, and the
+session detail UI local to Analytics.
+
 ### 與代理合作
 
 代理始終知道您在看什麼。目前螢幕狀態作為 `<current-screen>` 塊注入到每條訊息中 - 它包含活動檢視、開啟的儀表板或分析以及任何選定的過濾器。

package/corpus/core/docs/content/locales/zh-TW/template-clips.mdx

@@ -133,6 +133,13 @@ APIs，因此僅接受文字或靜態圖片的模型仍然可以理解內容
 
 Temporary private agent links are also supported: the Share dialog can mint a two-hour `agent_access` URL for any recording the viewer can access. Agents use that token with the share page and JSON APIs, and the clip does not become public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep Clips-specific visibility checks, transcript/frame payloads,
+and player UI local. New links use `agent_access`; routes should continue
+accepting the legacy `t` query where existing agent API URLs may already use it.
+
 端點遵循與共用頁面相同的公開/密碼/過期規則。
 受密碼保護的剪輯需要密碼一次；成功回應返回
 短暫的標記化連結，因此下游代理不需要明文

package/corpus/core/docs/content/locales/zh-TW/tracking.mdx

@@ -241,6 +241,12 @@ Analytics 範本將重播中繼資料儲存在 SQL（`session_recordings`）中
 
 當您需要將私人錄製內容交給外部代理時，請使用工作階段詳細資料頁面的**複製給代理**控制項。它會產生一個兩小時、僅限該筆錄製的 `agent_access` 連結，在 `/sessions/:recordingId` 上以伺服器端轉譯（SSR）一個小型探索酬載，並僅公開代理內容/事件 JSON API。該筆錄製的可見性不會改變。
 
+Implementation note: the reusable layer is the core agent-access URL contract,
+not a replay-specific UI abstraction. Use `createScopedAgentAccessGrant`,
+`verifyScopedAgentAccessToken`, `buildAgentAccessUrl`, and
+`buildAgentAccessApiUrl` for scoped SSR and JSON API links; keep replay storage,
+diagnostics shaping, and access policy inside the Analytics template.
+
 僅在本機開發時，Analytics 可以在私有 blob 儲存體無法使用時，回退到有上限的 SQL 內嵌區塊。正式環境部署應設定私有或加密的 blob 儲存體，而不是依賴 Postgres 來儲存重播酬載。
 
 ## 進階：自訂提供者和內部結構 {#advanced}

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

@@ -154,6 +154,12 @@ The CLI prints the local dev URL. Sign in with Google, then open the **Data Sour
 
 **Session replay agent handoff.** Session recordings stay private, but the session detail page can mint a temporary **Copy for agent** link. The two-hour `agent_access` URL lets an external agent read replay summaries, timelines, and bounded event details without exposing blob/provider URLs or making the recording public.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep replay chunk authorization, diagnostics payloads, and the
+session detail UI local to Analytics.
+
 ### Working with the agent
 
 The agent always knows what you're looking at. The current screen state is injected into every message as a `<current-screen>` block — it contains the active view, the open dashboard or analysis, and any selected filters.

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

@@ -185,6 +185,13 @@ Password-protected clips require the password once; successful responses return
 short-lived tokenized links so downstream agents do not need the plaintext
 password.
 
+Implementation note: use the shared core agent-access helpers
+(`createScopedAgentAccessGrant`, `verifyScopedAgentAccessToken`,
+`buildAgentAccessUrl`, and `buildAgentAccessApiUrl`) for the SSR/bot-visible
+URL contract. Keep Clips-specific visibility checks, transcript/frame payloads,
+and player UI local. New links use `agent_access`; routes should continue
+accepting the legacy `t` query where existing agent API URLs may already use it.
+
 When `transcript.status` is `pending`, agents should wait 15-30 seconds and
 retry the context or transcript URL a few times before falling back to frames or
 reporting that no transcript is available. Long recordings can take several

package/corpus/core/docs/content/tracking.mdx

@@ -241,6 +241,12 @@ The Analytics template stores replay metadata in SQL (`session_recordings`) and
 
 When you need to hand a private recording to an external agent, use the session detail page's **Copy for agent** control. It mints a two-hour, recording-scoped `agent_access` link, SSRs a small discovery payload on `/sessions/:recordingId`, and exposes only the agent context/events JSON APIs. The recording's visibility does not change.
 
+Implementation note: the reusable layer is the core agent-access URL contract,
+not a replay-specific UI abstraction. Use `createScopedAgentAccessGrant`,
+`verifyScopedAgentAccessToken`, `buildAgentAccessUrl`, and
+`buildAgentAccessApiUrl` for scoped SSR and JSON API links; keep replay storage,
+diagnostics shaping, and access policy inside the Analytics template.
+
 For local development only, Analytics can fall back to capped SQL inline chunks when private blob storage is unavailable. Production deployments should configure private or encrypted blob storage rather than relying on Postgres for replay payloads.
 
 ## Advanced: custom providers & internals {#advanced}

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.86.0",
+  "version": "0.87.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": {
@@ -63,6 +63,7 @@
     },
     "./agent-web": "./dist/agent-web/index.js",
     "./db": "./dist/db/index.js",
+    "./db-admin": "./dist/db-admin/index.js",
     "./db/schema": "./dist/db/schema.js",
     "./db/drizzle-config": "./dist/db/drizzle-config.js",
     "./client": "./dist/client/index.js",
@@ -72,6 +73,12 @@
     "./client/conversation": "./dist/client/conversation/index.js",
     "./client/editor": "./dist/client/editor/index.js",
     "./client/resources": "./dist/client/resources/index.js",
+    "./client/components/ui/dialog": "./dist/client/components/ui/dialog.js",
+    "./client/components/ui/dropdown-menu": "./dist/client/components/ui/dropdown-menu.js",
+    "./client/components/ui/hover-card": "./dist/client/components/ui/hover-card.js",
+    "./client/components/ui/popover": "./dist/client/components/ui/popover.js",
+    "./client/components/ui/sheet": "./dist/client/components/ui/sheet.js",
+    "./client/components/ui/tooltip": "./dist/client/components/ui/tooltip.js",
     "./blocks": "./dist/client/blocks/index.js",
     "./blocks/server": "./dist/client/blocks/server.js",
     "./client/AgentPanel": "./dist/client/AgentPanel.js",
@@ -189,6 +196,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "@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/application-state/emitter.ts

@@ -1,6 +1,5 @@
-import { EventEmitter } from "events";
-
 export interface AppStateEvent {
+  [key: string]: unknown;
   source: "app-state";
   type: "change" | "delete";
   key: string;
@@ -8,13 +7,46 @@ export interface AppStateEvent {
   requestSource?: string;
 }
 
+export type AppStateEventListener = (event: AppStateEvent) => void;
+
+export interface AppStateEmitter {
+  on(event: "app-state", listener: AppStateEventListener): this;
+  off(event: "app-state", listener: AppStateEventListener): this;
+  removeListener(event: "app-state", listener: AppStateEventListener): this;
+  emit(event: "app-state", payload: AppStateEvent): boolean;
+}
+
+class SimpleAppStateEmitter implements AppStateEmitter {
+  private readonly listeners = new Set<AppStateEventListener>();
+
+  on(event: "app-state", listener: AppStateEventListener): this {
+    if (event === "app-state") this.listeners.add(listener);
+    return this;
+  }
+
+  off(event: "app-state", listener: AppStateEventListener): this {
+    if (event === "app-state") this.listeners.delete(listener);
+    return this;
+  }
+
+  removeListener(event: "app-state", listener: AppStateEventListener): this {
+    return this.off(event, listener);
+  }
+
+  emit(event: "app-state", payload: AppStateEvent): boolean {
+    if (event !== "app-state") return false;
+    for (const listener of this.listeners) listener(payload);
+    return this.listeners.size > 0;
+  }
+}
+
 /**
- * Singleton EventEmitter for application-state DB changes.
+ * Singleton emitter for application-state DB changes.
  * The SSE handler subscribes to this via extraEmitters.
  */
-const _emitter = new EventEmitter();
+const _emitter = new SimpleAppStateEmitter();
 
-export function getAppStateEmitter(): EventEmitter {
+export function getAppStateEmitter(): AppStateEmitter {
   return _emitter;
 }
 

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

@@ -330,6 +330,7 @@ async function createWorkspaceInteractive(
         workspaceCoreName,
         coreDependencyVersion: getCoreDependencyVersion(),
         dispatchDependencyVersion: getDispatchDependencyVersion(),
+        toolkitDependencyVersion: getToolkitDependencyVersion(),
       });
       fixPackageJsonName(appDir, appName, templateName);
       fixWebManifestName(appDir, appName, templateName);
@@ -468,6 +469,22 @@ async function scaffoldWorkspaceRoot(
     }
   }
 
+  const localToolkit = localToolkitOverride();
+  if (localToolkit) {
+    const wsPath = path.join(targetDir, "pnpm-workspace.yaml");
+    const existing = fs.existsSync(wsPath)
+      ? fs.readFileSync(wsPath, "utf-8")
+      : "";
+    const updated = mergeWorkspaceYamlSections(existing, {
+      overrides: {
+        '"@agent-native/toolkit"': JSON.stringify(localToolkit),
+      },
+    });
+    if (updated !== existing) {
+      fs.writeFileSync(wsPath, updated);
+    }
+  }
+
   const corePackageDir = path.join(targetDir, "packages", "shared");
   fs.mkdirSync(path.join(targetDir, "packages"), { recursive: true });
   copyDir(coreTemplate, corePackageDir);
@@ -629,6 +646,7 @@ async function scaffoldOneAppIntoWorkspace(
       workspaceCoreName: workspace.workspaceCoreName,
       coreDependencyVersion: getCoreDependencyVersion(),
       dispatchDependencyVersion: getDispatchDependencyVersion(),
+      toolkitDependencyVersion: getToolkitDependencyVersion(),
     });
     fixPackageJsonName(appDir, appName, templateName);
     fixWebManifestName(appDir, appName, templateName);
@@ -898,9 +916,9 @@ async function scaffoldRequiredPackages(
       await downloadGitHubSubdir(REPO, `packages/${pkgName}`, targetDir);
     }
 
-    // The copied package may have @agent-native/core as a workspace:* dep.
-    // Convert it to this CLI package's published range since
-    // @agent-native/core is an npm package, not a workspace member.
+    // The copied package may have published framework packages as workspace:*
+    // deps. Convert them to published ranges because these package-backed
+    // modules are npm dependencies, not scaffolded workspace members.
     const pkgJsonPath = path.join(targetDir, "package.json");
     if (fs.existsSync(pkgJsonPath)) {
       try {
@@ -920,6 +938,13 @@ async function scaffoldRequiredPackages(
             ) {
               deps[key] = getCoreDependencyVersion();
             }
+            if (
+              typeof val === "string" &&
+              val.startsWith("workspace:") &&
+              key === "@agent-native/toolkit"
+            ) {
+              deps[key] = getToolkitDependencyVersion();
+            }
           }
         }
         fs.writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2) + "\n");
@@ -1006,6 +1031,8 @@ function postProcessStandalone(
             deps[key] = exactOverride;
           } else if (key === "@agent-native/core") {
             deps[key] = getCoreDependencyVersion();
+          } else if (key === "@agent-native/toolkit") {
+            deps[key] = getToolkitDependencyVersion();
           } else if (typeof val === "string" && val.startsWith("workspace:")) {
             deps[key] = "latest";
           } else if (typeof val === "string" && val === "catalog:") {
@@ -1056,6 +1083,12 @@ function postProcessStandalone(
         nf3: '"0.3.17"',
       };
     }
+    const localToolkit = localToolkitOverride();
+    if (localToolkit) {
+      sections.overrides ??= {};
+      sections.overrides['"@agent-native/toolkit"'] =
+        JSON.stringify(localToolkit);
+    }
     let updated = mergeWorkspaceYamlSections(existing, sections);
     updated = mergeWorkspaceYamlListItems(
       updated,
@@ -1262,6 +1295,7 @@ export {
   rewriteNetlifyToml as _rewriteNetlifyToml,
   getCoreDependencyVersion as _getCoreDependencyVersion,
   getDispatchDependencyVersion as _getDispatchDependencyVersion,
+  getToolkitDependencyVersion as _getToolkitDependencyVersion,
   getGitHubTemplateRef as _getGitHubTemplateRef,
   getGitHubTemplateRefCandidates as _getGitHubTemplateRefCandidates,
   workspaceAppNameForTemplateSelection as _workspaceAppNameForTemplateSelection,
@@ -1571,6 +1605,21 @@ function getDispatchDependencyVersion(): string {
   return "latest";
 }
 
+function getToolkitDependencyVersion(): string {
+  if (process.env.AGENT_NATIVE_CREATE_USE_LOCAL_CORE === "1") {
+    const localToolkit = findLocalPackage("toolkit");
+    if (localToolkit) return pathToFileURL(localToolkit).href;
+  }
+
+  return "latest";
+}
+
+function localToolkitOverride(): string | null {
+  if (process.env.AGENT_NATIVE_CREATE_USE_LOCAL_CORE !== "1") return null;
+  const localToolkit = findLocalPackage("toolkit");
+  return localToolkit ? pathToFileURL(localToolkit).href : null;
+}
+
 function getCorePackageVersion(): string | undefined {
   try {
     const packageRoot = path.resolve(__dirname, "../..");
@@ -1627,6 +1676,9 @@ function rewriteCoreDependencyVersions(projectDir: string): void {
       if (deps?.["@agent-native/core"]) {
         deps["@agent-native/core"] = getCoreDependencyVersion();
       }
+      if (deps?.["@agent-native/toolkit"]) {
+        deps["@agent-native/toolkit"] = getToolkitDependencyVersion();
+      }
     }
     fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
   } catch {}

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

@@ -5,7 +5,7 @@
  * workspace. The transform:
  *
  *   1. Rewrites package.json:
- *      - @agent-native/core and package-backed apps stay as regular npm deps
+ *      - Published framework packages stay as regular npm deps
  *      - Adds @<workspace-scope>/shared as a workspace:* dep so the app
  *        inherits shared plugins/skills/AGENTS.md via the three-layer model.
  *   2. Removes files that only make sense in standalone apps
@@ -40,17 +40,20 @@ export interface WorkspacifyOptions {
   coreDependencyVersion?: string;
   /** Version range to use for the package-backed Dispatch app */
   dispatchDependencyVersion?: string;
+  /** Version range to use for the published @agent-native/toolkit package */
+  toolkitDependencyVersion?: string;
 }
 
 export function workspacifyApp(opts: WorkspacifyOptions): void {
   const { appDir, workspaceCoreName } = opts;
   const coreDependencyVersion = opts.coreDependencyVersion ?? "latest";
   const dispatchDependencyVersion = opts.dispatchDependencyVersion ?? "latest";
+  const toolkitDependencyVersion = opts.toolkitDependencyVersion ?? "latest";
 
   // 1) Rewrite package.json to add the workspace core dep and resolve
-  //    @agent-native/core / @agent-native/dispatch workspace:* refs to
-  //    published package ranges. Other workspace:* deps (e.g.
-  //    @agent-native/scheduling) stay as-is — they resolve within the
+  //    published framework-package workspace:* refs to package ranges.
+  //    Other workspace:* deps (e.g. @agent-native/scheduling) stay as-is —
+  //    they resolve within the
   //    workspace because the required package is scaffolded alongside the app.
   const pkgPath = path.join(appDir, "package.json");
   if (fs.existsSync(pkgPath)) {
@@ -71,6 +74,9 @@ export function workspacifyApp(opts: WorkspacifyOptions): void {
             if (key === "@agent-native/dispatch") {
               deps[key] = dispatchDependencyVersion;
             }
+            if (key === "@agent-native/toolkit") {
+              deps[key] = toolkitDependencyVersion;
+            }
           }
         }
       }

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

@@ -65,6 +65,7 @@ import {
   TooltipTrigger,
   normalizeTooltipText,
 } from "./components/ui/tooltip.js";
+import { ErrorReportActions } from "./ErrorReportActions.js";
 import { FeedbackButton } from "./FeedbackButton.js";
 import { RunsTrayMenuItem } from "./progress/RunsTray.js";
 // Lazy-load the full assistant-ui chat stack (tiptap composer + react-markdown +
@@ -2251,6 +2252,15 @@ class AgentPanelErrorBoundary extends React.Component<
         >
           Reset agent panel
         </button>
+        <ErrorReportActions
+          appName="Agent panel"
+          title="Agent panel UI error"
+          details={this.state.error.message}
+          issueTitle="Agent panel UI error"
+          className="max-w-[260px]"
+          feedbackClassName="h-7"
+          githubClassName="h-7"
+        />
       </div>
     );
   }