@agent-native/core 0.14.8 → 0.15.1

package/dist/server/agent-chat-plugin.d.ts.map

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

package/dist/server/agent-chat-plugin.js

@@ -13,7 +13,7 @@ import { buildAssistantMessage, buildUserMessage, extractThreadMeta, mergeThread
 import { createError, defineEventHandler, setResponseStatus, setResponseHeader, getMethod, getQuery, getHeader, } from "h3";
 import { getSession } from "./auth.js";
 import { getOrigin } from "./google-oauth.js";
-import { createThread, forkThread, getThread, listThreads, searchThreads, updateThreadData, withThreadDataLock, deleteThread, setThreadQueuedMessages, } from "../chat-threads/store.js";
+import { createThread, forkThread, getThread, listThreads, searchThreads, setThreadScope, updateThreadData, withThreadDataLock, deleteThread, setThreadQueuedMessages, } from "../chat-threads/store.js";
 import { resourceList, resourceListAccessible, resourceGet, resourceGetByPath, ensurePersonalDefaults, SHARED_OWNER, } from "../resources/store.js";
 import { getFrontmatterValue, getSkillNameFromPath, parseFrontmatter, } from "../resources/metadata.js";
 import nodePath from "node:path";
@@ -167,6 +167,13 @@ function createRefreshScreenEntry() {
 }
 /** Well-known application-state key used by the refresh-screen tool. */
 const SCREEN_REFRESH_KEY = "__screen_refresh__";
+const SAFE_BROWSER_TAB_ID_RE = /^[A-Za-z0-9_-]{1,96}$/;
+function appStateKeyForBrowserTab(key, browserTabId) {
+    if (typeof browserTabId !== "string")
+        return key;
+    const trimmed = browserTabId.trim();
+    return SAFE_BROWSER_TAB_ID_RE.test(trimmed) ? `${key}:${trimmed}` : key;
+}
 /**
  * In-memory rate-limit tracker for `/generate-title`. Keyed by user email,
  * value is recent invocation timestamps within the rolling window. Stale
@@ -211,9 +218,15 @@ function createUrlTools() {
                 const params = (args?.params ?? {});
                 const merge = args?.merge !== "false";
                 const { writeAppState } = await import("../application-state/script-helpers.js");
-                await writeAppState("__set_url__", {
+                await writeAppState(appStateKeyForBrowserTab("__set_url__", getRequestRunContext()?.browserTabId), {
                     searchParams: params,
                     mergeSearchParams: merge,
+                    // Unique-per-write token. The client's URLSync hook dedups by this
+                    // so a fire-and-forget DELETE that loses its race against the next
+                    // polling refetch can't cause the same URL command to be applied
+                    // repeatedly (which caused the editor to bounce between slides
+                    // when an agent turn errored partway through).
+                    _writeId: `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                 });
                 const keys = Object.keys(params);
                 return `set-search-params: ${keys.length} key${keys.length === 1 ? "" : "s"}${merge ? "" : " (replace)"}`;
@@ -253,10 +266,14 @@ function createUrlTools() {
                 const params = (args?.params ?? {});
                 const merge = args?.merge !== "false";
                 const { writeAppState } = await import("../application-state/script-helpers.js");
-                await writeAppState("__set_url__", {
+                await writeAppState(appStateKeyForBrowserTab("__set_url__", getRequestRunContext()?.browserTabId), {
                     pathname,
                     searchParams: params,
                     mergeSearchParams: merge,
+                    // See note in set-search-params: unique-per-write dedup token so a
+                    // race between GET and consume-DELETE in URLSync can't re-apply
+                    // this command.
+                    _writeId: `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                 });
                 return `set-url-path: ${pathname}`;
             },
@@ -431,15 +448,26 @@ async function createDocsScriptEntries() {
 /**
  * Creates resource ScriptEntries available in both prod and dev modes.
  */
+function shouldDefaultResourceWriteToWorkspace(path) {
+    const normalized = path.replace(/^\/+/, "");
+    return (normalized === "AGENTS.md" ||
+        normalized === "LEARNINGS.md" ||
+        normalized.startsWith("memory/") ||
+        normalized.startsWith("skills/") ||
+        normalized.startsWith("jobs/") ||
+        normalized.startsWith("agents/") ||
+        normalized.startsWith("remote-agents/"));
+}
 async function createResourceScriptEntries() {
     try {
-        const [list, read, write, del, saveMem, delMem] = await Promise.all([
+        const [list, read, write, del, saveMem, delMem, store] = await Promise.all([
             import("../scripts/resources/list.js"),
             import("../scripts/resources/read.js"),
             import("../scripts/resources/write.js"),
             import("../scripts/resources/delete.js"),
             import("../scripts/resources/save-memory.js"),
             import("../scripts/resources/delete-memory.js"),
+            import("../resources/store.js"),
         ]);
         // Wrap each CLI runner so it captures stdout and converts args properly
         const listEntry = wrapCliScript({
@@ -461,14 +489,14 @@ async function createResourceScriptEntries() {
         return {
             resources: {
                 tool: {
-                    description: 'Manage persistent user files and notes. Actions: "list" (browse), "read" (get contents), "write" (create/update), "delete" (remove).',
+                    description: 'Manage workspace resources. Actions: "list" (browse visible files), "read" (get contents), "write" (create/update), "promote" (make agent scratch visible), "delete" (remove). Agent scratch writes are hidden from the Workspace view by default; use visibility="workspace" only for files the user explicitly wants to keep/manage.',
                     parameters: {
                         type: "object",
                         properties: {
                             action: {
                                 type: "string",
                                 description: "The operation to perform",
-                                enum: ["list", "read", "write", "delete"],
+                                enum: ["list", "read", "write", "promote", "delete"],
                             },
                             path: {
                                 type: "string",
@@ -496,6 +524,15 @@ async function createResourceScriptEntries() {
                                 description: 'Output format for list: "json" or "text" (default: text)',
                                 enum: ["json", "text"],
                             },
+                            visibility: {
+                                type: "string",
+                                description: 'Visibility for write: "agent_scratch" for internal working files, "workspace" for user-requested files. Defaults to agent_scratch except durable instruction/skill/job/memory paths.',
+                                enum: ["workspace", "agent_scratch"],
+                            },
+                            includeAgentScratch: {
+                                type: "boolean",
+                                description: "Include hidden agent scratch files when listing.",
+                            },
                         },
                         required: ["action"],
                     },
@@ -510,16 +547,53 @@ async function createResourceScriptEntries() {
                         return readEntry.run(rest);
                     }
                     if (a === "write") {
-                        if (!rest.path || !rest.content)
+                        if (!rest.path ||
+                            rest.content === undefined ||
+                            rest.content === null)
                             return "Error: path and content are required for write";
+                        rest.createdBy = "agent";
+                        rest.visibility =
+                            rest.visibility ??
+                                (shouldDefaultResourceWriteToWorkspace(String(rest.path))
+                                    ? "workspace"
+                                    : "agent_scratch");
+                        const runCtx = getRequestRunContext();
+                        if (runCtx?.threadId)
+                            rest.threadId = runCtx.threadId;
                         return writeEntry.run(rest);
                     }
+                    if (a === "promote") {
+                        if (!rest.path)
+                            return "Error: path is required for promote";
+                        const scope = rest.scope ?? "personal";
+                        const owner = scope === "shared"
+                            ? store.SHARED_OWNER
+                            : (getRequestRunContext()?.owner ??
+                                getRequestUserEmail() ??
+                                process.env.AGENT_USER_EMAIL);
+                        if (!owner) {
+                            return "Error: promote requires an authenticated user";
+                        }
+                        const resource = await store.resourceGetByPath(owner, String(rest.path));
+                        if (!resource) {
+                            return `Resource not found: ${rest.path}`;
+                        }
+                        const promoted = await store.resourcePut(owner, resource.path, resource.content, resource.mimeType, {
+                            createdBy: resource.createdBy,
+                            visibility: "workspace",
+                            threadId: resource.threadId,
+                            runId: resource.runId,
+                            expiresAt: null,
+                            metadata: resource.metadata,
+                        });
+                        return `Promoted resource: ${promoted.path}`;
+                    }
                     if (a === "delete") {
                         if (!rest.path)
                             return "Error: path is required for delete";
                         return deleteEntry.run(rest);
                     }
-                    return `Error: unknown action "${a}". Use: list, read, write, delete`;
+                    return `Error: unknown action "${a}". Use: list, read, write, promote, delete`;
                 },
             },
             "save-memory": wrapCliScript({
@@ -709,7 +783,7 @@ function createBuilderBrowserTool(deps) {
     return {
         "connect-builder": {
             tool: {
-                description: "Render a Builder.io card inline in the chat. Call this IMMEDIATELY — no exploration, no planning — when the user asks to modify the APP'S OWN SOURCE CODE: add a feature, change the UI chrome, edit a React component, add a route, add an integration, fix a bug in the app itself, or anything else that requires source-file edits while in hosted/production mode. Do NOT call this for creating or editing extensions/widgets/dashboards/calculators/mini-apps; those are sandboxed extension data and must use create-extension/update-extension instead. Do NOT call this for content the app is meant to produce — creating a video, generating a design, drafting an email, building a slide deck, making a dashboard, etc. — those run through the app's own domain actions, not Builder. Do NOT mention 'click Send to Builder' in your response unless this card is already in the conversation. If Builder is connected and Builder Cloud Agents are enabled, the card shows a 'Send to Builder' button that hands the work off to Builder's cloud agent and returns a branch URL. If `builderEnabled` is false, the card shows a waitlist/local-dev fallback instead; do not claim the Builder card has everything, is pre-loaded for handoff, or can run the cloud agent. When you call this for a code-change request, pass the user's request verbatim as the `prompt` arg so the card can forward it to Builder unchanged when cloud agents are available.",
+                description: "Render a Builder.io card inline in the chat. Call this IMMEDIATELY — no exploration, no planning — when the user asks to modify the APP'S OWN SOURCE CODE: add a feature, change the UI chrome, edit a React component, add a route, add an integration, fix a bug in the app itself, or anything else that requires source-file edits while in hosted/production mode. Do NOT call this for creating or editing extensions/widgets/dashboards/calculators/mini-apps; those are sandboxed extension data and must use create-extension/update-extension instead. Do NOT call this for content the app is meant to produce — creating a video, generating a design, drafting an email, building a slide deck, making a dashboard, etc. — those run through the app's own domain actions, not Builder. Do NOT mention 'click Send to Builder' in your response unless this card is already in the conversation. If Builder is connected and Builder Cloud Agents are available, the card shows a 'Send to Builder' button that hands the work off to Builder's cloud agent and returns a branch URL. If `builderEnabled` is false, the card shows a waitlist/local-dev fallback instead; never tell the user to enable Builder Cloud Agents in Builder org settings or beta settings, and do not claim the Builder card has everything, is pre-loaded for handoff, or can run the cloud agent. When you call this for a code-change request, pass the user's request verbatim as the `prompt` arg so the card can forward it to Builder unchanged when cloud agents are available.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -1008,16 +1082,21 @@ const FRAMEWORK_CORE_COMPACT = `
 11. **Find tools when unsure** — Use \`tool-search\` to find the exact action/tool for a capability. It searches the live registry, including connected MCP server tools.
 12. **Relative dates use runtime context** — The \`<runtime-context>\` block gives the authoritative current date/time. Resolve "today", "yesterday", "last week", and similar phrases to explicit calendar dates before querying data or creating artifacts.
 13. **Make progress visible** — For work that takes more than a few seconds, keep the user oriented. Use \`manage-progress\` when available, emit concise status before long tool/action runs, and update after meaningful milestones so the chat never looks like it is spinning on nothing.
+14. **Collaborate through uncertainty** — If a task stalls, errors, or depends on setup the user may not know about, shift into builder-coach mode instead of repeating the same attempt. State what you verified, name the most likely next checks, and proactively try common unblockers you can inspect (for example prompt size, missing environment variables, unavailable connections, current screen state, or tool choice). When you finish a meaningful step, offer one or two concrete next steps or improvements so non-technical users can keep iterating.
 
 ### Resources
 
 Use resource-list, resource-read, resource-write, resource-delete for persistent notes and context files.
-Resources are NOT an agent scratchpad — never create executable scripts, task plans, or work-in-progress files.
+Workspace resources are user-facing by default. If you need temporary working files, write them as agent scratch (\`visibility: "agent_scratch"\`); scratch is hidden from the Workspace view by default and expires. Use \`visibility: "workspace"\` only when the user explicitly asked to save/manage that file, or for durable AGENTS.md, LEARNINGS.md, memory, skills, jobs, or custom agents.
 
 ### Navigation Rule
 
 When the user says "show me", "go to", "open", etc., ALWAYS use \`navigate\` first.
 
+### First-Session Personalization
+
+On the user's first interaction, check \`readAppState("personalization")\`. If it isn't \`{ done: true }\`, greet briefly and ask two yes/no questions: (1) a theme pick that you can satisfy with \`change-appearance\` (presets: \`warm\`, \`ocean\`, \`forest\`, \`rose\`, \`slate\`, \`default\`), and (2) one short template-specific personalization question (see this template's AGENTS.md / CLAUDE.md, or fall back to a layout-density question). After they answer, apply the changes and write \`{ done: true }\` to \`application_state.personalization\`. If their first message is already on-task, answer it first and surface the theme offer in one trailing line, then mark personalization done so it never repeats.
+
 ### Extended Capabilities
 
 You also have tools for: inline embeds, chat history search, agent teams/sub-agents, recurring jobs, A2A cross-app calls, structured memory, and browser automation (\`activate-browser\` to provision a real Chrome). Call \`get-framework-context\` to read detailed instructions for any of these when needed.
@@ -1100,7 +1179,7 @@ If the user says yes, call \`manage-jobs\` (action: "create") with the original
 Do NOT add this offer for one-shot work: lookups (find Alice, what's the schema, who reported X), single drafts/replies, navigation requests, or any task whose value is in the moment. Skip it when the prompt is already explicitly recurring (the user said "every morning…" — you'd be asking what they already told you). One short sentence at most; do not turn it into a list of cadence options.`,
     builder: `### Connecting Builder.io
 
-When the user asks to connect Builder.io or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a one-click Connect card inline — do NOT write out multi-step setup instructions yourself.`,
+When the user asks to connect Builder.io or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a one-click Connect card inline — do NOT write out multi-step setup instructions yourself. If Builder Cloud Agents are not available for this workspace, never send the user to Builder org settings or beta settings; use the card's waitlist/local-dev fallback.`,
     browser: `### Browser Automation
 
 You can activate a real Chrome browser via Builder.io for tasks that need full page rendering:
@@ -1195,6 +1274,7 @@ const FRAMEWORK_CORE = `
 11. **Find tools when unsure** — Use \`tool-search\` to find the exact action/tool for a capability. It searches the live registry, including connected MCP server tools added through config, settings, or the MCP hub.
 12. **Relative dates use runtime context** — The \`<runtime-context>\` block gives the authoritative current date/time. Resolve "today", "yesterday", "last week", and similar phrases to explicit calendar dates before querying data or creating artifacts. When answering factual questions, include the exact date or date range you used.
 13. **Make progress visible** — For work that takes more than a few seconds, keep the user oriented. Use \`manage-progress\` when available, emit concise status before long tool/action runs, and update after meaningful milestones so the chat never looks like it is spinning on nothing.
+14. **Collaborate through uncertainty** — If a task stalls, errors, or depends on setup the user may not know about, shift into builder-coach mode instead of repeating the same attempt. State what you verified, name the most likely next checks, and proactively try common unblockers you can inspect (for example prompt size, missing environment variables, unavailable connections, current screen state, or tool choice). When you finish a meaningful step, offer one or two concrete next steps or improvements so non-technical users can keep iterating.
 
 ### Resources
 
@@ -1204,7 +1284,7 @@ Resources can be personal (per-user) or shared (team-wide). By default, resource
 
 When the user gives instructions that should apply to all users/sessions, update the shared "AGENTS.md" resource.
 
-**Resources are NOT an agent scratchpad.** Never use \`resource-write\` to store executable scripts, task plans, retry notes, or work-in-progress files you're writing to yourself. Specifically, do NOT create resources under \`scripts/\` or \`tasks/\` unless the user explicitly asked for a file at that path, or a tool (like \`manage-jobs\` or \`agent-teams\`) writes there as part of its contract. If you can't complete a task with the tools you have, say so — don't improvise by leaving behind \`FINAL-*.md\`, \`EXECUTE-NOW-*.js\`, or similar artifacts. Resources are visible to the user in the workspace sidebar; every file you write is something they'll see and have to clean up.
+Workspace resources are user-facing by default. If you need temporary working files, use the \`resources\` tool with \`visibility: "agent_scratch"\`; scratch resources are hidden from the Workspace view by default and expire automatically. Use \`visibility: "workspace"\` only when the user explicitly asked to save/create/manage that file, or for durable control files such as \`AGENTS.md\`, \`LEARNINGS.md\`, \`memory/\`, \`skills/\`, \`jobs/\`, or \`agents/\`. If a scratch result becomes useful to the user, call \`resources\` with \`action: "promote"\` or rewrite it with \`visibility: "workspace"\`.
 
 ### Navigation Rule
 
@@ -1299,7 +1379,7 @@ Skip this offer for one-shot work — single lookups (find X, who is Y), one-off
 
 ### Connecting Builder.io
 
-When the user asks to connect Builder.io, needs Builder for LLM access / browser automation, or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a one-click Connect card inline in the chat — do NOT write out multi-step setup instructions yourself (no "Option 1 / Option 2", no terminal commands). Just call the tool and let the card handle the rest.
+When the user asks to connect Builder.io, needs Builder for LLM access / browser automation, or you hit a "Builder not configured" error, call the \`connect-builder\` tool. It renders a one-click Connect card inline in the chat — do NOT write out multi-step setup instructions yourself (no "Option 1 / Option 2", no terminal commands). If Builder Cloud Agents are not available for this workspace, never send the user to Builder org settings or beta settings; use the card's waitlist/local-dev fallback. Just call the tool and let the card handle the rest.
 
 ### Browser Automation
 
@@ -1351,6 +1431,26 @@ You have a structured memory system. Your memory index (\`memory/MEMORY.md\`) is
 - Keep descriptions concise — the index is loaded every message
 - One memory per logical topic (e.g. 'coding-style', 'project-alpha')
 - Don't save temporary debugging notes or ephemeral task details
+
+### First-Session Personalization
+
+On the user's very first interaction in this app, before answering their actual request, briefly personalize the workspace.
+
+Check the application_state key \`personalization\` via \`readAppState("personalization")\`:
+- If it returns null (or has no \`done: true\`), this is the first session — run the flow below.
+- If \`done: true\` is set, skip the flow and answer normally.
+
+**The flow (keep it to one short message, then wait for their answer before continuing):**
+
+1. Greet briefly in one sentence.
+2. Ask **two** yes/no questions inline, on separate lines:
+   - A theme question: _"Want me to pick a color theme for your workspace? I have a few presets — say a name or just 'yes' for my pick."_ Available presets: \`warm\`, \`ocean\`, \`forest\`, \`rose\`, \`slate\` (call \`change-appearance\` with one of these; or \`default\` to clear). When the user says yes without a name, pick one preset that fits this template's tone.
+   - A template-specific question that the template's AGENTS.md / CLAUDE.md documents (e.g. for calendar: _"Want me to color-code meetings by attendee or by category?"_; for mail: _"Want me to surface emails that look like they need a reply at the top?"_). If the template doesn't suggest a question, ask one generic preference question (e.g. _"Do you prefer a denser layout or roomy spacing?"_).
+3. After they answer (or decline), call \`change-appearance\` if appropriate, do whatever the second answer implies (e.g. set a calendar visual preference), and then write \`application_state.personalization\` = \`{ "done": true }\` via \`writeAppState\` so this flow doesn't run again.
+
+If the user's first message is clearly already on-task (e.g. "what's on my calendar today?"), answer it first — but still surface ONE line at the end like _"By the way, want me to set a theme for your workspace? Try \`change-appearance warm\` or just ask."_ — then mark personalization done so the offer never repeats.
+
+Do NOT block on this flow. If the user ignores it, just proceed; never re-ask the personalization questions in later sessions.
 `;
 const PROD_FRAMEWORK_PROMPT = `## Agent-Native Framework — Production Mode
 
@@ -1402,7 +1502,9 @@ In Act mode, when the user asks you to change the UI, modify code, add a feature
 
 1. Briefly acknowledge the user's specific request in their own terms — one short clause naming what they asked for (e.g. "Got it — wider subject lines in the email list."). Do NOT restate the request verbatim, do NOT add a generic preamble, and do NOT promise outcomes. Skip this step entirely if the user already knows you're handing off (e.g. they said "send this to Builder").
 2. Call the \`connect-builder\` tool, passing the user's full request verbatim as the \`prompt\` argument. This renders an inline card. If Builder is connected and \`builderEnabled\` is true, the card hands the prompt off to Builder's cloud agent on one click and returns a branch URL. If Builder is not connected, it shows the Connect Builder flow. If \`builderEnabled\` is false, it shows a waitlist/local-dev fallback instead of a cloud handoff.
-3. After the card renders, inspect the tool result and write one sentence that frames the next click around what the user just asked — not as a Builder pitch. Examples: "Click Send to Builder and it'll wire that up for you." / "Connect Builder once and it'll handle this and future changes." / "Builder Cloud Agents aren't enabled here yet — you can still do this locally, and the Agent Native Desktop app handles it: https://www.agent-native.com/download." Do NOT say the card is pre-loaded, has everything, or lead with "Builder Cloud Agents are…" as if it were the headline.
+3. After the card renders, inspect the tool result and write one sentence that frames the next click around what the user just asked — not as a Builder pitch. Examples: "Click Send to Builder and it'll wire that up for you." / "Connect Builder once and it'll handle this and future changes." / "Builder Cloud Agents aren't available here yet — join the waitlist in the card, or use the Agent Native Desktop app for local code changes: https://www.agent-native.com/download." Do NOT say the card is pre-loaded, has everything, or lead with "Builder Cloud Agents are…" as if it were the headline.
+
+When \`builderEnabled\` is false, Builder Cloud Agents are not self-serve from Builder org settings. Do NOT tell the user to go to Builder org settings, beta features, "Cloud Agents", or "AI Agents" to enable them. The only allowed guidance is the card's waitlist/local-dev fallback: join the waitlist when the card offers it, use Agent Native Desktop, or edit from a local clone.
 
 **Act-mode hard rules — do NOT break these:**
 - Do NOT read source files, list directories, or explore the codebase. You have no filesystem tools and don't need to look at code to recommend Builder.
@@ -1464,7 +1566,7 @@ If the user wants a **new self-contained surface** (custom widget, dashboard, li
 
 ### Code Changes — Call \`connect-builder\`
 
-In Act mode, when a request genuinely needs a source-code edit (per the rules above), do this in order: (1) briefly acknowledge the user's specific ask in their own terms — one short clause, no preamble — then (2) call \`connect-builder\` with the user's request as the \`prompt\`, then (3) write one sentence framing the next click around what they asked for, not a Builder pitch. Do NOT write code, list files, make plans, or spawn sub-agents. Mention \`npx agent-native create <app-name>\` as an offline fallback when Builder Cloud Agents aren't available.
+In Act mode, when a request genuinely needs a source-code edit (per the rules above), do this in order: (1) briefly acknowledge the user's specific ask in their own terms — one short clause, no preamble — then (2) call \`connect-builder\` with the user's request as the \`prompt\`, then (3) write one sentence framing the next click around what they asked for, not a Builder pitch. Do NOT write code, list files, make plans, or spawn sub-agents. Mention \`npx agent-native create <app-name>\`, Agent Native Desktop, or the waitlist card as the fallback when Builder Cloud Agents aren't available. Never tell users to enable Builder Cloud Agents from Builder org settings, beta features, "Cloud Agents", or "AI Agents"; they are not self-serve there.
 ${FRAMEWORK_CORE_COMPACT}`;
 const DEV_FRAMEWORK_PROMPT_COMPACT = `## Agent-Native Framework — Development Mode
 
@@ -1501,7 +1603,7 @@ const DEFAULT_SYSTEM_PROMPT = PROD_FRAMEWORK_PROMPT;
  * AGENTS.md and restarting the server is all it takes; Vite HMR invalidates
  * the bundle in dev so changes land instantly.
  */
-async function loadResourcesForPrompt(owner, compact = false) {
+async function loadResourcesForPrompt(owner, compact = false, selfAppId) {
     await ensurePersonalDefaults(owner);
     const sections = [];
     // 1. Workspace AGENTS.md + skills merged into the template bundle.
@@ -1558,6 +1660,16 @@ async function loadResourcesForPrompt(owner, compact = false) {
             catch { }
         }
     }
+    try {
+        const agents = (await discoverAgents(selfAppId)).slice(0, 30);
+        if (agents.length > 0) {
+            const lines = agents.map((agent) => `- ${agent.name} (${agent.id}) — ${agent.description || "Connected A2A app"}`);
+            sections.push(`<available-apps>\nWorkspace apps available over A2A/call-agent:\n${lines.join("\n")}\n\nUse \`call-agent\` with the app id when another app owns the work or data. Use tool-search or app-specific actions for details only when needed.\n</available-apps>`);
+        }
+    }
+    catch {
+        // Agent discovery is helpful context, not required for the run.
+    }
     if (sections.length === 0)
         return "";
     return ("\n\nThe following resources contain template-specific instructions and user context. Use the information in them to help the user.\n\n" +
@@ -2307,7 +2419,7 @@ export function createAgentChatPlugin(options) {
                     if (!userEmail)
                         throw new Error("no authenticated user");
                     const owner = userEmail;
-                    const resources = await loadResourcesForPrompt(owner, lazyContext);
+                    const resources = await loadResourcesForPrompt(owner, lazyContext, options?.appId);
                     const schemaBlock = lazyContext
                         ? ""
                         : await buildSchemaBlock(owner, devActive);
@@ -2493,7 +2605,7 @@ export function createAgentChatPlugin(options) {
                             ...toolActions,
                         });
                     const mcpTools = actionsToEngineTools(mcpActions);
-                    const resources = await loadResourcesForPrompt(SHARED_OWNER, lazyContext);
+                    const resources = await loadResourcesForPrompt(SHARED_OWNER, lazyContext, options?.appId);
                     const schemaBlock = lazyContext
                         ? ""
                         : await buildSchemaBlock(SHARED_OWNER, devActiveMcp);
@@ -3010,7 +3122,10 @@ When the user asks for ANY of the following — add a feature, edit a component,
 
 1. Do NOT call \`connect-builder\`, \`scaffold-workspace-app\`, \`start-workspace-app-creation\`, or any other tool that creates or edits source.
 2. Do NOT write code, list files, propose patches, or describe what you would change.
-3. Reply with one short message saying chat-in-browser on localhost can't edit code (page reloads kill the session) and offer these alternatives, in this order:
+3. Reply with one short message saying chat-in-browser on localhost can't edit code (page reloads kill the session). If — and only if — the request is specifically to **add or scaffold a new workspace app**, lead with the CLI option since it runs in the same terminal the user is already using:
+   - **Agent Native CLI** — \`npx @agent-native/core add-app\` in this workspace directory (best for template apps like Mail/Calendar/Slides; the workspace gateway picks them up automatically)
+
+   Then offer these alternatives for general source-editing work, in this order:
    - **Agent Native Desktop** — https://www.agent-native.com/download (recommended; same chat, no reload risk)
    - **Claude Code** — \`claude\` in the project directory
    - **Codex** — \`codex\` in the project directory
@@ -3029,7 +3144,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                     if (leanPrompt) {
                         return setSystemPromptOnContext(leanBasePrompt + runtimeContext + browserLocalDev + extra);
                     }
-                    const resources = await loadResourcesForPrompt(owner, lazyContext);
+                    const resources = await loadResourcesForPrompt(owner, lazyContext, options?.appId);
                     // In lazy context mode, skip embedding the full schema — the agent
                     // calls `db-schema` on demand. This saves ~1-2K tokens per request.
                     const schemaBlock = lazyContext
@@ -3160,7 +3275,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                         if (leanPrompt) {
                             return setSystemPromptOnContext(leanBasePrompt + runtimeContext + extra);
                         }
-                        const resources = await loadResourcesForPrompt(owner, lazyContext);
+                        const resources = await loadResourcesForPrompt(owner, lazyContext, options?.appId);
                         const schemaBlock = lazyContext
                             ? ""
                             : await buildSchemaBlock(owner, true);
@@ -3885,6 +4000,46 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
             // ─── Thread management endpoints ──────────────────────────────────────
             // Single handler for /threads and /threads/:id — h3's use() does prefix
             // matching so we can't reliably split them into separate handlers.
+            const parseScopeFromQuery = (q) => {
+                const type = q.scopeType ? String(q.scopeType).trim() : "";
+                const id = q.scopeId ? String(q.scopeId).trim() : "";
+                if (!type || !id)
+                    return null;
+                const label = q.scopeLabel ? String(q.scopeLabel) : undefined;
+                return label ? { type, id, label } : { type, id };
+            };
+            const parseScopeFromBody = (raw) => {
+                if (raw == null)
+                    return null;
+                if (typeof raw !== "object")
+                    return null;
+                const r = raw;
+                const type = typeof r.type === "string" ? r.type.trim() : "";
+                const id = typeof r.id === "string" ? r.id.trim() : "";
+                if (!type || !id)
+                    return null;
+                const label = typeof r.label === "string" ? r.label : undefined;
+                return label ? { type, id, label } : { type, id };
+            };
+            const parseForkSourceFromBody = (raw) => {
+                if (!raw || typeof raw !== "object")
+                    return null;
+                const r = raw;
+                if (typeof r.threadData !== "string")
+                    return null;
+                const messageCount = typeof r.messageCount === "number"
+                    ? r.messageCount
+                    : Number(r.messageCount ?? 0);
+                return {
+                    threadData: r.threadData,
+                    title: typeof r.title === "string" ? r.title : "",
+                    preview: typeof r.preview === "string" ? r.preview : "",
+                    messageCount,
+                    ...(Object.prototype.hasOwnProperty.call(r, "scope")
+                        ? { scope: parseScopeFromBody(r.scope) }
+                        : {}),
+                };
+            };
             getH3App(nitroApp).use(`${routePath}/threads`, defineEventHandler(async (event) => {
                 const owner = await getOwnerFromEvent(event);
                 const method = getMethod(event);
@@ -3944,6 +4099,14 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                                 }
                             }
                             await updateThreadData(threadId, newThreadData, body.title ?? thread.title, body.preview ?? thread.preview, newMessageCount);
+                            // Scope updates piggyback on the PUT — the client uses this
+                            // path for both "detach" (scope: null) and "retag" flows.
+                            // Send the field as `scope: undefined` (or omit it) when
+                            // you don't want to touch the existing scope.
+                            if (Object.prototype.hasOwnProperty.call(body, "scope")) {
+                                const incomingScope = parseScopeFromBody(body.scope);
+                                await setThreadScope(threadId, incomingScope);
+                            }
                             return { ok: true };
                         });
                     }
@@ -3971,6 +4134,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                         const body = await readBody(event);
                         const forked = await forkThread(threadId, owner, {
                             id: body?.id,
+                            source: parseForkSourceFromBody(body?.source),
                         });
                         if (!forked) {
                             setResponseStatus(event, 404);
@@ -3995,12 +4159,21 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                     const query = getQuery(event);
                     const limit = Math.min(parseInt(String(query.limit ?? "50"), 10) || 50, 200);
                     const q = query.q ? String(query.q).trim() : "";
+                    const scope = parseScopeFromQuery(query);
+                    const unscopedOnly = String(query.unscoped ?? "") === "1";
                     if (q) {
-                        const threads = await searchThreads(owner, q, limit);
+                        const threads = await searchThreads(owner, q, limit, {
+                            scope: scope ?? undefined,
+                        });
                         return { threads };
                     }
                     const offset = parseInt(String(query.offset ?? "0"), 10) || 0;
-                    const threads = await listThreads(owner, limit, offset);
+                    const threads = await listThreads(owner, {
+                        limit,
+                        offset,
+                        scope: scope ?? undefined,
+                        unscopedOnly,
+                    });
                     return { threads };
                 }
                 if (method === "POST") {
@@ -4025,6 +4198,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                         const thread = await createThread(owner, {
                             id: body?.id,
                             title: body?.title ?? "",
+                            scope: parseScopeFromBody(body?.scope),
                         });
                         return thread;
                     }
@@ -4060,6 +4234,11 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                 const ownerContext = await resolveOwnerContext(event);
                 const owner = ownerContext.owner;
                 // Resolve org ID: explicit callback > session.orgId from Better Auth
+                // > implicit org membership. Better Auth leaves session.orgId null
+                // until the user explicitly switches orgs, so a fresh signup with
+                // implicit membership (e.g. domain-matched org) would otherwise see
+                // no org-scoped credentials. getOrgContext() does the same DB lookup
+                // the /builder/status endpoint uses to decide "Connected".
                 let resolvedOrgId;
                 if (options?.resolveOrgId) {
                     resolvedOrgId = (await options.resolveOrgId(event)) ?? undefined;
@@ -4072,6 +4251,16 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                     catch {
                         // Session not available
                     }
+                    if (!resolvedOrgId) {
+                        try {
+                            const { getOrgContext } = await import("../org/context.js");
+                            const ctx = await getOrgContext(event);
+                            resolvedOrgId = ctx.orgId ?? undefined;
+                        }
+                        catch {
+                            // org_members table may not exist yet on first boot
+                        }
+                    }
                 }
                 // Propagate the caller's IANA timezone from `x-user-timezone` so that
                 // tool calls made by the agent (e.g. log-meal with no explicit date)
@@ -4123,7 +4312,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                         ...toolActions,
                     }),
                     getSystemPrompt: async (owner) => {
-                        const resources = await loadResourcesForPrompt(owner, lazyContext);
+                        const resources = await loadResourcesForPrompt(owner, lazyContext, options?.appId);
                         const schemaBlock = lazyContext
                             ? ""
                             : await buildSchemaBlock(owner, false);
@@ -4164,7 +4353,7 @@ Non-code requests are still fine on this surface — read data, navigate the UI,
                         ...toolActions,
                     }),
                     getSystemPrompt: async (owner) => {
-                        const resources = await loadResourcesForPrompt(owner, lazyContext);
+                        const resources = await loadResourcesForPrompt(owner, lazyContext, options?.appId);
                         const schemaBlock = lazyContext
                             ? ""
                             : await buildSchemaBlock(owner, false);