codex-computer-use-mcp 0.3.1 → 0.3.3

package/integrations/pi/README.md

@@ -1,6 +1,6 @@
 # Pi integration
 
-The native Pi adapter is the primary 0.3 path. It registers ten namespaced typed tools so Pi itself chooses each official Computer Use method and argument. Pi 0.80.7 or newer exposes them progressively without changing the ten-tool contract.
+The native Pi adapter is the primary 0.3 path. It registers and activates ten namespaced typed tools together so Pi itself chooses each official Computer Use method and argument.
 
 ## Source checkout acceptance
 
@@ -13,23 +13,20 @@ CODEX_COMPUTER_USE_HOME="$(mktemp -d)" \
 
 `-ne` prevents an installed 0.1 adapter from loading at the same time. This source workflow does not install or switch live Pi configuration.
 
-For normal installation, use the exact version 0.3.1 npm package:
+For normal installation, use the exact version 0.3.3 npm package:
 
 ```bash
-pi install npm:codex-computer-use-mcp@0.3.1
+pi install npm:codex-computer-use-mcp@0.3.3
 ```
 
 Use the source workflow only when you need to test an exact reviewed commit. Follow the rollback procedure in `MIGRATION.md` when replacing version 0.1.
 
 ## Registered surface
 
-Initially active:
+All ten tools are registered and active from session start:
 
 - `computer_use_list_apps`
 - `computer_use_get_app_state`
-
-Registered and activated after a successful `get_app_state` call:
-
 - `computer_use_click`
 - `computer_use_perform_secondary_action`
 - `computer_use_set_value`
@@ -43,13 +40,15 @@ Command:
 
 - `/computer-use-status`
 
-The session-start narrowing preserves every active tool owned by Pi or another extension. Activation after inspection is purely additive: both inspection tools remain active, and the adapter does not remove or replace any tool in that call. The lazily activated tools rely on their official descriptions and omit `promptSnippet` and `promptGuidelines`, so native deferred schema loading does not rebuild the system prompt. Supported Anthropic and OpenAI models receive the definitions at the inspection result; other models receive Pi's normal active-tool fallback on the next request.
+Session-start activation is purely additive and preserves every active tool owned by Pi or another extension. The interaction definitions rely on their official descriptions and omit extra prompt metadata.
+
+A successful `get_app_state` retains its verified app-server runtime, thread, and signed Computer Use client. The following direct interaction uses that same client and official active-app lease, then closes the retained process tree with strict cleanup verification. A new inspection replaces and closes any earlier retained session; Pi `session_shutdown` also closes it.
 
 No-permissions is the only policy: all ten tools are registered and available through this lifecycle with no wrapper permission prompts, mode selector, or app/intent/action gate. The signed host runs with Codex Full access (`approvalPolicy: "never"`, `sandbox: "danger-full-access"`), so normal empty-schema Computer Use app approvals are accepted by Codex before they reach Pi. Pi renders any form, OpenAI-form, or URL elicitation app-server does emit. The user's `accept`, `decline`, or `cancel` response is returned unchanged; the adapter never fabricates one.
 
 ## Generic MCP gateway
 
-Merge `mcp.json.example` only for the exact 0.3.1 package or after building an exact reviewed source commit. `directTools: false` is intentional; it keeps this powerful generic MCP surface behind Pi's gateway.
+Merge `mcp.json.example` only for the exact 0.3.3 package or after building an exact reviewed source commit. `directTools: false` is intentional; it keeps this powerful generic MCP surface behind Pi's gateway.
 
 For a source checkout:
 

package/integrations/pi/index.ts

@@ -4,9 +4,11 @@ import { getAgentDir, truncateHead, type ExtensionAPI } from "@earendil-works/pi
 import { Text } from "@earendil-works/pi-tui";
 import { Type, type TSchema } from "typebox";
 import { executeDirectTool, getDirectStatus } from "../../dist/direct-service.js";
-import type {
-  DirectBrokerElicitationRequest,
-  DirectBrokerElicitationResponse,
+import {
+  createOfficialDirectToolSession,
+  type DirectBrokerElicitationRequest,
+  type DirectBrokerElicitationResponse,
+  type OfficialDirectToolSession,
 } from "../../dist/direct-broker.js";
 import { OFFICIAL_TOOL_METADATA, type DirectMethod } from "../../dist/tools.js";
 
@@ -82,15 +84,94 @@ export const INTERACTION_TOOL_NAMES = [
   "computer_use_type_text",
 ] as const;
 
+export const COMPUTER_USE_TOOL_NAMES = [
+  ...INSPECTION_TOOL_NAMES,
+  ...INTERACTION_TOOL_NAMES,
+] as const;
+
 export function setInitialComputerUseTools(pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools">): void {
-  const interactionTools = new Set<string>(INTERACTION_TOOL_NAMES);
-  const preserved = pi.getActiveTools().filter((name) => !interactionTools.has(name));
-  pi.setActiveTools([...new Set([...preserved, ...INSPECTION_TOOL_NAMES])]);
+  pi.setActiveTools([...new Set([...pi.getActiveTools(), ...COMPUTER_USE_TOOL_NAMES])]);
+}
+
+interface SessionExecutorDependencies {
+  createSession?: typeof createOfficialDirectToolSession;
+  executeTool?: typeof executeDirectTool;
 }
 
-export function activateInteractionTools(pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools">): void {
-  const active = pi.getActiveTools();
-  pi.setActiveTools([...new Set([...active, ...INTERACTION_TOOL_NAMES])]);
+/** Keep the signed app-server/client alive across the required state -> action pair. */
+export class PiDirectSessionExecutor {
+  private session: OfficialDirectToolSession | undefined;
+  private queue: Promise<void> = Promise.resolve();
+  private readonly dependencies: SessionExecutorDependencies;
+
+  constructor(dependencies: SessionExecutorDependencies = {}) {
+    this.dependencies = dependencies;
+  }
+
+  private async closeSession(): Promise<void> {
+    const session = this.session;
+    this.session = undefined;
+    await session?.close();
+  }
+
+  async execute(
+    method: DirectMethod,
+    params: Record<string, unknown>,
+    dependencies: Parameters<typeof executeDirectTool>[1],
+  ): Promise<Awaited<ReturnType<typeof executeDirectTool>>> {
+    const previous = this.queue;
+    let release!: () => void;
+    this.queue = new Promise<void>((resolve) => { release = resolve; });
+    await previous;
+    try {
+      const executeTool = this.dependencies.executeTool ?? executeDirectTool;
+      if (method === "list_apps") return await executeTool({ method, arguments: params }, dependencies);
+      if (method === "get_app_state") {
+        await this.closeSession();
+        const createSession = this.dependencies.createSession ?? createOfficialDirectToolSession;
+        try {
+          const response = await executeTool(
+            { method, arguments: params },
+            {
+              ...dependencies,
+              callTool: async (directMethod, args, options) => {
+                this.session = await createSession({ supportsOpenAiFormElicitation: true });
+                return this.session.call(directMethod, args, options);
+              },
+            },
+          );
+          if (response.isError) await this.closeSession();
+          return response;
+        } catch (error) {
+          await this.closeSession();
+          throw error;
+        }
+      }
+      const session = this.session;
+      try {
+        return await executeTool(
+          { method, arguments: params },
+          session ? {
+            ...dependencies,
+            callTool: async (directMethod, args, options) => {
+              const result = await session.call(directMethod, args, options);
+              await this.closeSession();
+              return { ...result, brokerCleanupVerified: true };
+            },
+          } : dependencies,
+        );
+      } finally {
+        await this.closeSession();
+      }
+    } finally {
+      release();
+    }
+  }
+
+  async close(): Promise<void> {
+    await this.queue;
+    await this.closeSession();
+  }
 }
 
 function toPiContent(content: Array<Record<string, unknown>>): Array<{ type: "text"; text: string } | { type: "image"; data: string; mimeType: string }> {
@@ -188,6 +269,7 @@ export async function handleOfficialElicitation(
 
 export default function directComputerUse(pi: ExtensionAPI) {
   const stateRoot = process.env.CODEX_COMPUTER_USE_HOME || path.join(getAgentDir(), "direct-computer-use");
+  const sessionExecutor = new PiDirectSessionExecutor();
 
   pi.registerCommand("computer-use-status", {
     description: "Show the direct-call architecture, durable no-permissions policy, signed broker, and private audit path",
@@ -214,8 +296,9 @@ export default function directComputerUse(pi: ExtensionAPI) {
       ...inspectionPromptMetadata,
       parameters: ToolParameters[method] as any,
       async execute(_toolCallId, params, signal, onUpdate, ctx) {
-        const response = await executeDirectTool(
-          { method, arguments: params as Record<string, unknown> },
+        const response = await sessionExecutor.execute(
+          method,
+          params as Record<string, unknown>,
           {
             stateRoot,
             signal,
@@ -232,7 +315,6 @@ export default function directComputerUse(pi: ExtensionAPI) {
           },
         );
         if (response.isError) throw new Error(errorText(response.content));
-        if (method === "get_app_state") activateInteractionTools(pi);
         return { content: toPiContent(response.content), details: response.details };
       },
       renderCall(args, theme) {
@@ -244,4 +326,5 @@ export default function directComputerUse(pi: ExtensionAPI) {
   }
 
   pi.on("session_start", () => setInitialComputerUseTools(pi));
+  pi.on("session_shutdown", () => sessionExecutor.close());
 }

package/integrations/pi/mcp.json.example

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "codex-computer-use-mcp@0.3.1"
+        "codex-computer-use-mcp@0.3.3"
       ],
       "lifecycle": "lazy",
       "requestTimeoutMs": 180000,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "codex-computer-use-mcp",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codex-computer-use-mcp",
-      "version": "0.3.1",
+      "version": "0.3.3",
       "license": "MIT",
       "os": [
         "darwin"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-computer-use-mcp",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Expose the official macOS Computer Use tools directly to Pi and MCP clients without a nested model.",
   "author": "Thomas Mustier",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "integrations/pi",
     "npm-shrinkwrap.json",
     "README.md",
+    "CHANGELOG.md",
     "PROOF.md",
     "ARCHITECTURE.md",
     "MIGRATION.md",