@opengeni/ogtool 0.3.43 → 0.3.44-canary.36079201993001

package/README.md

@@ -80,10 +80,11 @@ the total/offset footer. Both `--flag value` and `--flag=value` are supported.
 `--full` rejects `--json`, `--query`, `--limit`, and `--offset`, including explicitly
 supplied defaults. Unknown/duplicate flags and extra arguments are errors.
 `show` accepts the same exact path/model-name/identity aliases as `call`
-and rejects unknown or ambiguous names. Its JSON output (including the final newline)
-is limited to 64 KiB; oversized details fail without partial output or schema
-truncation. Use `list --full` redirected to a file, or `declarations <output-file>`,
-for larger schemas. Existing scripts parsing the old `list` JSON must use `list --full`.
+and rejects unknown or ambiguous names. It returns the complete single-tool JSON,
+including large schemas. To keep a large schema out of agent context, redirect
+`ogtool show <path> > tool.json` and read only the needed file ranges; use
+`ogtool declarations <output-file>` for generated TypeScript types. Existing
+scripts parsing the old `list` JSON must use `list --full`.
 
 The Connected Machine fallback, `"$OPENGENI_CODEMODE_NATIVE_CLIENT" codemode`,
 supports the same `list`, `list --json`, `list --full`, and `show` discovery behavior.

package/dist/bin/ogtool.cjs

@@ -14731,7 +14731,15 @@ function generateToolDeclarations(catalog, options) {
   return [
     `// Generated by ${options.generatedBy}. Do not edit.`,
     `// ${options.catalogDigestLabel ?? "Tool catalog digest"}: ${catalog.digest}`,
-    `import type { ${options.callOptionsType}, ${options.fallbackResultType} } from ${JSON.stringify(options.moduleSpecifier)};`,
+    ...options.typedResultWrapperType ? [
+      "// Typed calls normally return their structured output. If image blocks are present,",
+      "// they return CodemodeMultimodalValue<T> with local image paths and original content."
+    ] : [],
+    `import type { ${[
+      options.callOptionsType,
+      options.fallbackResultType,
+      ...options.typedResultWrapperType ? [options.typedResultWrapperType] : []
+    ].join(", ")} } from ${JSON.stringify(options.moduleSpecifier)};`,
     "",
     `declare module ${JSON.stringify(options.moduleSpecifier)} {`,
     `  interface ${options.interfaceName} {`,
@@ -14776,7 +14784,8 @@ function renderChildren(node, indent, options) {
     if (child.entry) {
       const entry = child.entry;
       const input = jsonSchemaToTypeScript(entry.inputSchema);
-      const output = entry.outputSchema ? jsonSchemaToTypeScript(entry.outputSchema) : options.fallbackResultType;
+      const structuredOutput = entry.outputSchema ? jsonSchemaToTypeScript(entry.outputSchema) : null;
+      const output = structuredOutput ? options.typedResultWrapperType ? `${structuredOutput} | ${options.typedResultWrapperType}<${structuredOutput}>` : structuredOutput : options.fallbackResultType;
       const description = boundedDoc(entry.description ?? entry.title);
       if (description)
         lines.push(...renderDoc(description, indent));
@@ -14943,6 +14952,103 @@ function spaces(count) {
 function isObject2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
+
+// ../codemode/src/images.ts
+var import_promises = require("node:fs/promises");
+var import_node_os = require("node:os");
+var import_node_path = require("node:path");
+var MAX_IMAGE_BASE64_CHARS = 16 * 1024 * 1024;
+var TEMP_IMAGE_PREFIX = "opengeni-codemode-image-";
+var TEMP_IMAGE_MAX_AGE_MS = 24 * 60 * 60 * 1000;
+var TEMP_IMAGE_PRUNE_INTERVAL_MS = 60 * 60 * 1000;
+var lastPruneAt = 0;
+async function materializeCodemodeImages(result, options = {}) {
+  const blocks = result.content.filter((content) => content.type === "image");
+  if (options.requireOne && blocks.length !== 1) {
+    throw new Error("Codemode browser screenshot must return exactly one image block");
+  }
+  if (blocks.length === 0)
+    return [];
+  if (options.saveTo !== undefined && blocks.length !== 1) {
+    throw new Error("An explicit image path requires exactly one image block");
+  }
+  let totalBase64Chars = 0;
+  const decoded = blocks.map((block) => {
+    const mimeType = supportedMimeType(block.mimeType);
+    totalBase64Chars += block.data.length;
+    if (block.data.length === 0 || block.data.length > MAX_IMAGE_BASE64_CHARS || totalBase64Chars > MAX_IMAGE_BASE64_CHARS) {
+      throw new Error("Codemode image exceeds the Code Mode result limit");
+    }
+    const bytes = Buffer.from(block.data, "base64");
+    if (bytes.length === 0 || bytes.toString("base64") !== block.data || !matchesImageType(bytes, mimeType)) {
+      throw new Error("Codemode image bytes are invalid");
+    }
+    return { bytes, mimeType };
+  });
+  let directory;
+  if (options.saveTo === undefined) {
+    await pruneExpiredPrivateImages();
+    directory = await import_promises.mkdtemp(import_node_path.join(import_node_os.tmpdir(), TEMP_IMAGE_PREFIX));
+  } else {
+    if (options.saveTo.length === 0)
+      throw new TypeError("Image saveTo must be a nonempty path");
+    await import_promises.mkdir(import_node_path.dirname(import_node_path.resolve(options.saveTo)), { recursive: true });
+  }
+  const images = [];
+  try {
+    for (const [index, image] of decoded.entries()) {
+      const extension = image.mimeType === "image/jpeg" ? "jpg" : image.mimeType.split("/")[1];
+      const path = options.saveTo === undefined ? import_node_path.join(directory, decoded.length === 1 ? `frame.${extension}` : `image-${index + 1}.${extension}`) : import_node_path.resolve(options.saveTo);
+      await import_promises.writeFile(path, image.bytes, { flag: "wx", mode: 384 });
+      images.push({ path, mimeType: image.mimeType, sizeBytes: image.bytes.length });
+    }
+  } catch (error51) {
+    if (directory)
+      await import_promises.rm(directory, { recursive: true, force: true });
+    throw error51;
+  }
+  return images;
+}
+async function pruneExpiredPrivateImages() {
+  const now = Date.now();
+  if (now - lastPruneAt < TEMP_IMAGE_PRUNE_INTERVAL_MS)
+    return;
+  lastPruneAt = now;
+  if (typeof process.getuid !== "function")
+    return;
+  try {
+    let removed = 0;
+    for (const entry of await import_promises.readdir(import_node_os.tmpdir(), { withFileTypes: true })) {
+      if (!entry.isDirectory() || !/^opengeni-codemode-image-[A-Za-z0-9]{6}$/u.test(entry.name)) {
+        continue;
+      }
+      const path = import_node_path.join(import_node_os.tmpdir(), entry.name);
+      const info = await import_promises.lstat(path);
+      if (!info.isDirectory() || info.uid !== process.getuid() || (info.mode & 63) !== 0 || now - info.mtimeMs < TEMP_IMAGE_MAX_AGE_MS) {
+        continue;
+      }
+      await import_promises.rm(path, { recursive: true, force: true });
+      if (++removed >= 64)
+        break;
+    }
+  } catch {}
+}
+function supportedMimeType(mimeType) {
+  if (mimeType === "image/png" || mimeType === "image/jpeg" || mimeType === "image/webp") {
+    return mimeType;
+  }
+  throw new Error(`Codemode image has unsupported type: ${mimeType}`);
+}
+function matchesImageType(bytes, mimeType) {
+  switch (mimeType) {
+    case "image/png":
+      return bytes.length >= 8 && bytes.subarray(0, 8).equals(Buffer.from("89504e470d0a1a0a", "hex"));
+    case "image/jpeg":
+      return bytes.length >= 3 && bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255;
+    case "image/webp":
+      return bytes.length >= 12 && bytes.toString("ascii", 0, 4) === "RIFF" && bytes.toString("ascii", 8, 12) === "WEBP";
+  }
+}
 // ../codemode/src/declarations.ts
 function generateCodemodeDeclarations(catalog, options = {}) {
   const verified = parseVerifiedAttemptToolCatalog(catalog);
@@ -14951,6 +15057,7 @@ function generateCodemodeDeclarations(catalog, options = {}) {
     interfaceName: "CodemodeGeneratedTools",
     callOptionsType: "CodemodeCallOptions",
     fallbackResultType: "CodemodeToolResult",
+    typedResultWrapperType: "CodemodeMultimodalValue",
     generatedBy: "@opengeni/codemode via @opengeni/tool-gateway",
     catalogDigestLabel: "Attempt catalog digest"
   });
@@ -15132,7 +15239,15 @@ class CodemodeClient {
     if (!result.structuredContent) {
       throw new CodemodeToolContractError(`Codemode tool ${path.join(".")} declared outputSchema but returned no structured content`);
     }
-    return result.structuredContent;
+    if (!result.content.some((content) => content.type === "image")) {
+      return result.structuredContent;
+    }
+    const images2 = await materializeCodemodeImages(result);
+    return {
+      structuredContent: result.structuredContent,
+      images: images2,
+      otherContent: result.content.filter((content) => content.type !== "image")
+    };
   }
   async submit(operationId, catalogDigest, identity, argumentsValue, signal) {
     const response = await this.request("/calls", {
@@ -15285,14 +15400,14 @@ function parseCodemodeApiError(input) {
 }
 async function abortableDelay(delayMs, signal) {
   if (!signal) {
-    await new Promise((resolve) => setTimeout(resolve, delayMs));
+    await new Promise((resolve2) => setTimeout(resolve2, delayMs));
     return;
   }
   throwIfAborted(signal);
-  await new Promise((resolve, reject) => {
+  await new Promise((resolve2, reject) => {
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", onAbort);
-      resolve();
+      resolve2();
     }, delayMs);
     const onAbort = () => {
       clearTimeout(timer);
@@ -15304,7 +15419,7 @@ async function abortableDelay(delayMs, signal) {
 // package.json
 var package_default = {
   name: "@opengeni/ogtool",
-  version: "0.3.43",
+  version: "0.3.44-canary.36079201993001",
   description: "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -15552,14 +15667,10 @@ function listProjection(catalog) {
     }))
   };
 }
-var SHOW_MAX_BYTES = 64 * 1024;
 function showOutput(catalog, name) {
   const entry = resolveTool(catalog, name);
   const projection = listProjection({ ...catalog, entries: [entry] });
   const output = JSON.stringify(projection.tools[0], null, 2);
-  if (Buffer.byteLength(output, "utf8") + 1 > SHOW_MAX_BYTES) {
-    throw new Error("Tool details exceed 65536 bytes; use list --full or declarations <output-file>");
-  }
   return `${output}
 `;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/ogtool",
-  "version": "0.3.43",
+  "version": "0.3.44-canary.36079201993001",
   "description": "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   "license": "Apache-2.0",
   "repository": {
@@ -37,7 +37,7 @@
     "prepublishOnly": "bash ../../scripts/prepublish-guard"
   },
   "dependencies": {
-    "@opengeni/codemode": "^0.6.1"
+    "@opengeni/codemode": "^0.6.2-canary.36079201993001"
   },
   "engines": {
     "node": ">=18"

package/src/cli.ts

@@ -153,17 +153,10 @@ export function listProjection(catalog: AttemptToolCatalog): Record<string, unkn
   };
 }
 
-const SHOW_MAX_BYTES = 64 * 1024;
-
 export function showOutput(catalog: AttemptToolCatalog, name: string): string {
   const entry = resolveTool(catalog, name);
   const projection = listProjection({ ...catalog, entries: [entry] });
   const output = JSON.stringify((projection.tools as unknown[])[0], null, 2);
-  if (Buffer.byteLength(output, "utf8") + 1 > SHOW_MAX_BYTES) {
-    throw new Error(
-      "Tool details exceed 65536 bytes; use list --full or declarations <output-file>",
-    );
-  }
   return `${output}\n`;
 }