@opengeni/ogtool 1.3.0 → 1.4.2

package/README.md

@@ -44,7 +44,7 @@ Commands:
 - `ogtool list [--json] [--query <substring>] [--limit <1..100>] [--offset <integer>]`
 - `ogtool list --full` — the previous full catalog JSON, including identity and schemas
 - `ogtool show <tool-path-or-model-name>` — one tool's details and schemas as JSON
-- `ogtool call <tool-path-or-model-name> [json-object]`
+- `ogtool call <tool-path-or-model-name> [json-object] [--full]` — the tool result as JSON. A text block that only repeats `structuredContent` as JSON is omitted, so the payload prints once; prose, differing text, annotated text, and non-text blocks stay. `--full` prints the exact result.
 - `ogtool declarations [output-file]`
 - `ogtool doctor`
 - `ogtool --version`

package/dist/bin/ogtool.cjs

@@ -40,6 +40,7 @@ var __export = (target, all) => {
 // src/cli.ts
 var exports_cli = {};
 __export(exports_cli, {
+  callOutput: () => callOutput,
   listProjection: () => listProjection,
   parseToolArguments: () => parseToolArguments,
   resolveTool: () => resolveTool,
@@ -14676,6 +14677,65 @@ var CodemodeDispatchAck = exports_external.object({
   status: exports_external.enum(["accepted", "already_running", "terminal", "unavailable", "rejected"])
 }).strict();
 
+// ../contracts/src/mcp-structured-content.ts
+function omitStructuredContentTextDuplicates(result) {
+  const structured = result.structuredContent;
+  if (structured === undefined || structured === null)
+    return result;
+  const content = result.content.filter((entry) => !isPlainTextBlock(entry) || !textDuplicatesStructuredContent(entry.text, structured));
+  if (content.length === result.content.length)
+    return result;
+  return { ...result, content };
+}
+function isPlainTextBlock(entry) {
+  if (!entry || typeof entry !== "object" || Array.isArray(entry))
+    return false;
+  const record2 = entry;
+  if (record2.type !== "text" || typeof record2.text !== "string")
+    return false;
+  return Object.keys(record2).every((key) => key === "type" || key === "text");
+}
+function textDuplicatesStructuredContent(text, structured) {
+  const trimmed = text.replace(/^[ \t\n\r]+/u, "");
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("["))
+    return false;
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return false;
+  }
+  return !containsUnsafeInteger(parsed) && jsonValuesEqual(parsed, structured);
+}
+function containsUnsafeInteger(value) {
+  if (typeof value === "number")
+    return Number.isInteger(value) && !Number.isSafeInteger(value);
+  if (Array.isArray(value))
+    return value.some(containsUnsafeInteger);
+  if (value && typeof value === "object")
+    return Object.values(value).some(containsUnsafeInteger);
+  return false;
+}
+function jsonValuesEqual(left, right) {
+  if (left === right)
+    return true;
+  if (typeof left !== "object" || typeof right !== "object" || left === null || right === null) {
+    return false;
+  }
+  if (Array.isArray(left) || Array.isArray(right)) {
+    if (!Array.isArray(left) || !Array.isArray(right) || left.length !== right.length) {
+      return false;
+    }
+    return left.every((entry, index) => jsonValuesEqual(entry, right[index]));
+  }
+  const leftRecord = left;
+  const rightRecord = right;
+  const leftKeys = Object.keys(leftRecord);
+  if (leftKeys.length !== Object.keys(rightRecord).length)
+    return false;
+  return leftKeys.every((key) => Object.hasOwn(rightRecord, key) && jsonValuesEqual(leftRecord[key], rightRecord[key]));
+}
+
 // ../tool-gateway/src/catalog.ts
 var import_node_crypto = require("node:crypto");
 
@@ -15271,19 +15331,21 @@ class CodemodeClient {
     };
   }
   async submit(operationId, catalogDigest, identity, argumentsValue, signal) {
-    const response = await this.request("/calls", {
-      method: "POST",
-      ...signal ? { signal } : {},
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({
-        operationId,
-        catalogDigest,
-        identity,
-        arguments: argumentsValue,
-        durableApproval: true
-      })
+    return await retryTransientCodemodeRequest(signal, async () => {
+      const response = await this.request("/calls", {
+        method: "POST",
+        ...signal ? { signal } : {},
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({
+          operationId,
+          catalogDigest,
+          identity,
+          arguments: argumentsValue,
+          durableApproval: true
+        })
+      });
+      return CodemodeCallSubmission.parse(await response.json()).operation;
     });
-    return CodemodeCallSubmission.parse(await response.json()).operation;
   }
   async status(operationId, signal) {
     const operation = await this.read(operationId, signal);
@@ -15313,11 +15375,13 @@ class CodemodeClient {
     }
   }
   async read(operationId, signal) {
-    const response = await this.request(`/calls/${operationId}`, {
-      method: "GET",
-      ...signal ? { signal } : {}
+    return await retryTransientCodemodeRequest(signal, async () => {
+      const response = await this.request(`/calls/${operationId}`, {
+        method: "GET",
+        ...signal ? { signal } : {}
+      });
+      return CodemodeOperation.parse(await response.json());
     });
-    return CodemodeOperation.parse(await response.json());
   }
   async sessionRequest(path, init) {
     siteSessionPath(path, "site-host", init.method ?? "GET");
@@ -15448,6 +15512,23 @@ function parseCodemodeApiError(input) {
     ...details ? { details } : {}
   } : null;
 }
+var CODEMODE_TRANSIENT_RETRY_DELAYS_MS = [100, 250, 500, 1000, 2000];
+function isTransientCodemodeTransportError(error51) {
+  return error51 instanceof CodemodeTransportError && error51.status !== null && error51.status >= 500 && error51.retryable === true && error51.outcomeUnknown !== true;
+}
+async function retryTransientCodemodeRequest(signal, request) {
+  for (let attempt = 0;; attempt += 1) {
+    try {
+      return await request();
+    } catch (error51) {
+      const delayMs = CODEMODE_TRANSIENT_RETRY_DELAYS_MS[attempt];
+      if (delayMs === undefined || signal?.aborted || !isTransientCodemodeTransportError(error51)) {
+        throw error51;
+      }
+      await abortableDelay(delayMs + Math.floor(Math.random() * delayMs), signal);
+    }
+  }
+}
 async function abortableDelay(delayMs, signal) {
   if (!signal) {
     await new Promise((resolve2) => setTimeout(resolve2, delayMs));
@@ -15469,7 +15550,7 @@ async function abortableDelay(delayMs, signal) {
 // package.json
 var package_default = {
   name: "@opengeni/ogtool",
-  version: "1.3.0",
+  version: "1.4.2",
   description: "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -15506,7 +15587,8 @@ var package_default = {
     prepublishOnly: "bash ../../scripts/prepublish-guard"
   },
   dependencies: {
-    "@opengeni/codemode": "workspace:*"
+    "@opengeni/codemode": "workspace:*",
+    "@opengeni/contracts": "workspace:*"
   },
   devDependencies: {
     tsup: "^8.5.0",
@@ -15598,7 +15680,7 @@ function usage(exitCode = 1) {
     "  ogtool list [--full | --json]",
     "              [--query <substring>] [--limit <1..100>] [--offset <nonnegative integer>]",
     "  ogtool show <tool-path-or-model-name>",
-    "  ogtool call <tool-path-or-model-name> [json-object]",
+    "  ogtool call <tool-path-or-model-name> [json-object] [--full]",
     "  ogtool read <operation-id>",
     "  ogtool resume <operation-id>",
     "  ogtool declarations [output-file]",
@@ -15606,6 +15688,7 @@ function usage(exitCode = 1) {
     "  ogtool --version",
     "",
     "list returns all authorized tools by default; --limit/--offset are opt-in slices",
+    "call omits a text block that only repeats structuredContent; --full prints the exact result",
     "",
     "requires OPENGENI_CODEMODE_URL and OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE"
   ].join(`
@@ -15726,6 +15809,11 @@ function showOutput(catalog, name) {
   return `${output}
 `;
 }
+function callOutput(result, full = false) {
+  const printed = full ? result : omitStructuredContentTextDuplicates(result);
+  return `${JSON.stringify(printed, null, 2)}
+`;
+}
 function parseToolArguments(raw) {
   if (raw === undefined)
     return {};
@@ -15784,17 +15872,17 @@ async function main() {
     return;
   }
   if (command === "call") {
-    const name = process.argv[3];
+    const full = args.includes("--full");
+    const [name, rawArguments] = args.filter((arg) => arg !== "--full");
     if (!name)
       throw new Error("tool path or model name is required");
-    const argumentsValue = parseToolArguments(process.argv[4]);
+    const argumentsValue = parseToolArguments(rawArguments);
     const catalog = await client.catalog();
     const entry = resolveTool(catalog, name);
     const result = await client.call(entry.identity, argumentsValue, {
       operationId: import_node_crypto3.randomUUID()
     });
-    process.stdout.write(`${JSON.stringify(result, null, 2)}
-`);
+    process.stdout.write(callOutput(result, full));
     return;
   }
   if (command === "declarations") {

package/dist/cli.d.ts

@@ -1,5 +1,12 @@
 import { type AttemptToolCatalog, type AttemptToolCatalogEntry } from "@opengeni/codemode";
+import { type AttemptToolResult } from "@opengeni/contracts";
 export declare function resolveTool(catalog: AttemptToolCatalog, name: string): AttemptToolCatalogEntry;
 export declare function listProjection(catalog: AttemptToolCatalog): Record<string, unknown>;
 export declare function showOutput(catalog: AttemptToolCatalog, name: string): string;
+/**
+ * `call` prints the payload once by default: a text block that only repeats
+ * `structuredContent` as JSON is omitted. `--full` prints the exact result.
+ * The native client (`codemode call`) applies the same rule.
+ */
+export declare function callOutput(result: AttemptToolResult, full?: boolean): string;
 export declare function parseToolArguments(raw: string | undefined): Record<string, unknown>;

package/package.json

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

package/src/cli.ts

@@ -8,6 +8,7 @@ import {
   type AttemptToolCatalog,
   type AttemptToolCatalogEntry,
 } from "@opengeni/codemode";
+import { omitStructuredContentTextDuplicates, type AttemptToolResult } from "@opengeni/contracts";
 import packageManifest from "../package.json" with { type: "json" };
 import { compactOutput, parseListOptions } from "./catalog-discovery";
 
@@ -20,7 +21,7 @@ function usage(exitCode = 1): void {
     "  ogtool list [--full | --json]",
     "              [--query <substring>] [--limit <1..100>] [--offset <nonnegative integer>]",
     "  ogtool show <tool-path-or-model-name>",
-    "  ogtool call <tool-path-or-model-name> [json-object]",
+    "  ogtool call <tool-path-or-model-name> [json-object] [--full]",
     "  ogtool read <operation-id>",
     "  ogtool resume <operation-id>",
     "  ogtool declarations [output-file]",
@@ -28,6 +29,7 @@ function usage(exitCode = 1): void {
     "  ogtool --version",
     "",
     "list returns all authorized tools by default; --limit/--offset are opt-in slices",
+    "call omits a text block that only repeats structuredContent; --full prints the exact result",
     "",
     "requires OPENGENI_CODEMODE_URL and OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE",
   ].join("\n");
@@ -164,6 +166,16 @@ export function showOutput(catalog: AttemptToolCatalog, name: string): string {
   return `${output}\n`;
 }
 
+/**
+ * `call` prints the payload once by default: a text block that only repeats
+ * `structuredContent` as JSON is omitted. `--full` prints the exact result.
+ * The native client (`codemode call`) applies the same rule.
+ */
+export function callOutput(result: AttemptToolResult, full = false): string {
+  const printed = full ? result : omitStructuredContentTextDuplicates(result);
+  return `${JSON.stringify(printed, null, 2)}\n`;
+}
+
 export function parseToolArguments(raw: string | undefined): Record<string, unknown> {
   if (raw === undefined) return {};
   let value: unknown;
@@ -223,15 +235,16 @@ async function main(): Promise<void> {
     return;
   }
   if (command === "call") {
-    const name = process.argv[3];
+    const full = args.includes("--full");
+    const [name, rawArguments] = args.filter((arg) => arg !== "--full");
     if (!name) throw new Error("tool path or model name is required");
-    const argumentsValue = parseToolArguments(process.argv[4]);
+    const argumentsValue = parseToolArguments(rawArguments);
     const catalog = await client.catalog();
     const entry = resolveTool(catalog, name);
     const result = await client.call(entry.identity, argumentsValue, {
       operationId: randomUUID(),
     });
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+    process.stdout.write(callOutput(result, full));
     return;
   }
   if (command === "declarations") {