@omercnet/paseo-omp 2.0.1-next.256.1 → 2.0.1-next.258.1

package/README.md

@@ -100,7 +100,7 @@ Provider functionality outside the capability flags is tracked separately:
 | Models, modes, and thinking catalog | **100%** | Native catalog is mapped to opaque public model IDs with committed defaults and permission-gated modes. |
 | Connection `send` / `onEvent` / `close` lifecycle | **100%** | Request correlation, multi-session ownership, process recovery, teardown, and provider reload/removal are covered. |
 | Session launch: cwd, env, system prompt, title, and persistence | **100%** | Complete launch configuration is bounded, validated, forwarded, and re-read on recovery; selected host and profile daemon environment values are resolved only when catalog and session children spawn. |
-| MCP server forwarding and host tools | **100%** | Configured MCP tools are discovered, namespaced, labeled, executed, canceled, and bounded. Caller-scoped Paseo orchestration tools retain their native names, such as `create_agent` and `list_profiles`, so OMP skills can invoke them directly. The MCP composer control delegates native server management to OMP instead of duplicating its profile and workspace precedence. Exact `toolPolicy` remains the separate 0% capability above. |
+| MCP server forwarding and host tools | **100%** | Configured MCP tools are discovered, namespaced, labeled, executed, canceled, and bounded. Forwarded tools are namespaced `mcpx__<server>_<tool>`: OMP treats `mcp__` as its own MCP manager's namespace and deletes that whole namespace from the session registry on every `refreshMCPTools`, so a forwarded tool registered under it is accepted and then dropped. Registration races OMP's deferred MCP discovery on every supported release; from 18.9.0 the ordering is deterministic and the tools were always lost. An OMP approval policy or inline-docs glob keyed on the old `mcp__<server>_<tool>` spelling must be re-keyed to `mcpx__<server>_<tool>`; OMP matches approval entries by exact tool name. Caller-scoped Paseo orchestration tools retain their native names, such as `create_agent` and `list_profiles`, so OMP skills can invoke them directly. The MCP composer control delegates native server management to OMP instead of duplicating its profile and workspace precedence. Exact `toolPolicy` remains the separate 0% capability above. |
 | Denied native tools | **100%** | `disallowedTools` becomes an explicit OMP allow-list; unknown names fail closed. |
 | Commands and committed session state events | **100%** | Publishes `session.commands`, `session.opened`, `session.config`, `session.ready`, and request completion in protocol order. |
 | Built-in timeline snapshots | **100%** | Assistant, reasoning, tools, todos, notifications, errors, compaction, and friendly MCP labels use stable IDs and complete snapshots. OMP emits client-safe PNG/JPEG when possible; validated legacy WebP images render on capable clients with an explicit per-image fallback elsewhere. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omercnet/paseo-omp",
-  "version": "2.0.1-next.256.1",
+  "version": "2.0.1-next.258.1",
   "type": "module",
   "description": "Paseo integration for OMP, including its direct provider and workspace tooling.",
   "license": "MIT",
@@ -63,8 +63,8 @@
     "@getpaseo/client": "0.11.1",
     "@getpaseo/plugin": "0.11.1",
     "@getpaseo/server": "0.11.1",
-    "@oh-my-pi/pi-agent-core": "18.8.4",
-    "@oh-my-pi/pi-coding-agent": "18.8.4",
+    "@oh-my-pi/pi-agent-core": "18.10.1",
+    "@oh-my-pi/pi-coding-agent": "18.10.1",
     "@tanstack/react-query": "^5.102.3",
     "@types/node": "^24.10.1",
     "@types/react": "^19.2.18",

package/server/package-version.ts

@@ -1,2 +1,2 @@
 /** Release Please keeps this bundle-safe constant aligned with package.json. */
-export const PASEO_OMP_PACKAGE_VERSION = "2.0.1-next.256.1"; // x-release-please-version
+export const PASEO_OMP_PACKAGE_VERSION = "2.0.1-next.258.1"; // x-release-please-version

package/server/provider/host-tools.ts

@@ -259,11 +259,26 @@ function serverNamespaces(servers: readonly ClassifiedServer[]): ReadonlyMap<str
   );
 }
 
+/**
+ * Namespace prefix for tools this plugin registers through `set_host_tools`.
+ *
+ * It deliberately avoids OMP's `mcp__` prefix. OMP treats that prefix as its own
+ * MCP manager's namespace (`isMCPToolName`), and every `refreshMCPTools` deletes
+ * the whole namespace from the session tool registry before rebuilding it from
+ * manager- and extension-owned tools only. Host tools registered over RPC are in
+ * neither set, so an `mcp__` name is accepted and then dropped once OMP's own
+ * deferred MCP discovery completes, leaving the tool callable from nowhere.
+ */
+export const HOST_TOOL_NAME_PREFIX = "mcpx__";
+
+/** Prefix used before {@link HOST_TOOL_NAME_PREFIX}; still rendered in persisted timelines. */
+export const LEGACY_HOST_TOOL_NAME_PREFIX = "mcp__";
+
 function exposedToolName(server: ClassifiedServer, namespace: string, toolName: string): string {
   const tool = safeName(toolName, "tool");
   if (server.canonical) return tool;
   const unprefixed = tool.startsWith(`${namespace}_`) ? tool.slice(namespace.length + 1) : tool;
-  const base = `mcp__${namespace}_${unprefixed}`;
+  const base = `${HOST_TOOL_NAME_PREFIX}${namespace}_${unprefixed}`;
   if (utf8Bytes(base) <= MAX_HOST_TOOL_NAME_BYTES) return base;
   const suffix = digest(`${server.name}\0${toolName}`);
   return `${base.slice(0, MAX_HOST_TOOL_NAME_BYTES - suffix.length - 1)}_${suffix}`;

package/server/provider/timeline-projector.ts

@@ -5,6 +5,7 @@ import type {
   ProviderToolCallDetail,
 } from "@getpaseo/plugin/server/provider";
 import { OMP_MCP_AUTH_TIMELINE_KIND } from "../../shared/mcp";
+import { HOST_TOOL_NAME_PREFIX, LEGACY_HOST_TOOL_NAME_PREFIX } from "./host-tools";
 import { isOmpImageMimeType, isValidImagePayload, type OmpImageMimeType } from "./image";
 import {
   OMP_MAX_CONTENT_PARTS,
@@ -189,8 +190,15 @@ function xdeviceToolName(nativeName: string, input: JsonValue): string | undefin
   const match = path?.match(/^xd:\/\/([A-Za-z0-9_][A-Za-z0-9_.-]{0,255})(?:[/?#]|$)/u);
   return match?.[1];
 }
+function hostToolPrefixOf(name: string): string | undefined {
+  if (name.startsWith(HOST_TOOL_NAME_PREFIX)) return HOST_TOOL_NAME_PREFIX;
+  // Timelines persisted before the rename still carry the legacy prefix.
+  if (name.startsWith(LEGACY_HOST_TOOL_NAME_PREFIX)) return LEGACY_HOST_TOOL_NAME_PREFIX;
+  return undefined;
+}
 function friendlyXdeviceToolName(name: string): string {
-  const routedName = name.startsWith("mcp__") ? name.slice("mcp__".length) : name;
+  const prefix = hostToolPrefixOf(name);
+  const routedName = prefix ? name.slice(prefix.length) : name;
   const words = routedName
     .replace(/[-_.]+/gu, " ")
     .replace(/\s+/gu, " ")
@@ -541,7 +549,7 @@ export class OmpTimelineProjector {
         const routedToolName = xdeviceToolName(event.toolName, input);
         const displayName =
           this.hostToolLabels.get(routedToolName ?? event.toolName) ??
-          (routedToolName || event.toolName.startsWith("mcp__")
+          (routedToolName || hostToolPrefixOf(event.toolName)
             ? friendlyXdeviceToolName(routedToolName ?? event.toolName)
             : event.toolName);
         const snapshot: ToolSnapshot = {