@olonjs/cli 3.0.165 → 3.0.167

package/assets/src_tenant_alpha.sh

@@ -1817,9 +1817,9 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^2.0.1",
-    "@olonjs/react": "^0.2.1",
-    "@olonjs/studio": "^0.2.1",
+    "@olonjs/core": "^2.0.3",
+    "@olonjs/react": "^0.2.3",
+    "@olonjs/studio": "^0.2.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -3206,13 +3206,31 @@ async function main() {
   const runUpdateThenSave = async (value) => {
     const rawUpdate = await page.evaluate(
       async ({ toolName, slug, sectionId, sectionType, fieldKey, value: nextValue }) => {
-        const runtime = document.modelContextProtocol;
-        if (!runtime?.executeTool) {
-          throw new Error('document.modelContextProtocol.executeTool is unavailable.');
+        const args = { slug, sectionId, sectionType, fieldKey, value: nextValue };
+        const native = document.modelContext;
+        const protocol = document.modelContextProtocol;
+        // Native Chrome WebMCP: executeTool(toolObject, args) — the tool object
+        // comes from getTools(). Args format: plain object since Chrome 155;
+        // before that the native expects a JSON string (verified on Chrome 153).
+        if (native && typeof native.executeTool === 'function') {
+          const tools = await native.getTools();
+          const tool = tools.find((entry) => entry.name === toolName);
+          if (!tool) {
+            throw new Error(`Tool "${toolName}" not found in native getTools().`);
+          }
+          const chromeMajor = Number((navigator.userAgent.match(/Chrome\/(\d+)/) ?? [])[1] ?? 0);
+          const nativeArgs = chromeMajor >= 155 ? args : JSON.stringify(args);
+          const result = await native.executeTool(tool, nativeArgs);
+          if (result === null) {
+            throw new Error(`Tool "${toolName}" returned null (navigation).`);
+          }
+          return typeof result === 'string' ? result : JSON.stringify(result);
+        }
+        if (protocol && typeof protocol.executeTool === 'function') {
+          return protocol.executeTool(toolName, JSON.stringify(args));
         }
-        return runtime.executeTool(
-          toolName,
-          JSON.stringify({ slug, sectionId, sectionType, fieldKey, value: nextValue })
+        throw new Error(
+          'WebMCP runtime unavailable: no document.modelContext (native) and no document.modelContextProtocol (polyfill).',
         );
       },
       {
@@ -3229,7 +3247,30 @@ async function main() {
       throw new Error(`WebMCP ${target.toolName} returned an error: ${rawUpdate}`);
     }
     const rawSave = await page.evaluate(
-      async ({ saveToolName }) => document.modelContextProtocol.executeTool(saveToolName, '{}'),
+      async ({ saveToolName }) => {
+        const native = document.modelContext;
+        const protocol = document.modelContextProtocol;
+        if (native && typeof native.executeTool === 'function') {
+          const tools = await native.getTools();
+          const tool = tools.find((entry) => entry.name === saveToolName);
+          if (!tool) {
+            throw new Error(`Tool "${saveToolName}" not found in native getTools().`);
+          }
+          const chromeMajor = Number((navigator.userAgent.match(/Chrome\/(\d+)/) ?? [])[1] ?? 0);
+          const nativeArgs = chromeMajor >= 155 ? {} : '{}';
+          const result = await native.executeTool(tool, nativeArgs);
+          if (result === null) {
+            throw new Error(`Tool "${saveToolName}" returned null (navigation).`);
+          }
+          return typeof result === 'string' ? result : JSON.stringify(result);
+        }
+        if (protocol && typeof protocol.executeTool === 'function') {
+          return protocol.executeTool(saveToolName, '{}');
+        }
+        throw new Error(
+          'WebMCP runtime unavailable: no document.modelContext (native) and no document.modelContextProtocol (polyfill).',
+        );
+      },
       { saveToolName: target.saveToolName }
     );
     const parsedSave = JSON.parse(rawSave);
@@ -3287,9 +3328,17 @@ async function main() {
       );
     }
 
-    const toolNames = await page.evaluate(() => {
-      const runtime = document.modelContextProtocol;
-      return runtime?.listTools?.().map((tool) => tool.name) ?? [];
+    const toolNames = await page.evaluate(async () => {
+      const native = document.modelContext;
+      const protocol = document.modelContextProtocol;
+      if (native && typeof native.getTools === 'function') {
+        const tools = await native.getTools();
+        return tools.map((tool) => tool.name);
+      }
+      if (protocol && typeof protocol.listTools === 'function') {
+        return protocol.listTools().map((tool) => tool.name);
+      }
+      return [];
     });
     for (const required of [target.toolName, target.saveToolName]) {
       if (!toolNames.includes(required)) {

package/assets/templates/alpha/src_tenant.sh

@@ -1817,9 +1817,9 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^2.0.1",
-    "@olonjs/react": "^0.2.1",
-    "@olonjs/studio": "^0.2.1",
+    "@olonjs/core": "^2.0.3",
+    "@olonjs/react": "^0.2.3",
+    "@olonjs/studio": "^0.2.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -3206,13 +3206,31 @@ async function main() {
   const runUpdateThenSave = async (value) => {
     const rawUpdate = await page.evaluate(
       async ({ toolName, slug, sectionId, sectionType, fieldKey, value: nextValue }) => {
-        const runtime = document.modelContextProtocol;
-        if (!runtime?.executeTool) {
-          throw new Error('document.modelContextProtocol.executeTool is unavailable.');
+        const args = { slug, sectionId, sectionType, fieldKey, value: nextValue };
+        const native = document.modelContext;
+        const protocol = document.modelContextProtocol;
+        // Native Chrome WebMCP: executeTool(toolObject, args) — the tool object
+        // comes from getTools(). Args format: plain object since Chrome 155;
+        // before that the native expects a JSON string (verified on Chrome 153).
+        if (native && typeof native.executeTool === 'function') {
+          const tools = await native.getTools();
+          const tool = tools.find((entry) => entry.name === toolName);
+          if (!tool) {
+            throw new Error(`Tool "${toolName}" not found in native getTools().`);
+          }
+          const chromeMajor = Number((navigator.userAgent.match(/Chrome\/(\d+)/) ?? [])[1] ?? 0);
+          const nativeArgs = chromeMajor >= 155 ? args : JSON.stringify(args);
+          const result = await native.executeTool(tool, nativeArgs);
+          if (result === null) {
+            throw new Error(`Tool "${toolName}" returned null (navigation).`);
+          }
+          return typeof result === 'string' ? result : JSON.stringify(result);
+        }
+        if (protocol && typeof protocol.executeTool === 'function') {
+          return protocol.executeTool(toolName, JSON.stringify(args));
         }
-        return runtime.executeTool(
-          toolName,
-          JSON.stringify({ slug, sectionId, sectionType, fieldKey, value: nextValue })
+        throw new Error(
+          'WebMCP runtime unavailable: no document.modelContext (native) and no document.modelContextProtocol (polyfill).',
         );
       },
       {
@@ -3229,7 +3247,30 @@ async function main() {
       throw new Error(`WebMCP ${target.toolName} returned an error: ${rawUpdate}`);
     }
     const rawSave = await page.evaluate(
-      async ({ saveToolName }) => document.modelContextProtocol.executeTool(saveToolName, '{}'),
+      async ({ saveToolName }) => {
+        const native = document.modelContext;
+        const protocol = document.modelContextProtocol;
+        if (native && typeof native.executeTool === 'function') {
+          const tools = await native.getTools();
+          const tool = tools.find((entry) => entry.name === saveToolName);
+          if (!tool) {
+            throw new Error(`Tool "${saveToolName}" not found in native getTools().`);
+          }
+          const chromeMajor = Number((navigator.userAgent.match(/Chrome\/(\d+)/) ?? [])[1] ?? 0);
+          const nativeArgs = chromeMajor >= 155 ? {} : '{}';
+          const result = await native.executeTool(tool, nativeArgs);
+          if (result === null) {
+            throw new Error(`Tool "${saveToolName}" returned null (navigation).`);
+          }
+          return typeof result === 'string' ? result : JSON.stringify(result);
+        }
+        if (protocol && typeof protocol.executeTool === 'function') {
+          return protocol.executeTool(saveToolName, '{}');
+        }
+        throw new Error(
+          'WebMCP runtime unavailable: no document.modelContext (native) and no document.modelContextProtocol (polyfill).',
+        );
+      },
       { saveToolName: target.saveToolName }
     );
     const parsedSave = JSON.parse(rawSave);
@@ -3287,9 +3328,17 @@ async function main() {
       );
     }
 
-    const toolNames = await page.evaluate(() => {
-      const runtime = document.modelContextProtocol;
-      return runtime?.listTools?.().map((tool) => tool.name) ?? [];
+    const toolNames = await page.evaluate(async () => {
+      const native = document.modelContext;
+      const protocol = document.modelContextProtocol;
+      if (native && typeof native.getTools === 'function') {
+        const tools = await native.getTools();
+        return tools.map((tool) => tool.name);
+      }
+      if (protocol && typeof protocol.listTools === 'function') {
+        return protocol.listTools().map((tool) => tool.name);
+      }
+      return [];
     });
     for (const required of [target.toolName, target.saveToolName]) {
       if (!toolNames.includes(required)) {