@opengeni/runtime 4.6.1 → 4.6.2-canary.39854174564001

package/dist/{chunk-L6CVIN52.js → chunk-LOWZTPW3.js}

@@ -105,7 +105,7 @@ import {
   withModelRequestCapture,
   withModelTransportStartedObserver,
   withPreparedCompactionRequest
-} from "./chunk-YXNCKAJS.js";
+} from "./chunk-TVZD7HHB.js";
 import {
   GMAIL_REST_MCP_BRIDGE_ADAPTER,
   gmailRestResultOutcome,
@@ -190,6 +190,332 @@ import {
   undiciFetch
 } from "./chunk-LJNCGUMB.js";
 
+// src/drive-mcp.ts
+import { Buffer as Buffer2 } from "buffer";
+import {
+  defineLocalMcpBridgeDescriptor
+} from "@opengeni/capabilities";
+import { readResponseJsonBounded } from "@opengeni/network";
+var OFFICIAL_DRIVE_MCP_URL = "https://drivemcp.googleapis.com/mcp/v1";
+var api = "https://www.googleapis.com/drive/v3/";
+var id = external_exports.string().min(1).max(256).regex(/^[a-zA-Z0-9_-]+$/u);
+var file2 = { fileId: id };
+var role = external_exports.enum(["reader", "commenter", "writer", "fileOrganizer", "organizer"]);
+var definitions = {
+  update_file: {
+    description: "Rename a file or update its description. Requires the app's existing drive.file access to this file.",
+    schema: external_exports.object({
+      ...file2,
+      name: external_exports.string().min(1).max(1024).optional(),
+      description: external_exports.string().max(16e3).optional()
+    }).strict()
+  },
+  overwrite_file_content: {
+    description: "Overwrite the bytes of an existing binary file, preserving its ID. Requires drive.file access. Does not edit native Google Docs/Sheets contents.",
+    schema: external_exports.object({
+      ...file2,
+      base64Content: external_exports.string().max(34952536),
+      contentMimeType: external_exports.string().min(1).max(255).regex(/^[\w.+-]+\/[\w.+-]+$/u)
+    }).strict()
+  },
+  move_file: {
+    description: "Move an existing file between folders. Specify the current parent and destination. Requires drive.file access.",
+    schema: external_exports.object({ ...file2, fromParentId: id, toParentId: id }).strict()
+  },
+  trash_file: {
+    description: "Move a file to Trash. Requires drive.file access.",
+    schema: external_exports.object(file2).strict()
+  },
+  restore_file: {
+    description: "Restore a file from Trash. Requires drive.file access.",
+    schema: external_exports.object(file2).strict()
+  },
+  delete_file: {
+    description: "Permanently delete a file. This cannot be undone. Requires drive.file access.",
+    schema: external_exports.object(file2).strict()
+  },
+  create_permission: {
+    description: "Share a file with a user, group, domain, or anyone. Requires drive.file access and sharing permission. Never transfers ownership.",
+    schema: external_exports.object({
+      ...file2,
+      type: external_exports.enum(["user", "group", "domain", "anyone"]),
+      role,
+      emailAddress: external_exports.string().email().optional(),
+      domain: external_exports.string().min(1).max(253).optional(),
+      allowFileDiscovery: external_exports.boolean().optional()
+    }).strict()
+  },
+  update_permission: {
+    description: "Change an existing sharing permission's role. Never transfers ownership. Requires drive.file access.",
+    schema: external_exports.object({ ...file2, permissionId: id, role }).strict()
+  },
+  delete_permission: {
+    description: "Remove a file's sharing permission. Requires drive.file access.",
+    schema: external_exports.object({ ...file2, permissionId: id }).strict()
+  },
+  get_changes_start_token: {
+    description: "Get a Drive change-feed checkpoint for an ordinary scheduled agent. Save the returned token for list_changes.",
+    schema: external_exports.object({ driveId: id.optional() }).strict()
+  },
+  list_changes: {
+    description: "Read a page of changes since a saved pageToken. Follow nextPageToken; save newStartPageToken only after processing every page. Removed items do not grant access to their old contents.",
+    schema: external_exports.object({
+      pageToken: external_exports.string().min(1).max(2048),
+      driveId: id.optional(),
+      pageSize: external_exports.number().int().min(1).max(1e3).default(100)
+    }).strict()
+  }
+};
+var readNames = /* @__PURE__ */ new Set(["get_changes_start_token", "list_changes"]);
+var DRIVE_EXTRA_TOOLS = Object.entries(definitions).map(([name, definition]) => ({
+  name,
+  description: definition.description,
+  inputSchema: external_exports.toJSONSchema(definition.schema),
+  annotations: {
+    readOnlyHint: readNames.has(name),
+    destructiveHint: !readNames.has(name),
+    idempotentHint: readNames.has(name),
+    openWorldHint: true
+  }
+}));
+var DRIVE_MCP_BRIDGE_DESCRIPTOR = defineLocalMcpBridgeDescriptor({
+  adapterId: "drive-mcp-extensions",
+  providerId: "google-drive",
+  catalogIdentity: `mcp:${OFFICIAL_DRIVE_MCP_URL}`,
+  authority: "connection",
+  toolSurface: "remote_with_reviewed_extensions",
+  mutationReplay: "safe_reads_only",
+  destinations: [
+    { origin: "https://drivemcp.googleapis.com", pathPrefix: "/mcp/v1" },
+    { origin: "https://www.googleapis.com", pathPrefix: "/drive/v3/" },
+    { origin: "https://www.googleapis.com", pathPrefix: "/upload/drive/v3/files/" }
+  ]
+});
+function inputError(text) {
+  return { isError: true, content: [{ type: "text", text }] };
+}
+var DriveMcpServer = class {
+  constructor(config, context) {
+    this.config = config;
+    this.context = context;
+    this.remote = context.createRemoteServer();
+    this.name = this.remote.name;
+  }
+  bridge = DRIVE_MCP_BRIDGE_DESCRIPTOR;
+  cacheToolsList = false;
+  name;
+  remote;
+  connect() {
+    return this.remote.connect();
+  }
+  close() {
+    return this.remote.close();
+  }
+  async invalidateToolsCache() {
+    await this.remote.invalidateToolsCache();
+  }
+  async listTools() {
+    return mergeDriveMcpTools(await this.remote.listTools());
+  }
+  async callTool(name, args, meta, options) {
+    return (await this.callToolResult(name, args, meta, options)).content;
+  }
+  async callToolResult(name, args, meta, options) {
+    options?.signal?.throwIfAborted();
+    if (!Object.hasOwn(definitions, name)) {
+      const remote = this.remote;
+      if (remote.callToolResult) return remote.callToolResult(name, args, meta, options);
+      return { content: await remote.callTool(name, args, meta, options) };
+    }
+    const tool2 = name;
+    const parsed = definitions[tool2].schema.safeParse(args ?? {});
+    if (!parsed.success)
+      return { isError: true, content: [{ type: "text", text: parsed.error.message }] };
+    const call = { name: tool2, input: parsed.data };
+    const fileId = "fileId" in call.input ? call.input.fileId : void 0;
+    const url = new URL(api + (fileId ? `files/${fileId}` : "changes"));
+    const request = { method: "GET" };
+    let body;
+    if (fileId) url.searchParams.set("supportsAllDrives", "true");
+    switch (call.name) {
+      case "update_file": {
+        const { input } = call;
+        if (input.name === void 0 && input.description === void 0)
+          return inputError("Supply name or description.");
+        request.method = "PATCH";
+        body = {
+          ...input.name !== void 0 ? { name: input.name } : {},
+          ...input.description !== void 0 ? { description: input.description } : {}
+        };
+        break;
+      }
+      case "overwrite_file_content": {
+        const { input } = call;
+        if (!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u.test(
+          input.base64Content
+        ))
+          return inputError("base64Content must be canonical base64.");
+        const bytes = Buffer2.from(input.base64Content, "base64");
+        if (bytes.toString("base64") !== input.base64Content)
+          return inputError("base64Content must be canonical base64.");
+        if (bytes.length > 25 * 1024 * 1024) return inputError("Content exceeds 25 MiB.");
+        url.pathname = `/upload/drive/v3/files/${input.fileId}`;
+        url.searchParams.set("uploadType", "media");
+        request.method = "PATCH";
+        request.body = bytes;
+        request.headers = { "content-type": input.contentMimeType };
+        break;
+      }
+      case "move_file": {
+        const { input } = call;
+        if (input.fromParentId === input.toParentId)
+          return inputError("The current and destination folders must differ.");
+        request.method = "PATCH";
+        body = {};
+        url.searchParams.set("addParents", input.toParentId);
+        url.searchParams.set("removeParents", input.fromParentId);
+        break;
+      }
+      case "trash_file":
+      case "restore_file":
+        request.method = "PATCH";
+        body = { trashed: call.name === "trash_file" };
+        break;
+      case "delete_file":
+        request.method = "DELETE";
+        break;
+      case "create_permission": {
+        const { input } = call;
+        const person = input.type === "user" || input.type === "group";
+        if (person ? !input.emailAddress || input.domain !== void 0 || input.allowFileDiscovery !== void 0 : input.emailAddress !== void 0 || (input.type === "domain" ? !input.domain : input.domain !== void 0))
+          return inputError(
+            "User/group sharing requires only emailAddress; domain sharing requires only domain; anyone sharing accepts neither. allowFileDiscovery applies only to domain/anyone."
+          );
+        request.method = "POST";
+        url.pathname += "/permissions";
+        body = Object.fromEntries(Object.entries(input).filter(([key]) => key !== "fileId"));
+        break;
+      }
+      case "update_permission":
+        request.method = "PATCH";
+        url.pathname += `/permissions/${call.input.permissionId}`;
+        body = { role: call.input.role };
+        break;
+      case "delete_permission":
+        request.method = "DELETE";
+        url.pathname += `/permissions/${call.input.permissionId}`;
+        break;
+      case "get_changes_start_token":
+        url.pathname += "/startPageToken";
+        if (call.input.driveId) url.searchParams.set("driveId", call.input.driveId);
+        url.searchParams.set("supportsAllDrives", "true");
+        break;
+      case "list_changes": {
+        const { input } = call;
+        for (const key of ["pageToken", "pageSize", "driveId"])
+          if (input[key] !== void 0) url.searchParams.set(key, String(input[key]));
+        url.searchParams.set("supportsAllDrives", "true");
+        url.searchParams.set("includeItemsFromAllDrives", "true");
+        url.searchParams.set(
+          "fields",
+          "nextPageToken,newStartPageToken,changes(fileId,removed,time,driveId,file(id,name,mimeType,modifiedTime,parents,trashed))"
+        );
+        break;
+      }
+    }
+    if (body) {
+      request.body = JSON.stringify(body);
+      request.headers = { "content-type": "application/json" };
+    }
+    const read = readNames.has(tool2);
+    const credential = await this.context.resolveCredential({
+      workspaceId: this.context.workspaceId,
+      serverId: this.context.serverId,
+      connectionRef: this.config.connectionRef,
+      destinationUrl: url.toString(),
+      toolName: name,
+      forceRefresh: false,
+      ...this.context.subjectId ? { subjectId: this.context.subjectId } : {}
+    });
+    if (credential.status === "auth_needed") {
+      await this.context.onAuthNeeded?.({
+        ...credential,
+        serverId: this.context.serverId,
+        toolName: name
+      });
+      return {
+        isError: true,
+        content: [{ type: "text", text: "Reconnect Google Drive to authorize this operation." }]
+      };
+    }
+    this.context.onResolvedConnectionId?.(credential.connectionId);
+    if (credential.authorizeProviderRequest && !await credential.authorizeProviderRequest())
+      throw new Error("Google Drive authority is no longer valid");
+    options?.signal?.throwIfAborted();
+    let response;
+    try {
+      response = await (this.context.fetchImpl ?? fetch)(url, {
+        ...request,
+        headers: { ...credential.headers, ...request.headers },
+        redirect: "error",
+        signal: AbortSignal.any([
+          AbortSignal.timeout(3e4),
+          ...options?.signal ? [options.signal] : []
+        ])
+      });
+      if (!read && response.status >= 500) {
+        await response.body?.cancel().catch(() => void 0);
+        throw new DriveMutationOutcomeUnknown();
+      }
+    } catch (error) {
+      if (!read) throw new DriveMutationOutcomeUnknown();
+      throw new Error("Google Drive request failed", { cause: error });
+    }
+    if (response.status === 204) {
+      await response.body?.cancel().catch(() => void 0);
+      return { content: [{ type: "text", text: "{}" }], structuredContent: {} };
+    }
+    let payload;
+    try {
+      payload = await readResponseJsonBounded(response, 8 * 1024 * 1024, "Google Drive response");
+    } catch (error) {
+      if (!read && response.ok) throw new DriveMutationOutcomeUnknown();
+      throw error;
+    }
+    return {
+      ...response.ok ? {} : { isError: true },
+      content: [{ type: "text", text: JSON.stringify(payload) }],
+      structuredContent: payload
+    };
+  }
+};
+var DriveMutationOutcomeUnknown = class extends Error {
+  code = 40102;
+  connectorActionOutcome = "uncertain";
+  retryable = false;
+  constructor() {
+    super(
+      "Google Drive mutation was submitted but its outcome is uncertain. Inspect the file before trying again."
+    );
+  }
+};
+function isOfficialDriveMcpConfig(config) {
+  return config.url === OFFICIAL_DRIVE_MCP_URL && config.connectionRef?.providerDomain === "drivemcp.googleapis.com" && config.connectionRef.kind === "oauth2" && config.connectionRef.subjectScope === "subject";
+}
+function mergeDriveMcpTools(remote) {
+  const collisions = remote.filter((tool2) => Object.hasOwn(definitions, tool2.name));
+  if (collisions.length)
+    throw new Error(
+      `Drive tool extension collision: ${collisions.map((tool2) => tool2.name).join(", ")}`
+    );
+  return [...remote, ...structuredClone(DRIVE_EXTRA_TOOLS)];
+}
+var DRIVE_MCP_BRIDGE_ADAPTER = {
+  adapterId: DRIVE_MCP_BRIDGE_DESCRIPTOR.adapterId,
+  matches: isOfficialDriveMcpConfig,
+  create: (config, context) => new DriveMcpServer(config, context)
+};
+
 // src/agent-instructions/types.ts
 function toolAvailable(context, name) {
   return !context.toolAvailability?.unavailable.includes(name);
@@ -859,11 +1185,11 @@ var REFLESS_ROLES = /* @__PURE__ */ new Set([
   "text",
   "time"
 ]);
-function shownState(role, state) {
+function shownState(role2, state) {
   if (state === "focusable" || state === "settable" || state === "editable") return false;
   if (state.startsWith("editable=") || state.startsWith("url=")) return false;
   if (state.endsWith("=")) return false;
-  if (role === "document" && state === "focused") return false;
+  if (role2 === "document" && state === "focused") return false;
   return true;
 }
 function quoted(value) {
@@ -1300,11 +1626,13 @@ function computerObservationText(observation) {
       roots.length === 0 && semantic.removedRefs.length === 0 ? `No element changed since ${semantic.baseObservationId}; its refs are still valid.` : `Changed elements since ${semantic.baseObservationId}; elements not listed are unchanged and keep their refs:`
     );
   } else if (rendered.listed === 0) {
-    lines.push("The accessibility tree has no readable elements; use the screenshot.");
+    lines.push(
+      rendered.omitted ? `No element is listed: the accessibility tree's ${plural2(rendered.omitted, "element")} are all hidden, unlabeled or repeated; use the screenshot.` : "The accessibility tree has no readable elements; use the screenshot."
+    );
   }
   lines.push(...rendered.lines);
   const notes = [
-    rendered.omitted ? `${plural2(rendered.omitted, "hidden, unlabeled or repeated element")} not shown` : null,
+    rendered.omitted && rendered.listed > 0 ? `${plural2(rendered.omitted, "hidden, unlabeled or repeated element")} not shown` : null,
     semantic.kind === "diff" && semantic.removedRefs.length > 0 ? `${plural2(semantic.removedRefs.length, "earlier element")} removed` : null,
     rendered.clipped ? `${plural2(rendered.clipped, "long field")} clipped` : null
   ].filter((entry) => entry !== null);
@@ -2079,7 +2407,7 @@ function createInteractionAttemptToolDefinitions(input) {
     name: "Opengeni Browser",
     installUrl: OPENGENI_BROWSER_EXTENSION_URL
   };
-  const definitions = [];
+  const definitions2 = [];
   const publishedUploads = /* @__PURE__ */ new Map();
   const computerSeen = /* @__PURE__ */ new Map();
   const seenComputerKey = (observation) => `${observation.computerSessionId}\0${observation.target.id}`;
@@ -2322,7 +2650,7 @@ function createInteractionAttemptToolDefinitions(input) {
     if (!selected.has(options.name) || !hasToolPermission(permissions, TOOL_PERMISSION[options.name])) {
       return;
     }
-    definitions.push({
+    definitions2.push({
       identity: { serverId: "interaction", toolName: options.name },
       modelName: `interaction__${options.name}`,
       codemodePath: options.codemodePath,
@@ -3287,12 +3615,12 @@ No screenshot of an app target; observe one of its windows or the screen for pix
         })
       );
       const outputSchema = variants.every((variant) => variant.outputSchema) ? nativeCuaSchema(variants.map((variant) => variant.outputSchema)) : void 0;
-      definitions.push({
+      definitions2.push({
         identity: { serverId: "interaction", toolName: "cua_" + tool2.name },
         modelName: "interaction__cua_" + tool2.name,
-        codemodePath: ["computer", tool2.name],
+        codemodePath: ["interaction", "cua", tool2.name],
         title: tool2.name,
-        description: "Native CUA computer tool; requires a CUA-backed computer_open session. " + tool2.description,
+        description: "Native CUA computer tool; requires a CUA-backed computer_open session. Other CUA tools it names are interaction__cua_<name> (in Code Mode interaction.cua.<name>); steps inside run_steps keep the plain name. " + tool2.description,
         inputSchema,
         ...outputSchema ? { outputSchema } : {},
         // Read-like tools can write screenshots to files; all native calls use
@@ -3302,10 +3630,10 @@ No screenshot of an app target; observe one of its windows or the screen for pix
         approval: "none",
         execute: async (raw, context) => {
           const { computerSessionId, ...args } = raw;
-          const id = external_exports.string().uuid().parse(computerSessionId);
+          const id2 = external_exports.string().uuid().parse(computerSessionId);
           let response;
           try {
-            response = await input.transport.callNativeComputerTool(input.workspaceId, id, {
+            response = await input.transport.callNativeComputerTool(input.workspaceId, id2, {
               operationId: context.operationId,
               tool: tool2.name,
               arguments: args
@@ -3344,7 +3672,7 @@ No screenshot of an app target; observe one of its windows or the screen for pix
       });
     }
   }
-  return definitions;
+  return definitions2;
 }
 function nativeCuaSchema(variants) {
   const unique = [...new Map(variants.map((schema) => [JSON.stringify(schema), schema])).values()];
@@ -4614,12 +4942,12 @@ function compactionPrefixCuts(items) {
     const phase = realInput || resultTypes.has(type) ? "user" : "assistant";
     if (index > 0 && calls.size === 0 && !unidentifiedCall && phase !== previousPhase)
       cuts.push(index);
-    const id = toolCallIdFromSdkItem(item);
+    const id2 = toolCallIdFromSdkItem(item);
     if (Object.hasOwn(TOOL_CALL_RESULT_TYPE_BY_CALL_TYPE, type)) {
-      if (id) calls.add(id);
+      if (id2) calls.add(id2);
       else unidentifiedCall = true;
     }
-    if (resultTypes.has(type) && typeof id === "string") calls.delete(id);
+    if (resultTypes.has(type) && typeof id2 === "string") calls.delete(id2);
     previousPhase = phase;
   }
   return cuts;
@@ -4669,7 +4997,7 @@ var RunMcpCredentials = class {
   #closed = false;
   #onAbort = () => this.close();
   constructor(targets, options = {}) {
-    this.#targets = targets.filter((target) => !target.connectionRef).map(({ id, url }) => ({ id, url }));
+    this.#targets = targets.filter((target) => !target.connectionRef).map(({ id: id2, url }) => ({ id: id2, url }));
     this.#signal = options.signal;
     this.#now = options.now ?? Date.now;
     this.#signal?.addEventListener("abort", this.#onAbort, { once: true });
@@ -4705,39 +5033,39 @@ var RunMcpCredentials = class {
         skipped += 1;
         continue;
       }
-      const id = matches[0].id;
-      managed.add(id);
-      if (next.has(id)) {
+      const id2 = matches[0].id;
+      managed.add(id2);
+      if (next.has(id2)) {
         skipped += 1;
-        next.delete(id);
+        next.delete(id2);
         continue;
       }
       const expiry = entry.expiresAt ? Date.parse(entry.expiresAt) : null;
       const expiresAt = expiry === null ? material?.expiresAt?.getTime() ?? null : Math.min(expiry, material?.expiresAt?.getTime() ?? Infinity);
       if (expiresAt !== null && (!Number.isFinite(expiresAt) || expiresAt <= this.#now())) {
         skipped += 1;
-        retained.add(id);
+        retained.add(id2);
         continue;
       }
-      next.set(id, { headers: { ...entry.headers }, expiresAt });
+      next.set(id2, { headers: { ...entry.headers }, expiresAt });
     }
     return () => {
       this.#assertOpen();
-      for (const id of next.keys()) {
-        if (this.#remoteTargets && !this.#remoteTargets.some((target) => target.id === id)) {
-          next.delete(id);
+      for (const id2 of next.keys()) {
+        if (this.#remoteTargets && !this.#remoteTargets.some((target) => target.id === id2)) {
+          next.delete(id2);
           skipped += 1;
         }
       }
       if (skipped) {
-        for (const [id, entry] of this.#entries) {
-          if (!next.has(id) && (retained.has(id) || !managed.has(id))) next.set(id, entry);
+        for (const [id2, entry] of this.#entries) {
+          if (!next.has(id2) && (retained.has(id2) || !managed.has(id2))) next.set(id2, entry);
         }
       }
       this.#entries = next;
-      for (const id of managed) {
-        if (!this.#remoteTargets || this.#remoteTargets.some((target) => target.id === id)) {
-          this.#managed.add(id);
+      for (const id2 of managed) {
+        if (!this.#remoteTargets || this.#remoteTargets.some((target) => target.id === id2)) {
+          this.#managed.add(id2);
         }
       }
       this.#warnSkipped(skipped);
@@ -4755,18 +5083,18 @@ var RunMcpCredentials = class {
     );
     this.#dropExcluded();
   }
-  excludeLocalTarget(id) {
+  excludeLocalTarget(id2) {
     this.#remoteTargets = (this.#remoteTargets ?? this.#targets).filter(
-      (target) => target.id !== id
+      (target) => target.id !== id2
     );
     this.#dropExcluded();
   }
   #dropExcluded() {
     let skipped = 0;
-    for (const id of this.#managed) {
-      if (!this.#remoteTargets?.some((target) => target.id === id)) {
-        this.#entries.delete(id);
-        this.#managed.delete(id);
+    for (const id2 of this.#managed) {
+      if (!this.#remoteTargets?.some((target) => target.id === id2)) {
+        this.#entries.delete(id2);
+        this.#managed.delete(id2);
         skipped += 1;
       }
     }
@@ -4779,13 +5107,13 @@ var RunMcpCredentials = class {
       count
     });
   }
-  has(id) {
-    return this.#managed.has(id);
+  has(id2) {
+    return this.#managed.has(id2);
   }
-  assertAvailable(id) {
+  assertAvailable(id2) {
     this.#assertOpen();
-    if (!this.#managed.has(id)) return;
-    const entry = this.#entries.get(id);
+    if (!this.#managed.has(id2)) return;
+    const entry = this.#entries.get(id2);
     if (!entry || entry.expiresAt !== null && entry.expiresAt <= this.#now()) {
       throw new RunMcpCredentialError("MCP authentication unavailable: provider renewal required");
     }
@@ -5148,8 +5476,8 @@ function skillCatalogEntryIds(catalog) {
     } catch {
       continue;
     }
-    const id = entry?.id;
-    if (typeof id === "string" && id) ids.add(id);
+    const id2 = entry?.id;
+    if (typeof id2 === "string" && id2) ids.add(id2);
   }
   return ids;
 }
@@ -5525,8 +5853,8 @@ async function projectAttemptToolResultForCaller(result, context, spill, identit
 function wrapAttemptToolExecute(execute, spill, identity2) {
   return async (args, context) => await projectAttemptToolResultForCaller(await execute(args, context), context, spill, identity2);
 }
-function wrapAttemptToolDefinitions(definitions, spill) {
-  return definitions.map((definition) => ({
+function wrapAttemptToolDefinitions(definitions2, spill) {
+  return definitions2.map((definition) => ({
     ...definition,
     execute: wrapAttemptToolExecute(definition.execute, spill, definition.identity)
   }));
@@ -6343,10 +6671,10 @@ function composeModularAgentInstructions(input) {
       joinBefore: MODULAR_LAYER_SEPARATOR
     }
   ];
-  const push = (id, title, content) => {
+  const push = (id2, title, content) => {
     const trimmed = content?.trim();
     if (!trimmed) return;
-    layers.push({ id, title, content: trimmed, joinBefore: MODULAR_LAYER_SEPARATOR });
+    layers.push({ id: id2, title, content: trimmed, joinBefore: MODULAR_LAYER_SEPARATOR });
   };
   push("codemode", "Codemode", input.codemode);
   push("code_search", "Code search", input.codeSearch);
@@ -7325,7 +7653,7 @@ async function repositorySkillFiles(session, root, paths, runAs) {
     });
     readSkillFiles(
       files,
-      files.map((file2) => file2.path)
+      files.map((file3) => file3.path)
     );
   }
   return files;
@@ -7368,7 +7696,7 @@ import { existsSync, readdirSync } from "fs";
 // ../sdk/package.json
 var package_default = {
   name: "@opengeni/sdk",
-  version: "4.6.1",
+  version: "4.6.2-canary.39854174564001",
   description: "Framework-agnostic TypeScript SDK for the Opengeni API: typed client, session lifecycle, SSE event streaming with reconnect + replay-by-sequence, and proxy re-streaming helpers.",
   license: "Apache-2.0",
   repository: {
@@ -7610,7 +7938,7 @@ var package_default = {
 // ../react/package.json
 var package_default2 = {
   name: "@opengeni/react",
-  version: "4.6.1",
+  version: "4.6.2-canary.39854174564001",
   description: "React hooks and styled components for Opengeni: live session streaming, chat composer, message timeline, session status, and fleet views \u2014 token-themed (CSS variables), dark-first, built on Tailwind v4 + Radix + Motion.",
   license: "Apache-2.0",
   repository: {
@@ -7984,7 +8312,7 @@ var package_default2 = {
 // ../codemode/package.json
 var package_default3 = {
   name: "@opengeni/codemode",
-  version: "4.6.1",
+  version: "4.6.2-canary.39854174564001",
   description: "Attempt-frozen programmatic tool catalog and execution authority for Opengeni.",
   license: "Apache-2.0",
   repository: {
@@ -8034,7 +8362,7 @@ var package_default3 = {
 // ../ogtool/package.json
 var package_default4 = {
   name: "@opengeni/ogtool",
-  version: "4.6.1",
+  version: "4.6.2-canary.39854174564001",
   description: "Codemode CLI and typed client entrypoint for an Opengeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -8429,7 +8757,7 @@ function runtimeSkillDescription(skill) {
 
 // src/model-context-inspector.ts
 import { MODEL_CONTEXT_SNAPSHOT_VERSION } from "@opengeni/contracts";
-function contextTextEstimate(value) {
+function contextTextEstimate(value, serialized) {
   const containsNonText = (part) => {
     if (Array.isArray(part)) return part.some(containsNonText);
     if (!part || typeof part !== "object") return false;
@@ -8441,7 +8769,10 @@ function contextTextEstimate(value) {
       return true;
     return Object.values(record).some(containsNonText);
   };
-  return containsNonText(value) ? null : estimateSerializedValueTokens(value);
+  if (containsNonText(value)) return null;
+  return estimateTextTokens(
+    typeof value === "string" ? value : serialized ?? JSON.stringify(value)
+  );
 }
 function buildProviderRequestSnapshot(input) {
   let body = input.body;
@@ -8457,12 +8788,15 @@ function buildProviderRequestSnapshot(input) {
     body = null;
     unavailableReason = "The provider body is not a JSON object.";
   }
-  const parts = Object.entries(payload).map(([key, value]) => ({
-    key,
-    estimatedTokens: contextTextEstimate(value),
-    utf8Bytes: Buffer.byteLength(JSON.stringify(value), "utf8"),
-    ...Array.isArray(value) ? { itemEstimatedTokens: value.map(contextTextEstimate) } : {}
-  }));
+  const parts = Object.entries(payload).map(([key, value]) => {
+    const serialized = JSON.stringify(value);
+    return {
+      key,
+      estimatedTokens: contextTextEstimate(value, serialized),
+      utf8Bytes: Buffer.byteLength(serialized, "utf8"),
+      ...Array.isArray(value) ? { itemEstimatedTokens: value.map((item) => contextTextEstimate(item)) } : {}
+    };
+  });
   const instructionsTokens = parts.find((part) => part.key === "instructions")?.estimatedTokens ?? 0;
   const wireInstructions = typeof payload.instructions === "string" ? payload.instructions : null;
   const sectionLayers = wireInstructions && input.persistentLayers?.length ? splitCapturedInstructions({
@@ -8699,16 +9033,14 @@ function splitRawSystemInstructions(captured, persistent, composed, genesisTitle
 }
 function countedTool(input) {
   const schema = input.schema;
-  const utf8Bytes = Buffer.byteLength(
-    JSON.stringify({
-      name: input.name,
-      type: input.type,
-      description: input.description,
-      namespace: input.namespace,
-      schema
-    }),
-    "utf8"
-  );
+  const serialized = JSON.stringify({
+    name: input.name,
+    type: input.type,
+    description: input.description,
+    namespace: input.namespace,
+    schema
+  });
+  const utf8Bytes = Buffer.byteLength(serialized, "utf8");
   return {
     name: input.name,
     type: input.type,
@@ -8717,13 +9049,7 @@ function countedTool(input) {
     ...input.namespace ? { namespace: input.namespace } : {},
     ...schema !== void 0 ? { schema } : {},
     utf8Bytes,
-    estimatedTokens: estimateSerializedValueTokens({
-      name: input.name,
-      type: input.type,
-      description: input.description,
-      namespace: input.namespace,
-      schema
-    })
+    estimatedTokens: estimateTextTokens(serialized)
   };
 }
 function serializedToolToModelContextTool(tool2, visibility) {
@@ -10062,7 +10388,11 @@ setOpenSandboxApplyDiff(
   applyDiff
 );
 ensureReadableStreamFrom();
-var BUILT_IN_MCP_BRIDGE_ADAPTERS = Object.freeze([GMAIL_REST_MCP_BRIDGE_ADAPTER, SLACK_REST_MCP_BRIDGE_ADAPTER]);
+var BUILT_IN_MCP_BRIDGE_ADAPTERS = Object.freeze([
+  GMAIL_REST_MCP_BRIDGE_ADAPTER,
+  SLACK_REST_MCP_BRIDGE_ADAPTER,
+  DRIVE_MCP_BRIDGE_ADAPTER
+]);
 var SANDBOX_LIFECYCLE_COMMAND_TIMEOUT_MS = 12e4;
 function ensureReadableStreamFrom() {
   const ctor = globalThis.ReadableStream;
@@ -10164,13 +10494,13 @@ function normalizeGeneratedSessionTitle(text, stoppedAtOutputLimit) {
 }
 async function summarizeForCompaction(settings, input, options = {}) {
   const client = options.client ?? buildOpenAIClientFromSettings(settings);
-  const api = options.api ?? "responses";
+  const api2 = options.api ?? "responses";
   const model = options.model ?? settings.openaiModel;
   const provider = options.provider ?? configuredProviders(settings)[0];
   if (!provider) throw new Error("Built-in model provider is unavailable");
   const azureResponses = provider.wireProfile === "azure-openai";
   const maxTokens = options.maxOutputTokens ?? compactionSummaryOutputTokens(settings.contextWindowTokens);
-  if (api === "chat") {
+  if (api2 === "chat") {
     const transcript = renderCompactionPromptInputForChat(input);
     let completion;
     try {
@@ -10854,10 +11184,10 @@ ${personaAndCore}` : OPENGENI_OPERATIONAL_INSTRUCTIONS
     },
     { id: "persona_and_core", title: "Persona and CORE", content: personaAndCore }
   ];
-  const push = (id, title, content) => {
+  const push = (id2, title, content) => {
     const trimmed = content?.trim();
     if (!trimmed) return;
-    layers.push({ id, title, content: trimmed });
+    layers.push({ id: id2, title, content: trimmed });
   };
   if (!options.workspaceGovernance?.trim()) {
     if (codemodeIsAvailable(options)) {
@@ -12531,6 +12861,27 @@ async function prepareAgentTools(settings, tools, options = {}) {
         optional
       ) : firstParty ? firstPartyAuthFetch(guardedFetch, settings, options) : guardedFetch;
       const bestEffort = isCodexAppsMcpServer(config) || optional || !!config.connectionRef;
+      const remoteRequestInit = await mcpServerRequestInit(settings, config);
+      const createRemoteServer = () => new MCPServerStreamableHttp({
+        url,
+        name: config.name ?? config.id,
+        cacheToolsList: config.cacheToolsList,
+        // The upstream transport logger receives raw thrown errors, whose
+        // messages may contain response bodies, URLs, headers, or echoed
+        // credentials. Keep its diagnostic surface structural only.
+        // This logger spans tool invocation as well as setup. Only the
+        // connect/list lifecycle wrappers may add setup-safe recovery facts.
+        logger: mcpTransportLogger(config.id),
+        // codex_apps returns connector tools with empty `outputSchema: {}` that the
+        // MCP SDK's strict Tool schema rejects (fails the turn during tools/list);
+        // sanitize the response on the wire before validation. The namespace Set
+        // also captures each tool's original connector namespace (P4 Part B.1).
+        fetch: fetchImpl,
+        ...mcpStreamableHttpClientOptions({ firstParty }),
+        ...remoteRequestInit,
+        ...config.timeoutMs ? { timeout: config.timeoutMs } : {},
+        ...mcpSessionTimeoutOptions(config)
+      });
       const bridge = createLocalMcpBridgeFromAdapters(
         BUILT_IN_MCP_BRIDGE_ADAPTERS,
         {
@@ -12538,6 +12889,7 @@ async function prepareAgentTools(settings, tools, options = {}) {
           ...config.connectionRef ? { connectionRef: config.connectionRef } : {}
         },
         {
+          createRemoteServer,
           workspaceId: options.workspaceId ?? "",
           ...options.credentialSubjectId ? { subjectId: options.credentialSubjectId } : {},
           serverId: config.id,
@@ -12561,26 +12913,7 @@ async function prepareAgentTools(settings, tools, options = {}) {
           ...settings.gmailWatchTopicName ? { watchTopicName: settings.gmailWatchTopicName } : {}
         }
       );
-      const innerServer = bridge ?? new MCPServerStreamableHttp({
-        url,
-        name: config.name ?? config.id,
-        cacheToolsList: config.cacheToolsList,
-        // The upstream transport logger receives raw thrown errors, whose
-        // messages may contain response bodies, URLs, headers, or echoed
-        // credentials. Keep its diagnostic surface structural only.
-        // This logger spans tool invocation as well as setup. Only the
-        // connect/list lifecycle wrappers may add setup-safe recovery facts.
-        logger: mcpTransportLogger(config.id),
-        // codex_apps returns connector tools with empty `outputSchema: {}` that the
-        // MCP SDK's strict Tool schema rejects (fails the turn during tools/list);
-        // sanitize the response on the wire before validation. The namespace Set
-        // also captures each tool's original connector namespace (P4 Part B.1).
-        fetch: fetchImpl,
-        ...mcpStreamableHttpClientOptions({ firstParty }),
-        ...await mcpServerRequestInit(settings, config),
-        ...config.timeoutMs ? { timeout: config.timeoutMs } : {},
-        ...mcpSessionTimeoutOptions(config)
-      });
+      const innerServer = bridge ?? createRemoteServer();
       if (bridge) options.runMcpCredentials?.excludeLocalTarget(config.id);
       const server = configureMcpOperationRecovery(
         new PrefixedMcpServer(
@@ -12988,7 +13321,7 @@ async function prepareAttemptToolEnvironment(servers, registry, resolvedMcpConne
     options.sessionAttachedRemoteMcpTargets,
     options.runMcpCredentials
   );
-  const definitions = installAttemptConnectorActionGatewayLifecycle(
+  const definitions2 = installAttemptConnectorActionGatewayLifecycle(
     [
       ...prepared.definitions.map((definition) => ({
         ...definition,
@@ -13017,7 +13350,7 @@ async function prepareAttemptToolEnvironment(servers, registry, resolvedMcpConne
   );
   const subjectId = options.subjectId ?? "worker:mcp-model";
   const secretArguments = createSecretArgumentResolver({ resolver: options.secretResolver });
-  const guardedDefinitions = options.authorizeAttemptExecution ? definitions.map((definition) => ({
+  const guardedDefinitions = options.authorizeAttemptExecution ? definitions2.map((definition) => ({
     ...definition,
     lifecycle: {
       prepare: async (input) => {
@@ -13032,7 +13365,7 @@ async function prepareAttemptToolEnvironment(servers, registry, resolvedMcpConne
         };
       }
     }
-  })) : definitions;
+  })) : definitions2;
   const environment = createAttemptToolEnvironment({
     scope,
     firstPartyMcpPermissions: options.firstPartyPermissions ?? [
@@ -13049,7 +13382,7 @@ async function prepareAttemptToolEnvironment(servers, registry, resolvedMcpConne
   }
   return environment;
 }
-function installAttemptConnectorActionGatewayLifecycle(definitions, registry, resolvedMcpConnectionIds, bindings, connectorActionPolicy, accountLabels, reviewReaders) {
+function installAttemptConnectorActionGatewayLifecycle(definitions2, registry, resolvedMcpConnectionIds, bindings, connectorActionPolicy, accountLabels, reviewReaders) {
   const byModelName = /* @__PURE__ */ new Map();
   for (const binding of bindings) {
     if (byModelName.has(binding.modelName)) {
@@ -13057,7 +13390,7 @@ function installAttemptConnectorActionGatewayLifecycle(definitions, registry, re
     }
     byModelName.set(binding.modelName, binding);
   }
-  return definitions.map((definition) => {
+  return definitions2.map((definition) => {
     const binding = byModelName.get(definition.modelName);
     const config = registry.get(definition.identity.serverId);
     const legacyMcpApproval = Boolean(config) && !config.connectionRef && definition.approval === "human";
@@ -13222,12 +13555,12 @@ async function prepareWorkspaceToolGatewayEnvironment(servers, registry, options
   }
   const prepared = await prepareToolGatewayDefinitionsFromServers(servers, registry);
   const admittedDefinitions = options.workspaceToolGateway.filterDefinition ? prepared.definitions.filter(options.workspaceToolGateway.filterDefinition) : prepared.definitions;
-  const definitions = options.workspaceToolGateway.mapDefinition ? admittedDefinitions.map(options.workspaceToolGateway.mapDefinition) : admittedDefinitions;
+  const definitions2 = options.workspaceToolGateway.mapDefinition ? admittedDefinitions.map(options.workspaceToolGateway.mapDefinition) : admittedDefinitions;
   return createWorkspaceToolGateway({
     accountId: options.accountId,
     workspaceId: options.workspaceId,
     generation: options.workspaceToolGateway.generation ?? 1,
-    definitions,
+    definitions: definitions2,
     ...options.workspaceToolGateway.createdAt ? { createdAt: options.workspaceToolGateway.createdAt } : {},
     ...options.workspaceToolGateway.authorize ? { authorize: options.workspaceToolGateway.authorize } : {},
     ...options.workspaceToolGateway.resolveApproval ? { resolveApproval: options.workspaceToolGateway.resolveApproval } : {},
@@ -14546,16 +14879,16 @@ function logPublicMcpLifecycleFailure(error) {
   });
 }
 var AttemptDefinitionMcpServer = class {
-  constructor(definitions, aggregateToolBudget, subjectId) {
+  constructor(definitions2, aggregateToolBudget, subjectId) {
     this.aggregateToolBudget = aggregateToolBudget;
     this.subjectId = subjectId;
-    for (const definition of definitions) {
+    for (const definition of definitions2) {
       this.catalogIdentities.set(definition.modelName, {
         identity: definition.identity,
         source: definition.source
       });
     }
-    const descriptors = definitions.map(
+    const descriptors = definitions2.map(
       (definition) => ({
         name: definition.modelName,
         ...definition.title ? { title: definition.title } : {},
@@ -16583,10 +16916,10 @@ var builtInSandboxLifecycleHooks = {
   }
 };
 function sandboxLifecycleHooksForIds(ids) {
-  const resolved = ids.map((id) => {
-    const hook = builtInSandboxLifecycleHooks[id];
+  const resolved = ids.map((id2) => {
+    const hook = builtInSandboxLifecycleHooks[id2];
     if (!hook) {
-      throw new Error(`Unknown sandbox lifecycle hook ${id}`);
+      throw new Error(`Unknown sandbox lifecycle hook ${id2}`);
     }
     return hook;
   });
@@ -18592,6 +18925,8 @@ function sortJson(value) {
 }
 
 export {
+  isOfficialDriveMcpConfig,
+  mergeDriveMcpTools,
   INTERACTION_ATTEMPT_TOOL_NAMES,
   createInteractionAttemptToolDefinitions,
   nativeCuaSchema,
@@ -18787,4 +19122,4 @@ export {
   runAzureCliLoginHook,
   renderSessionGoalContext2 as renderSessionGoalContext
 };
-//# sourceMappingURL=chunk-L6CVIN52.js.map
+//# sourceMappingURL=chunk-LOWZTPW3.js.map