npm - veryfront - Versions diffs - 0.1.1127 → 0.1.1132 - Mend

veryfront 0.1.1127 → 0.1.1132

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (118) hide show

package/esm/cli/templates/manifest.d.ts CHANGED Viewed

@@ -57,6 +57,7 @@ declare namespace _default {
                 "content/architecture.md": string;
                 "content/getting-started.md": string;
                 "globals.css": string;
+                "globals.d.ts": string;
                 "README.md": string;
                 "store.ts": string;
                 "tsconfig.json": string;

package/esm/cli/templates/manifest.js CHANGED Viewed

@@ -51,15 +51,16 @@ export default {
                 "app/api/ag-ui/route.ts": "import { createAgUiHandler } from \"veryfront/agent\";\nimport { store } from \"../../../store.ts\";\n\nexport const POST = createAgUiHandler(\"rag\", {\n  beforeStream: async ({ lastUserText }) => {\n    const query = lastUserText.trim();\n    if (!query) return;\n\n    try {\n      const results = await store.search(query, { topK: 5 });\n      if (results.length === 0) return;\n\n      const contextBlock = results\n        .map(\n          (result) =>\n            `[${result.title}] (score: ${\n              result.score.toFixed(2)\n            })\\n${result.text}`,\n        )\n        .join(\"\\n\\n---\\n\\n\");\n\n      return {\n        prepend: [\n          {\n            role: \"system\",\n            parts: [\n              {\n                type: \"text\",\n                text:\n                  `Here are relevant documents retrieved for your question:\\n\\n${contextBlock}\\n\\n` +\n                  \"Use these documents to answer. Cite the document title when referencing information.\",\n              },\n            ],\n          },\n        ],\n      };\n    } catch (e) {\n      console.error(\"[RAG] Retrieval failed:\", e);\n      return;\n    }\n  },\n});\n",
                 "app/api/ingest/route.ts": "import { store } from \"../../../store.ts\";\n\nexport async function POST() {\n  await store.indexContentDir();\n  return Response.json({ ok: true });\n}\n",
                 "app/api/uploads/route.ts": "import { createUploadHandler } from \"veryfront/embedding\";\nimport { store } from \"../../../store.ts\";\n\nexport const { POST, GET, DELETE } = createUploadHandler(store, {\n  auth: { type: \"none\", allowUnauthenticated: true },\n});\n",
-                "app/layout.tsx": "'use client'\n\nimport \"../globals.css\";\nimport {\n  AppShell,\n  ChatSidebar,\n  ChatThemeScope,\n  ConversationsProvider,\n  Tabs,\n  TabsItem,\n} from \"veryfront/chat\";\nimport { Head } from \"veryfront/head\";\nimport { useRouter } from \"veryfront/router\";\n\nexport default function RootLayout({ children }: { children: React.ReactNode }): React.ReactNode {\n  const router = useRouter();\n  const activeTab = router.pathname.startsWith(\"/uploads\") ? \"uploads\" : \"chat\";\n\n  return (\n    <>\n      <Head><title>Docs Agent</title></Head>\n      <ChatThemeScope className=\"flex flex-col h-screen\">\n        <ConversationsProvider storageKey=\"rag-conversations\">\n          <AppShell className=\"flex-1 min-h-0\">\n            <AppShell.Sidebar side=\"left\" className=\"border-r border-[var(--outline-border)]\">\n              <AppShell.SidebarContent className=\"p-0\">\n                <ChatSidebar.Root>\n                  <ChatSidebar.NewButton />\n                  <ChatSidebar.List />\n                </ChatSidebar.Root>\n              </AppShell.SidebarContent>\n            </AppShell.Sidebar>\n            <AppShell.Main>\n              <AppShell.Header border className=\"h-16 gap-3 px-3\">\n                <AppShell.Trigger side=\"left\" />\n                <div className=\"flex flex-1 justify-center\">\n                  <Tabs\n                    value={activeTab}\n                    onValueChange={(value) => router.push(value === \"uploads\" ? \"/uploads\" : \"/\")}\n                  >\n                    <TabsItem value=\"chat\">Chat</TabsItem>\n                    <TabsItem value=\"uploads\">Uploads</TabsItem>\n                  </Tabs>\n                </div>\n              </AppShell.Header>\n              <AppShell.Content className=\"flex flex-col min-h-0 pt-3\">\n                {children}\n              </AppShell.Content>\n            </AppShell.Main>\n          </AppShell>\n        </ConversationsProvider>\n      </ChatThemeScope>\n    </>\n  );\n}\n",
+                "app/layout.tsx": "'use client'\n\nimport \"../globals.css\";\nimport {\n  AppShell,\n  ChatSidebar,\n  ChatThemeScope,\n  ConversationsProvider,\n  Tabs,\n  TabsItem,\n} from \"veryfront/chat\";\nimport { Head } from \"veryfront/head\";\nimport { useRouter } from \"veryfront/router\";\n\nexport default function RootLayout({ children }: { children: React.ReactNode }): React.ReactNode {\n  const router = useRouter();\n  const activeTab = router.pathname.startsWith(\"/uploads\") ? \"uploads\" : \"chat\";\n\n  return (\n    <>\n      <Head><title>Docs Agent</title></Head>\n      <ChatThemeScope className=\"flex flex-col h-screen\">\n        <ConversationsProvider storageKey=\"rag-conversations\">\n          <AppShell className=\"flex-1 min-h-0\">\n            <AppShell.Sidebar side=\"left\" className=\"border-r border-[var(--outline-border)]\">\n              <AppShell.SidebarContent className=\"p-0\">\n                <ChatSidebar.Root>\n                  <ChatSidebar.NewButton />\n                  <ChatSidebar.List />\n                </ChatSidebar.Root>\n              </AppShell.SidebarContent>\n            </AppShell.Sidebar>\n            <AppShell.Main>\n              <AppShell.Header border className=\"h-16 gap-3 px-3\">\n                <AppShell.Trigger side=\"left\" />\n                <div className=\"flex flex-1 justify-center\">\n                  <Tabs\n                    value={activeTab}\n                    onValueChange={(value: string) =>\n                      router.push(value === \"uploads\" ? \"/uploads\" : \"/\")}\n                  >\n                    <TabsItem value=\"chat\">Chat</TabsItem>\n                    <TabsItem value=\"uploads\">Uploads</TabsItem>\n                  </Tabs>\n                </div>\n              </AppShell.Header>\n              <AppShell.Content className=\"flex flex-col min-h-0 pt-3\">\n                {children}\n              </AppShell.Content>\n            </AppShell.Main>\n          </AppShell>\n        </ConversationsProvider>\n      </ChatThemeScope>\n    </>\n  );\n}\n",
                 "app/page.tsx": "'use client'\n\nimport { Chat } from 'veryfront/chat'\n\nconst ACCEPT = '.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.csv,.txt,.md,.mdx,.html,.rtf,.epub,.json,.xml'\n\nexport default function DocsChat() {\n  return (\n    <Chat\n      agentId=\"rag\"\n      api=\"/api/ag-ui\"\n      uploadApi=\"/api/uploads\"\n      attachAccept={ACCEPT}\n      className=\"flex-1 min-h-0\"\n      placeholder=\"Ask anything about your documents...\"\n    />\n  )\n}\n",
                 "app/uploads/page.tsx": "'use client'\n\nimport { AttachmentsPanel, useUploadsRegistry } from 'veryfront/chat'\n\nconst UPLOAD_API = '/api/uploads'\nconst ACCEPT = '.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.csv,.txt,.md,.mdx,.html,.rtf,.epub,.json,.xml'\n\nexport default function UploadsPage(): React.JSX.Element {\n  const uploads = useUploadsRegistry({ url: UPLOAD_API, storageKey: 'rag-uploads' })\n\n  return (\n    <AttachmentsPanel\n      uploads={uploads.items}\n      loading={uploads.isLoading}\n      onAttach={uploads.upload}\n      onRemoveUpload={uploads.remove}\n      attachAccept={ACCEPT}\n      className=\"flex-1 min-h-0\"\n    />\n  )\n}\n",
                 "content/architecture.md": "# Architecture\n\nAcme Platform uses a modular, event-driven architecture.\n\n## Core Components\n\n### API Gateway\nRoutes incoming requests to the appropriate microservice. Handles authentication, rate limiting, and request validation.\n\n### Event Bus\nAsynchronous message broker connecting all services. Supports pub/sub and point-to-point messaging patterns.\n\n### Data Layer\nMulti-tenant data storage with automatic sharding. Supports PostgreSQL for relational data and Redis for caching.\n\n## Request Flow\n\n1. Client sends request to API Gateway\n2. Gateway validates authentication token\n3. Request is routed to the target service\n4. Service processes request and publishes events\n5. Response is returned through the gateway\n\n## Scaling\n\nEach component scales independently. The API Gateway uses horizontal scaling with load balancing. Services auto-scale based on queue depth and CPU utilization.\n\n## Security\n\n- All inter-service communication uses mTLS\n- API tokens are rotated every 24 hours\n- Data at rest is encrypted with AES-256\n- Audit logs are retained for 90 days\n",
                 "content/getting-started.md": "# Getting Started\n\nWelcome to Acme Platform. This guide covers initial setup and core concepts.\n\n## Installation\n\nInstall the CLI globally:\n\n```bash\nnpm install -g @acme/cli\n```\n\n## Creating a Project\n\nRun the init command to scaffold a new project:\n\n```bash\nacme init my-project\ncd my-project\n```\n\n## Project Structure\n\n- `src/`: Application source code\n- `config/`: Configuration files\n- `tests/`: Test suite\n- `docs/`: Documentation\n\n## Configuration\n\nCreate an `acme.config.ts` file in your project root:\n\n```ts\nexport default {\n  name: \"my-project\",\n  region: \"us-east-1\",\n  features: [\"auth\", \"storage\"],\n};\n```\n\n## Next Steps\n\n- Read the [Architecture Guide](./architecture) to understand the system design\n- Check [API Reference](./api-reference) for available endpoints\n- Join our Discord community for support\n",
                 "globals.css": "@import \"tailwindcss\";\n",
+                "globals.d.ts": "declare module \"*.css\";\n",
                 "README.md": "# Docs Agent\n\nA chatbot that answers questions from your own documents using Retrieval-Augmented Generation (RAG).\n\n## What's included\n\n- Q&A agent with source citation\n- Embedding-based semantic search with convention-based model selection\n- Document upload supporting PDF, DOCX, XLSX, PPTX, CSV, HTML, RTF, EPUB, TXT, and Markdown\n- `ragStore()` with local JSON storage by default, and Veryfront Cloud RAG when bootstrap is present\n- Veryfront Cloud AI Gateway routing for generation and embeddings when bootstrap is present\n- Original uploaded files stored in Veryfront Cloud project uploads when cloud bootstrap is present\n- Sample content in `/content` indexed through a dedicated ingestion route\n\n## Getting started\n\n1. Set your Veryfront Cloud bootstrap vars:\n\n   ```bash\n   export VERYFRONT_API_TOKEN=vf_...\n   export VERYFRONT_PROJECT_SLUG=my-project\n   ```\n\n2. Start the dev server:\n\n   ```bash\n   npx veryfront dev\n   ```\n\n3. Index the sample docs in `content/`:\n\n   ```bash\n   curl -X POST http://localhost:3000/api/ingest\n   ```\n\n4. Open the app and upload a document or ask a question.\n\nIf you are using a self-hosted Veryfront API, also set `VERYFRONT_API_URL`.\n\n## Cloud mode\n\nWith `VERYFRONT_API_TOKEN` and `VERYFRONT_PROJECT_SLUG` set, the template uses\nVeryfront Cloud automatically:\n\n- Agent generation routes through Veryfront Cloud model routing.\n- Query and document embeddings route through Veryfront Cloud embedding routing.\n- `veryfront-cloud/openai/...` and `veryfront-cloud/google/...` models use AI Gateway.\n- RAG documents, chunks, and embeddings are stored in the target project.\n\nThe default cloud embedding model is\n`veryfront-cloud/openai/text-embedding-3-small`. Set\n`VERYFRONT_DEFAULT_EMBEDDING_MODEL` only when you need a different embedding\nmodel.\n\n## Architecture\n\nRAG grounds LLM responses in your documents through three pipelines: **Ingestion**, **Query**, and **RAG**. These pipelines are orchestrated around a shared vector store.\n\n```mermaid\nflowchart LR\n    ChatUI_L[\"Chat UI\"]\n\n    subgraph IngestionFlow[\"Ingestion Pipeline\"]\n        D[\"Documents\"] --> EXT[\"Extraction\"] --> DC[\"Chunking\"] --> DE[\"Document\\nEmbedding\"] --> ING[\"Storage\"]\n    end\n\n    subgraph QueryFlow[\"Query Pipeline\"]\n        Q[\"Query\"] --> QE[\"Query\\nEmbedding\"] --> SS[\"Similarity\\nSearch\"]\n    end\n\n    subgraph RAGFlow[\"RAG Pipeline\"]\n        BF[\"beforeStream\\nHook\"] --> RET[\"Retrieval\"] --> AUG[\"Augmentation\"] --> AG[\"Agent\"] --> GEN[\"Generation\"]\n    end\n\n    EMB((\"Embedding\\nModel\"))\n    GEN_LLM((\"Generative\\nModel\"))\n    VS[(\"Vector\\nStore\")]\n    ChatUI_R[\"Chat UI\"]\n\n    ChatUI_L --> D\n    ChatUI_L --> Q\n\n    QE -.- EMB\n    DE -.- EMB\n\n    SS --> VS\n    ING --> VS\n\n    Q --> BF\n    VS --> RET\n    AG -.- GEN_LLM\n    GEN -.- GEN_LLM\n    GEN --> ChatUI_R\n```\n\n### Pipelines\n\n**Ingestion**: Documents are parsed into plain text via the built-in kreuzberg extraction engine (supporting PDF, DOCX, XLSX, PPTX, HTML, RTF, EPUB, and 76+ formats), split into overlapping chunks (~1000 chars, 200 char overlap), and stored in the default `ragStore()`. In local mode that means `data/index.json`; with Veryfront Cloud bootstrap it upgrades to the cloud RAG backend automatically. The original uploaded binary is also stored in the project's Veryfront Cloud uploads store so remote projects retain the source file, not just the extracted text. Uploaded files are ingested by the upload route. Bundled files in `content/` are ingested by the `/api/ingest` route.\n\n**Query**: The user's query is embedded into the same vector space as the documents, then compared against all stored chunks using cosine similarity to find the top-*k* most relevant results.\n\n**RAG**: The `beforeStream` hook in the AG-UI route intercepts each message before it reaches the agent. It searches the document store for relevant chunks, assembles them into context, and prepends them as retrieved reference data. The agent then generates a cited response streamed back to the user.\n\n## Structure\n\n```\nstore.ts                        RAG store config\nagents/rag.ts                   Q&A agent with citation instructions\ncontent/\n  getting-started.md            Sample document\n  architecture.md               Sample document\napp/\n  api/ag-ui/route.ts             AG-UI endpoint\n  api/ingest/route.ts            Bundled content ingestion\n  api/uploads/route.ts           Upload, list, and delete uploads\n  uploads/page.tsx               Upload management panel\n  page.tsx                       Chat UI\n  layout.tsx                     Chat shell with sidebar and tabs\n```\n\n## Framework usage\n\n| What | Framework | Template code |\n|------|-----------|---------------|\n| Chat UI + streaming | app-mode `Chat` | `page.tsx` |\n| Upload management | `AttachmentsPanel`, `useUploadsRegistry` | `uploads/page.tsx` |\n| Source display | Built into the `Chat` preset | `page.tsx` |\n| Upload API route | `createUploadHandler` | 1 line in `route.ts` |\n| AG-UI route | `createAgUiHandler` | 1 line in `route.ts` |\n| Agent definition | `agent()` | Config object in `agents/rag.ts` |\n| RAG retrieval | `beforeStream` hook | Context injection in `api/ag-ui/route.ts` |\n| Vector store | `ragStore()` | Config in `store.ts` |\n\n## Adding documents\n\n- Drop files into `content/`, then run `curl -X POST http://localhost:3000/api/ingest`\n- Or use the upload panel in the UI for PDF, DOCX, XLSX, PPTX, CSV, HTML, RTF, EPUB, TXT, and MD files\n\n## Production notes\n\nThis is a starter template, not a production-ready setup. For production, consider:\n\n- **Vector store**: Replace the default store with pgvector, Pinecone, or Qdrant for datasets beyond ~10k chunks\n- **Reranking**: Add a cross-encoder reranker (e.g. Cohere Rerank) after retrieval to improve precision\n- **Hybrid search**: Combine dense vectors with BM25 keyword matching for better recall\n",
                 "store.ts": "import { ragStore } from \"veryfront/embedding\";\n\nexport const store = ragStore({\n  storagePath: \"data/index.json\",\n  contentDir: \"content\",\n});\n",
-                "tsconfig.json": "{\n  \"compilerOptions\": {\n    \"target\": \"ES2022\",\n    \"module\": \"ESNext\",\n    \"moduleResolution\": \"bundler\",\n    \"strict\": true,\n    \"jsx\": \"react-jsx\",\n    \"skipLibCheck\": true,\n    \"esModuleInterop\": true,\n    \"paths\": {\n      \"@/*\": [\"./*\"]\n    }\n  },\n  \"include\": [\"**/*.ts\", \"**/*.tsx\"],\n  \"exclude\": [\"node_modules\"]\n}\n"
+                "tsconfig.json": "{\n  \"compilerOptions\": {\n    \"target\": \"ES2022\",\n    \"module\": \"ESNext\",\n    \"moduleResolution\": \"bundler\",\n    \"strict\": true,\n    \"jsx\": \"react-jsx\",\n    \"skipLibCheck\": true,\n    \"esModuleInterop\": true,\n    \"noEmit\": true,\n    \"allowImportingTsExtensions\": true,\n    \"paths\": {\n      \"@/*\": [\"./*\"]\n    }\n  },\n  \"include\": [\"**/*.ts\", \"**/*.tsx\"],\n  \"exclude\": [\"node_modules\"]\n}\n"
             }
         },
         "minimal": {

package/esm/deno.js CHANGED Viewed

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1127",
+    "version": "0.1.1132",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/src/agent/hosted/chat-execution-runtime.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chat-execution-runtime.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/chat-execution-runtime.ts"],"names":[],"mappings":"~~AAMA~~,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAGL,KAAK,+CAA+C,EACpD,KAAK,4BAA4B,EACjC,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAOlC,OAAO,KAAK,EACV,sBAAsB,EACtB,4BAA4B,EAC5B,6BAA6B,EAE9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EACL,KAAK,oCAAoC,EAK1C,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,2CAA2C,CAAC;AACnD,OAAO,~~EAGL~~,KAAK,6BAA6B,EAClC,KAAK,+BAA+B,EACpC,KAAK,+BAA+B,EACrC,MAAM,0BAA0B,CAAC;~~AAOlC~~,OAAO,EACL,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qCAAqC,CAAC;~~AAE~~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~~AAmJD~~,4CAA4C;AAC5C,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,qCAAqC,GAC3C,0BAA0B,CAwH5B"}
1	+ {"version":3,"file":"chat-execution-runtime.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/chat-execution-runtime.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/hosted/chat-execution-runtime.js CHANGED Viewed

@@ -1,15 +1,14 @@
 import { buildChatStreamChunkMessageMetadata, extractChatMessageMetadata, } from "../../chat/chat-ui-message-helpers.js";
-import { getLastStreamStep } from "../../chat/final-step-fallback.js";
 import { INVALID_ARGUMENT } from "../../errors/index.js";
 import { createHostedAgentRunSpanController, createHostedRootRunLifecycleRuntimeAdapter, } from "./agent-run-lifecycle.js";
 import { buildDetachedFallbackChunks, buildDetachedFallbackMessageState, buildFinalizedMessageFallbackChunks, buildFinalizedMessageState, } from "./finalized-message.js";
 import { dispatchConversationHostedStreamErrorState, dispatchConversationHostedTerminalState, resolveConversationHostedTerminalState, toConversationHostedTerminalState, } from "../conversation/hosted-terminal.js";
 import { createHostedMirroredUiStream, createMirroredToolChunkState, } from "../streaming/mirrored-tool-chunk-state.js";
-import { finalizeHostedDetached, finalizeHostedResponse, } from "./stream-finalization.js";
-import { getEmptyHostedFinalizedMessageTerminalError, getHostedStreamErrorText, shouldFailEmptyHostedFinalizedMessage, } from "./stream-terminal-error.js";
+import { getEmptyHostedFinalizedMessageTerminalError, getHostedStreamErrorText, } from "./stream-terminal-error.js";
 import { createChatStreamWatchdog, DEFAULT_CHAT_STREAM_TOOL_RUNNING_TIMEOUT_MS, } from "../../chat/stream-watchdog.js";
 import { unrefTimer } from "../../platform/compat/process.js";
 import { AGENT_DELEGATE_TOOL_PREFIX } from "../runtime/agent-delegation-names.js";
+import { finalizeHostedChatRun } from "./hosted-chat-finalization.js";
 const INCOMPLETE_TOOL_CALLS_PART_ERROR_TEXT = "Assistant ended before tool execution completed";
 const FINALIZATION_TERMINAL_STATE_FALLBACK_MODEL_ID = "";
 const DEFAULT_STREAM_BOOTSTRAP_KEEPALIVE_INTERVAL_MS = 30_000;
@@ -324,49 +323,33 @@ function logCleanupError(input) {
     });
 }
 async function finalizeResponseFinish(input) {
-    const hooks = createHostedChatStreamFinalizationHooks({
-        lifecycleAdapter: input.lifecycleAdapter,
-        cleanup: input.cleanup,
-        streamError: input.lastStreamError,
-        logger: input.logger,
-    });
-    const buildState = createHostedChatFinalizeResponseBuildState({
+    await finalizeHostedChatRun({
+        kind: "response",
         responseMessage: input.responseMessage,
         isAborted: input.isAborted,
+        streamResult: input.streamResult,
         lifecycleAdapter: input.lifecycleAdapter,
         mirroredToolChunkState: input.mirroredToolChunkState,
         capturedMessageId: input.capturedMessageId,
         incompleteToolCallsPartErrorText: input.incompleteToolCallsPartErrorText,
-    });
-    await finalizeHostedResponse({
-        isAborted: input.isAborted,
-        getFinalStep: () => getLastStreamStep(input.streamResult),
-        buildState,
-        shouldFailEmptyMessage: ({ isAborted, message }) => shouldFailEmptyHostedFinalizedMessage({ isAborted, message }),
-        ...hooks,
-    });
-}
-async function finalizeDetachedStreamEnd(input) {
-    const hooks = createHostedChatStreamFinalizationHooks({
-        lifecycleAdapter: input.lifecycleAdapter,
         cleanup: input.cleanup,
-        streamError: input.lastStreamError,
         logger: input.logger,
+        streamError: input.lastStreamError,
     });
-    const buildState = createHostedChatFinalizeDetachedBuildState({
-        capturedMessageId: input.capturedMessageId,
+}
+async function finalizeDetachedStreamEnd(input) {
+    await finalizeHostedChatRun({
+        kind: "detached",
         isAborted: input.isAborted,
+        mirroredDurableOutput: input.mirroredDurableOutput,
+        streamResult: input.streamResult,
         lifecycleAdapter: input.lifecycleAdapter,
+        capturedMessageId: input.capturedMessageId,
         mirroredToolChunkState: input.mirroredToolChunkState,
-        mirroredDurableOutput: input.mirroredDurableOutput,
         incompleteToolCallsPartErrorText: input.incompleteToolCallsPartErrorText,
-    });
-    await finalizeHostedDetached({
-        isAborted: input.isAborted,
-        mirroredDurableOutput: input.mirroredDurableOutput,
-        getFinalStep: () => getLastStreamStep(input.streamResult),
-        buildState,
-        ...hooks,
+        cleanup: input.cleanup,
+        logger: input.logger,
+        streamError: input.lastStreamError,
     });
 }
 function resolveStreamingMessageId(input) {

package/esm/src/agent/hosted/child-fork-tool-sources.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"child-fork-tool-sources.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-tool-sources.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gCAAgC,EAChC,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,~~EAGtB~~,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,KAAK,2BAA2B,EAGjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,+BAA+B,EACpC,KAAK,8BAA8B,EAEpC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EACL,KAAK,+BAA+B,EAErC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,8CAA8C,EACpD,MAAM,4BAA4B,CAAC;AAKpC,qEAAqE;AACrE,MAAM,MAAM,gCAAgC,GAAG;IAC7C,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,wEAAwE;AACxE,MAAM,MAAM,6CAA6C,GAAG;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,2BAA2B,EAAE,CAAC;IACpD,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8BAA8B,CAAC,EAAE,+BAA+B,CAAC;IACjE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,yBAAyB,KAAK,gBAAgB,CAAC;IACjF,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC;QACpE,KAAK,EAAE,WAAW,CAAC;QACnB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5B,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAC3C,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,uCAAuC,GAC/C;IACA,EAAE,EAAE,IAAI,CAAC;IACT,SAAS,EAAE,WAAW,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C,GACC;IACA,EAAE,EAAE,KAAK,CAAC;IACV,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEJ,gFAAgF;AAChF,MAAM,MAAM,oDAAoD,GAC5D,6CAA6C,GAC7C;IACA,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IAClE,8BAA8B,CAAC,EAAE,CAC/B,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,8BAA8B,CAAC,CAAC;CAC9C,CAAC;~~AAoDJ~~,sDAAsD;AACtD,wBAAsB,wCAAwC,CAC5D,KAAK,EAAE,6CAA6C,GACnD,OAAO,CAAC,uCAAuC,CAAC,~~CAkGlD~~;AAED,8DAA8D;AAC9D,wBAAsB,+CAA+C,CACnE,KAAK,EAAE,oDAAoD,GAC1D,OAAO,CAAC,8CAA8C,CAAC,CAsDzD"}
1	+ {"version":3,"file":"child-fork-tool-sources.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-tool-sources.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gCAAgC,EAChC,KAAK,WAAW,EAChB,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,KAAK,2BAA2B,EAGjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,KAAK,+BAA+B,EACpC,KAAK,8BAA8B,EAEpC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EACL,KAAK,+BAA+B,EAErC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,8CAA8C,EACpD,MAAM,4BAA4B,CAAC;AAKpC,qEAAqE;AACrE,MAAM,MAAM,gCAAgC,GAAG;IAC7C,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,wEAAwE;AACxE,MAAM,MAAM,6CAA6C,GAAG;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,2BAA2B,EAAE,CAAC;IACpD,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC5C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8BAA8B,CAAC,EAAE,+BAA+B,CAAC;IACjE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,yBAAyB,KAAK,gBAAgB,CAAC;IACjF,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC;QACpE,KAAK,EAAE,WAAW,CAAC;QACnB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5B,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;IAC3C,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,uCAAuC,GAC/C;IACA,EAAE,EAAE,IAAI,CAAC;IACT,SAAS,EAAE,WAAW,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C,GACC;IACA,EAAE,EAAE,KAAK,CAAC;IACV,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEJ,gFAAgF;AAChF,MAAM,MAAM,oDAAoD,GAC5D,6CAA6C,GAC7C;IACA,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IAClE,8BAA8B,CAAC,EAAE,CAC/B,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,8BAA8B,CAAC,CAAC;CAC9C,CAAC;AAEJ,sDAAsD;AACtD,wBAAsB,wCAAwC,CAC5D,KAAK,EAAE,6CAA6C,GACnD,OAAO,CAAC,uCAAuC,CAAC,CAuGlD;AAED,8DAA8D;AAC9D,wBAAsB,+CAA+C,CACnE,KAAK,EAAE,oDAAoD,GAC1D,OAAO,CAAC,8CAA8C,CAAC,CAsDzD"}

package/esm/src/agent/hosted/child-fork-tool-sources.js CHANGED Viewed

@@ -1,47 +1,13 @@
 import { createRemoteMCPToolSource, createToolsFromRemoteDefinitions, } from "../../tool/index.js";
-import { AGENT_ERROR, PERMISSION_DENIED } from "../../errors/index.js";
+import { AGENT_ERROR } from "../../errors/index.js";
 import { createAgentServiceRemoteMcpConfig, defaultAgentServiceMcpServers, } from "../service/mcp-server-config.js";
 import { createAgentServiceSandboxTools, } from "../../sandbox/index.js";
 import { createLiveStudioMcpTools, } from "../project/live-studio-mcp-tools.js";
 import { wrapHostedChildProjectSwitchTool, } from "./child-steering-tools.js";
 import { buildDefaultHostedChildForkToolSet, } from "./child-requested-tools.js";
+import { createMcpToolPolicyGate, wrapHostToolSetWithMcpPolicy } from "../mcp-tool-policy.js";
 import { filterVeryfrontApiToolDefinitionsWithAccessProfile } from "./veryfront-api-tool-access.js";
 import { createHostedMcpToolPolicySource } from "./project-remote-tool-source.js";
-function isMcpToolAllowed(toolName, policy) {
-    if (policy?.deny?.includes(toolName)) {
-        return false;
-    }
-    return policy?.allow ? policy.allow.includes(toolName) : true;
-}
-function filterHostToolsByMcpPolicy(tools, policy) {
-    if (!policy?.allow && !policy?.deny) {
-        return tools;
-    }
-    return Object.fromEntries(Object.entries(tools)
-        .filter(([toolName]) => isMcpToolAllowed(toolName, policy))
-        .map(([toolName, toolDefinition]) => [
-        toolName,
-        {
-            ...toolDefinition,
-            execute: toolDefinition.execute
-                ? (toolInput, execOptions) => {
-                    if (!isMcpToolAllowed(toolName, policy)) {
-                        throw PERMISSION_DENIED.create({
-                            detail: `Tool "${toolName}" is not allowed for this MCP server`,
-                        });
-                    }
-                    return toolDefinition.execute?.(toolInput, execOptions);
-                }
-                : toolDefinition.execute,
-        },
-    ]));
-}
-function filterToolDefinitionsByMcpPolicy(definitions, policy) {
-    if (!policy?.allow && !policy?.deny) {
-        return [...definitions];
-    }
-    return definitions.filter((definition) => isMcpToolAllowed(definition.name, policy));
-}
 /** Prepare default hosted child fork tool sources. */
 export async function prepareDefaultHostedChildForkToolSources(input) {
     throwIfAborted(input.abortSignal);
@@ -66,7 +32,9 @@ export async function prepareDefaultHostedChildForkToolSources(input) {
                         ? { createRemoteToolSource: input.createRemoteToolSource }
                         : {}),
                 });
-                const policyTools = filterHostToolsByMcpPolicy(studioTools.tools, server.toolPolicy);
+                const policyTools = wrapHostToolSetWithMcpPolicy(studioTools.tools, server.toolPolicy, {
+                    deniedDetail: (toolName) => `Tool "${toolName}" is not allowed for this MCP server`,
+                });
                 studioMcpTools = {
                     ...studioMcpTools,
                     ...policyTools,
@@ -93,7 +61,7 @@ export async function prepareDefaultHostedChildForkToolSources(input) {
                     projectId: input.getProjectId() ?? null,
                 })
                 : rawDefinitions;
-            const definitions = filterToolDefinitionsByMcpPolicy(accessFilteredDefinitions, server.toolPolicy);
+            const definitions = createMcpToolPolicyGate(server.toolPolicy).filterDefinitions(accessFilteredDefinitions);
             remoteMcpTools = {
                 ...remoteMcpTools,
                 ...materializeRemoteTools(policySource, definitions),

package/esm/src/agent/hosted/hosted-chat-finalization.d.ts ADDED Viewed

@@ -0,0 +1,30 @@
+import type { ChatUiMessage } from "../../chat/types.js";
+import type { MirroredToolChunkState } from "../streaming/mirrored-tool-chunk-state.js";
+import type { HostedChatExecutionLifecycleAdapter } from "./chat-execution-lifecycle-types.js";
+type HostedChatFinalizationLogger = {
+    error: (message: string, metadata?: Record<string, unknown>) => void;
+};
+export type HostedChatFinalizationCommon = {
+    streamResult: {
+        steps: PromiseLike<readonly unknown[]>;
+    };
+    lifecycleAdapter: HostedChatExecutionLifecycleAdapter;
+    mirroredToolChunkState: MirroredToolChunkState;
+    capturedMessageId: string | null;
+    incompleteToolCallsPartErrorText: string;
+    cleanup: () => Promise<void>;
+    logger?: HostedChatFinalizationLogger;
+    streamError?: unknown | null;
+};
+export type FinalizeHostedChatRunInput = HostedChatFinalizationCommon & ({
+    kind: "response";
+    responseMessage: ChatUiMessage;
+    isAborted: boolean;
+} | {
+    kind: "detached";
+    isAborted: boolean;
+    mirroredDurableOutput: boolean;
+});
+export declare function finalizeHostedChatRun(input: FinalizeHostedChatRunInput): Promise<void>;
+export {};
+//# sourceMappingURL=hosted-chat-finalization.d.ts.map

package/esm/src/agent/hosted/hosted-chat-finalization.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"hosted-chat-finalization.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/hosted-chat-finalization.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAuC,MAAM,qBAAqB,CAAC;AAO9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAKxF,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,qCAAqC,CAAC;AAe/F,KAAK,4BAA4B,GAAG;IAClC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACtE,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,YAAY,EAAE;QAAE,KAAK,EAAE,WAAW,CAAC,SAAS,OAAO,EAAE,CAAC,CAAA;KAAE,CAAC;IACzD,gBAAgB,EAAE,mCAAmC,CAAC;IACtD,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gCAAgC,EAAE,MAAM,CAAC;IACzC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,4BAA4B,CAAC;IACtC,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC,4BAA4B,GAC5B,CACE;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,eAAe,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GACxE;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,CAC3E,CAAC;AA4QJ,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,IAAI,CAAC,CA8Ef"}

package/esm/src/agent/hosted/hosted-chat-finalization.js ADDED Viewed

@@ -0,0 +1,249 @@
+import { extractChatMessageMetadata } from "../../chat/chat-ui-message-helpers.js";
+import { isToolUiPart } from "../../chat/conversation.js";
+import { getLastStreamStep } from "../../chat/final-step-fallback.js";
+import { dispatchConversationHostedTerminalState, resolveConversationHostedTerminalState, toConversationHostedTerminalState, } from "../conversation/hosted-terminal.js";
+import { hasCompletedStepSignal, isLateProviderBodyReadError, } from "../streaming/stream-outcome.js";
+import { buildDetachedFallbackChunks, buildDetachedFallbackMessageState, buildFinalizedMessageFallbackChunks, buildFinalizedMessageState, } from "./finalized-message.js";
+import { getEmptyHostedFinalizedMessageTerminalError, shouldFailEmptyHostedFinalizedMessage, } from "./stream-terminal-error.js";
+const FINALIZATION_TERMINAL_STATE_FALLBACK_MODEL_ID = "";
+function createHostedChatFinalizeResponseBuildState(input) {
+    return (finalStep) => {
+        const { persistedMessage, sanitizedFinalizedMessage, hasIncompleteFinalizedToolParts } = buildFinalizedMessageState({
+            responseMessage: input.responseMessage,
+            isAborted: input.isAborted,
+            finalStep,
+            incompleteToolCallsPartErrorText: input.incompleteToolCallsPartErrorText,
+        });
+        const fallbackChunks = sanitizedFinalizedMessage.parts.length > 0 && input.lifecycleAdapter.durableRunMirror
+            ? (() => {
+                const primaryChunks = buildFinalizedMessageFallbackChunks({
+                    persistedMessage,
+                    sanitizedFinalizedMessage,
+                    finalStep,
+                    mirroredToolChunkState: input.mirroredToolChunkState,
+                    capturedMessageId: input.capturedMessageId,
+                    hasIncompleteFinalizedToolParts,
+                });
+                return [
+                    ...primaryChunks,
+                    ...buildMissingToolOutputErrorChunksFromParts({
+                        parts: sanitizedFinalizedMessage.parts,
+                        mirroredToolChunkState: input.mirroredToolChunkState,
+                        primaryChunks,
+                    }),
+                ];
+            })()
+            : [];
+        return {
+            persistedMessage,
+            finalizedMessage: sanitizedFinalizedMessage,
+            fallbackChunks,
+            hasIncompleteToolParts: hasIncompleteFinalizedToolParts,
+            metadata: extractChatMessageMetadata(sanitizedFinalizedMessage.metadata),
+        };
+    };
+}
+function createHostedChatFinalizeDetachedBuildState(input) {
+    return (finalStep) => {
+        const { finalizedFallbackMessage, hasIncompleteFallbackToolParts } = buildDetachedFallbackMessageState({
+            capturedMessageId: input.capturedMessageId,
+            finalStep,
+            isAborted: input.isAborted,
+            incompleteToolCallsPartErrorText: input.incompleteToolCallsPartErrorText,
+        });
+        const fallbackParts = finalizedFallbackMessage.parts;
+        const fallbackChunks = fallbackParts.length > 0 && input.lifecycleAdapter.durableRunMirror &&
+            input.capturedMessageId
+            ? (() => {
+                const primaryChunks = buildDetachedFallbackChunks({
+                    fallbackParts,
+                    finalStep,
+                    mirroredToolChunkState: input.mirroredToolChunkState,
+                    mirroredDurableOutput: input.mirroredDurableOutput,
+                    capturedMessageId: input.capturedMessageId,
+                    hasIncompleteFallbackToolParts,
+                });
+                return [
+                    ...primaryChunks,
+                    ...buildMissingToolOutputErrorChunksFromParts({
+                        parts: fallbackParts,
+                        mirroredToolChunkState: input.mirroredToolChunkState,
+                        primaryChunks,
+                    }),
+                ];
+            })()
+            : [];
+        return {
+            hasContent: fallbackParts.length > 0,
+            fallbackChunks,
+            hasIncompleteToolParts: hasIncompleteFallbackToolParts,
+        };
+    };
+}
+function buildMissingToolOutputErrorChunksFromParts(input) {
+    const chunks = [];
+    const outputErrorToolCallIds = new Set(input.mirroredToolChunkState.outputErrorToolCallIds);
+    const outputAvailableToolCallIds = new Set(input.mirroredToolChunkState.outputAvailableToolCallIds);
+    const outputDeniedToolCallIds = new Set(input.mirroredToolChunkState.outputDeniedToolCallIds);
+    for (const chunk of input.primaryChunks) {
+        if (chunk.type === "tool-output-error") {
+            outputErrorToolCallIds.add(chunk.toolCallId);
+            continue;
+        }
+        if (chunk.type === "tool-output-available") {
+            outputAvailableToolCallIds.add(chunk.toolCallId);
+            continue;
+        }
+        if (chunk.type === "tool-output-denied") {
+            outputDeniedToolCallIds.add(chunk.toolCallId);
+        }
+    }
+    for (const part of input.parts) {
+        if (!isToolUiPart(part) || part.state !== "output-error" ||
+            outputErrorToolCallIds.has(part.toolCallId) ||
+            outputAvailableToolCallIds.has(part.toolCallId) ||
+            outputDeniedToolCallIds.has(part.toolCallId)) {
+            continue;
+        }
+        chunks.push({
+            type: "tool-output-error",
+            toolCallId: part.toolCallId,
+            errorText: typeof part.errorText === "string" ? part.errorText : "Tool execution failed",
+        });
+        outputErrorToolCallIds.add(part.toolCallId);
+    }
+    return chunks;
+}
+function toHostedChatExecutionFinalState(input) {
+    return toConversationHostedTerminalState({
+        state: input,
+        fallbackModelId: FINALIZATION_TERMINAL_STATE_FALLBACK_MODEL_ID,
+    });
+}
+async function cleanupAfterFinalization(input) {
+    await input.cleanup().catch((cleanupError) => {
+        input.logger?.error("Runtime cleanup failed during finalization", {
+            error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError),
+        });
+    });
+}
+function hasFinalStepCompletionSignal(finalStep) {
+    if (typeof finalStep !== "object" || finalStep === null || !("finishReason" in finalStep) ||
+        typeof finalStep.finishReason !== "string") {
+        return false;
+    }
+    return hasCompletedStepSignal(finalStep.finishReason);
+}
+function shouldFailStreamError(input) {
+    if (input.isAborted || input.streamError == null) {
+        return false;
+    }
+    if (input.hasOutput &&
+        hasFinalStepCompletionSignal(input.finalStep) &&
+        isLateProviderBodyReadError(input.streamError)) {
+        return false;
+    }
+    return true;
+}
+async function appendFallbackChunks(input) {
+    for (const chunk of input.chunks) {
+        await input.lifecycleAdapter.durableRunMirror?.handleChunk(chunk);
+    }
+}
+async function flushMirror(lifecycleAdapter) {
+    await lifecycleAdapter.durableRunMirror?.flush();
+}
+async function dispatchTerminalState(input) {
+    await dispatchConversationHostedTerminalState(input.lifecycleAdapter, input.terminalState);
+}
+async function dispatchFailedTerminalError(input) {
+    const terminalError = getEmptyHostedFinalizedMessageTerminalError({
+        finalStep: input.finalStep,
+        streamError: input.streamError,
+    });
+    await dispatchTerminalState({
+        lifecycleAdapter: input.lifecycleAdapter,
+        terminalState: {
+            status: "failed",
+            ...(input.metadata !== undefined ? { metadata: input.metadata } : {}),
+            terminalErrorCode: terminalError.code,
+            terminalErrorMessage: terminalError.message,
+        },
+    });
+}
+function resolveTerminalState(input) {
+    return toHostedChatExecutionFinalState(resolveConversationHostedTerminalState({
+        isAborted: input.isAborted,
+        hasIncompleteToolParts: input.hasIncompleteToolParts,
+    }));
+}
+export async function finalizeHostedChatRun(input) {
+    const finalStep = await getLastStreamStep(input.streamResult);
+    let fallbackChunks;
+    let hasIncompleteToolParts;
+    let metadata;
+    let emptyFailure;
+    let hasOutput;
+    if (input.kind === "response") {
+        const state = createHostedChatFinalizeResponseBuildState(input)(finalStep);
+        fallbackChunks = state.fallbackChunks;
+        hasIncompleteToolParts = state.hasIncompleteToolParts;
+        metadata = state.metadata;
+        emptyFailure = shouldFailEmptyHostedFinalizedMessage({
+            isAborted: input.isAborted,
+            message: state.finalizedMessage,
+        });
+        hasOutput = true;
+    }
+    else {
+        const state = createHostedChatFinalizeDetachedBuildState(input)(finalStep);
+        fallbackChunks = state.fallbackChunks;
+        hasIncompleteToolParts = state.hasIncompleteToolParts;
+        metadata = undefined;
+        emptyFailure = !input.isAborted && !input.mirroredDurableOutput && !state.hasContent;
+        hasOutput = input.mirroredDurableOutput || state.hasContent;
+    }
+    if (emptyFailure) {
+        await flushMirror(input.lifecycleAdapter);
+        await dispatchFailedTerminalError({
+            lifecycleAdapter: input.lifecycleAdapter,
+            finalStep,
+            streamError: input.streamError,
+            metadata,
+        });
+        await cleanupAfterFinalization({ cleanup: input.cleanup, logger: input.logger });
+        return;
+    }
+    await appendFallbackChunks({
+        chunks: fallbackChunks,
+        lifecycleAdapter: input.lifecycleAdapter,
+    });
+    await flushMirror(input.lifecycleAdapter);
+    if (shouldFailStreamError({
+        isAborted: input.isAborted,
+        hasOutput,
+        finalStep,
+        streamError: input.streamError,
+    })) {
+        await dispatchFailedTerminalError({
+            lifecycleAdapter: input.lifecycleAdapter,
+            finalStep,
+            streamError: input.streamError,
+            metadata,
+        });
+        await cleanupAfterFinalization({ cleanup: input.cleanup, logger: input.logger });
+        return;
+    }
+    const terminalState = resolveTerminalState({
+        isAborted: input.isAborted,
+        hasIncompleteToolParts,
+    });
+    await dispatchTerminalState({
+        lifecycleAdapter: input.lifecycleAdapter,
+        terminalState: {
+            ...terminalState,
+            ...(metadata !== undefined ? { metadata } : {}),
+        },
+    });
+    await cleanupAfterFinalization({ cleanup: input.cleanup, logger: input.logger });
+}

package/esm/src/agent/hosted/project-remote-tool-source.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project-remote-tool-source.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/project-remote-tool-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,qCAAqC,EAC1C,KAAK,uCAAuC,EAC5C,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAGjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;~~AAGtD~~,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAGL,KAAK,6BAA6B,EAClC,KAAK,oBAAoB,EAC1B,MAAM,iCAAiC,CAAC;AAGzC,8DAA8D;AAC9D,MAAM,MAAM,4CAA4C,GAAG,CACzD,QAAQ,EAAE,6BAA6B,KACpC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE1B,oEAAoE;AACpE,MAAM,MAAM,iDAAiD,GAAG,CAC9D,SAAS,EAAE,MAAM,KACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE1B,wEAAwE;AACxE,MAAM,MAAM,6CAA6C,GAAG,CAAC,KAAK,EAAE;IAClE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE9B,8EAA8E;AAC9E,MAAM,MAAM,wCAAwC,GAAG,CAAC,KAAK,EAAE;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;CAChB,KAAK,OAAO,CAAC;AAEd,kEAAkE;AAClE,MAAM,MAAM,wCAAwC,GAAG;IACrD,MAAM,EAAE,gBAAgB,CAAC;IACzB,gBAAgB,CAAC,EAAE,uCAAuC,CAAC;IAC3D,iBAAiB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACpD,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9C;;;;;;OAMG;IACH,wBAAwB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtD,8BAA8B,CAAC,EAAE,8BAA8B,CAAC;IAChE,qBAAqB,CAAC,EAAE,qCAAqC,CAAC,uBAAuB,CAAC,CAAC;IACvF,gBAAgB,CAAC,EAAE,6CAA6C,CAAC;IACjE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,wCAAwC,CAAC;IAC/D,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,eAAe,CAAC,EAAE,iDAAiD,CAAC;IACpE,kBAAkB,CAAC,EAAE,4CAA4C,CAAC;CACnE,CAAC;AAQF,gDAAgD;AAChD,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,wCAAwC,GAC9C,gBAAgB,CAuJlB;AAED,mEAAmE;AACnE,MAAM,MAAM,yCAAyC,GACjD,IAAI,CACJ,wCAAwC,EACxC,QAAQ,GAAG,iBAAiB,CAC7B,GACC;IACA,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,2BAA2B,EAAE,CAAC;IACpD,aAAa,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC5C,YAAY,EAAE,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,yBAAyB,KAAK,gBAAgB,CAAC;IACjF,qBAAqB,CAAC,EAAE,iDAAiD,CAAC;CAC3E,CAAC;~~AAoGJ~~,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,kBAAkB,GAAG,SAAS,GACrC,gBAAgB,~~CAsBlB~~;AAED,iDAAiD;AACjD,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,yCAAyC,GAC/C,gBAAgB,EAAE,CAkCpB"}
1	+ {"version":3,"file":"project-remote-tool-source.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/project-remote-tool-source.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/hosted/project-remote-tool-source.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { createProjectScopedRemoteToolCatalog, createRemoteMCPToolSource, isProjectNavigationRemoteTool, } from "../../tool/index.js";
 import { createAgentServiceRemoteMcpConfig, defaultAgentServiceMcpServers, } from "../service/mcp-server-config.js";
+import { wrapRemoteToolSourceWithMcpPolicy } from "../mcp-tool-policy.js";
 import { CONFIG_INVALID, PERMISSION_DENIED } from "../../errors/index.js";
 import { toChildRunToolInputRecord } from "../child-run/execution-support.js";
 import { getConfirmedProjectContextSwitchId } from "../project/context.js";
@@ -184,30 +185,10 @@ function createHostedProjectRemoteToolSourceFromConfig(input, server, source, on
         ...(onProjectSwitch !== undefined ? { onProjectSwitch } : {}),
     });
 }
-function isHostedMcpToolAllowed(toolName, policy) {
-    if (policy?.deny?.includes(toolName)) {
-        return false;
-    }
-    return policy?.allow ? policy.allow.includes(toolName) : true;
-}
 export function createHostedMcpToolPolicySource(source, policy) {
-    if (!policy?.allow && !policy?.deny) {
-        return source;
-    }
-    return {
-        id: source.id,
-        async listTools(context) {
-            return (await source.listTools(context)).filter((toolDefinition) => isHostedMcpToolAllowed(toolDefinition.name, policy));
-        },
-        executeTool(toolName, args, context) {
-            if (!isHostedMcpToolAllowed(toolName, policy)) {
-                throw PERMISSION_DENIED.create({
-                    detail: `Tool "${toolName}" is not allowed for this MCP server`,
-                });
-            }
-            return source.executeTool(toolName, args, context);
-        },
-    };
+    return wrapRemoteToolSourceWithMcpPolicy(source, policy, {
+        deniedDetail: (toolName) => `Tool "${toolName}" is not allowed for this MCP server`,
+    });
 }
 /** Create hosted project remote tool sources. */
 export function createHostedProjectRemoteToolSources(input) {

package/esm/src/agent/mcp-tool-policy.d.ts ADDED Viewed

@@ -0,0 +1,19 @@
+import type { HostToolSet, RemoteToolSource } from "../tool/index.js";
+import type { AgentMcpToolPolicy } from "./types.js";
+export type McpToolPolicyGate = {
+    allows(toolName: string): boolean;
+    filterDefinitions<T extends {
+        name: string;
+    }>(definitions: readonly T[]): T[];
+    assertAllowed(toolName: string): void;
+};
+export declare function createMcpToolPolicyGate(policy: AgentMcpToolPolicy | undefined, options?: {
+    deniedDetail?: (toolName: string) => string;
+}): McpToolPolicyGate;
+export declare function wrapRemoteToolSourceWithMcpPolicy(source: RemoteToolSource, policy: AgentMcpToolPolicy | undefined, options?: {
+    deniedDetail?: (toolName: string, sourceId: string) => string;
+}): RemoteToolSource;
+export declare function wrapHostToolSetWithMcpPolicy(tools: HostToolSet, policy: AgentMcpToolPolicy | undefined, options?: {
+    deniedDetail?: (toolName: string) => string;
+}): HostToolSet;
+//# sourceMappingURL=mcp-tool-policy.d.ts.map

package/esm/src/agent/mcp-tool-policy.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"mcp-tool-policy.d.ts","sourceRoot":"","sources":["../../../src/src/agent/mcp-tool-policy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAwB,MAAM,kBAAkB,CAAC;AAC5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAClC,iBAAiB,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC9E,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAUF,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,GACxD,iBAAiB,CAuBnB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,GAC1E,gBAAgB,CAkBlB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,kBAAkB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAA;CAAE,GACxD,WAAW,CAyBb"}