@opengeni/ogtool 1.2.1-canary.37222965366001 → 1.4.0

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,
@@ -14619,6 +14620,7 @@ function requireCompleteSiteToolContext(value, context) {
 }
 var CodemodeOperationState = exports_external.enum([
   "queued",
+  "waiting_for_approval",
   "running",
   "completed",
   "failed",
@@ -14642,6 +14644,8 @@ var CodemodeOperation = exports_external.object({
     message: "Codemode operation caller must be codemode"
   }),
   state: CodemodeOperationState,
+  durableApproval: exports_external.literal(true).optional(),
+  approvalRequestId: exports_external.string().uuid().optional(),
   result: AttemptToolResult.nullable(),
   errorCode: exports_external.string().min(1).max(128).nullable(),
   errorMessage: exports_external.string().min(1).max(4096).nullable(),
@@ -14652,6 +14656,7 @@ var CodemodeOperation = exports_external.object({
   updatedAt: exports_external.string().datetime({ offset: true })
 }).strict();
 var CodemodeCallRequest = exports_external.object({
+  durableApproval: exports_external.literal(true).optional(),
   operationId: exports_external.string().uuid(),
   catalogDigest: sha256,
   identity: AttemptToolIdentity,
@@ -14672,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");
 
@@ -15089,6 +15153,20 @@ class CodemodeOperationError extends Error {
     this.operation = operation;
     this.code = code;
     this.name = "CodemodeOperationError";
+    Object.defineProperty(this, "operation", { value: operation, enumerable: false });
+  }
+}
+
+class CodemodeApprovalPendingError extends Error {
+  operationId;
+  approvalRequestId;
+  code = "codemode_approval_pending";
+  state = "waiting_for_approval";
+  constructor(operationId, approvalRequestId) {
+    super(`Operation ${operationId} is waiting for approval. After review, read or resume this handle; do not submit its arguments again.`);
+    this.operationId = operationId;
+    this.approvalRequestId = approvalRequestId;
+    this.name = "CodemodeApprovalPendingError";
   }
 }
 
@@ -15212,6 +15290,9 @@ class CodemodeClient {
       } else {
         operation = await this.read(operationId, options.signal);
       }
+      if (operation.state === "waiting_for_approval") {
+        throw new CodemodeApprovalPendingError(operation.operationId, operation.approvalRequestId);
+      }
       if (operation.state === "completed") {
         return { result: AttemptToolResult.parse(operation.result), entry };
       }
@@ -15258,11 +15339,39 @@ class CodemodeClient {
         operationId,
         catalogDigest,
         identity,
-        arguments: argumentsValue
+        arguments: argumentsValue,
+        durableApproval: true
       })
     });
     return CodemodeCallSubmission.parse(await response.json()).operation;
   }
+  async status(operationId, signal) {
+    const operation = await this.read(operationId, signal);
+    return {
+      operationId: operation.operationId,
+      state: operation.state,
+      approvalRequestId: operation.approvalRequestId,
+      result: operation.result,
+      errorCode: operation.errorCode,
+      errorMessage: operation.errorMessage
+    };
+  }
+  async resume(operationId, options = {}) {
+    const deadline = Date.now() + boundedPositiveInteger(options.timeoutMs ?? this.timeoutMs, 1000, 60 * 60000);
+    while (true) {
+      throwIfAborted(options.signal);
+      const operation = await this.read(operationId, options.signal);
+      if (operation.state === "waiting_for_approval")
+        throw new CodemodeApprovalPendingError(operation.operationId, operation.approvalRequestId);
+      if (operation.state === "completed")
+        return AttemptToolResult.parse(operation.result);
+      if (["failed", "outcome_unknown", "cancelled"].includes(operation.state))
+        throw new CodemodeOperationError(operation, operation.errorCode ?? `codemode_${operation.state}`);
+      if (Date.now() >= deadline)
+        throw new CodemodeTransportError(`Codemode operation ${operationId} did not settle before the client deadline`);
+      await abortableDelay(this.pollIntervalMs, options.signal);
+    }
+  }
   async read(operationId, signal) {
     const response = await this.request(`/calls/${operationId}`, {
       method: "GET",
@@ -15280,7 +15389,8 @@ class CodemodeClient {
       ...init,
       headers: {
         ...Object.fromEntries(new Headers(init.headers).entries()),
-        authorization: `Bearer ${token}`
+        authorization: `Bearer ${token}`,
+        "x-opengeni-codemode-capabilities": "durable-approval-v1"
       }
     });
     if (!response.ok && throwOnError) {
@@ -15419,7 +15529,7 @@ async function abortableDelay(delayMs, signal) {
 // package.json
 var package_default = {
   name: "@opengeni/ogtool",
-  version: "1.2.1-canary.37222965366001",
+  version: "1.4.0",
   description: "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -15456,7 +15566,8 @@ var package_default = {
     prepublishOnly: "bash ../../scripts/prepublish-guard"
   },
   dependencies: {
-    "@opengeni/codemode": "workspace:*"
+    "@opengeni/codemode": "workspace:*",
+    "@opengeni/contracts": "workspace:*"
   },
   devDependencies: {
     tsup: "^8.5.0",
@@ -15548,12 +15659,15 @@ 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]",
     "  ogtool doctor",
     "  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(`
@@ -15674,6 +15788,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 {};
@@ -15709,6 +15828,14 @@ async function main() {
     throw new Error("usage: ogtool show <tool-path-or-model-name>");
   }
   const client = configuredClient();
+  if (command === "read" || command === "resume") {
+    if (args.length !== 1 || !/^[0-9a-f-]{36}$/iu.test(args[0]))
+      throw new Error("A valid operation ID is required");
+    const result = command === "read" ? await client.status(args[0]) : await client.resume(args[0]);
+    process.stdout.write(`${JSON.stringify(result, null, 2)}
+`);
+    return;
+  }
   if (command === "list") {
     const catalog = await client.catalog();
     if (listOptions.full) {
@@ -15724,17 +15851,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") {
@@ -15753,6 +15880,18 @@ async function main() {
   return usage();
 }
 main().catch((error51) => {
+  if (error51 instanceof CodemodeApprovalPendingError) {
+    process.stdout.write(`${JSON.stringify({ operationId: error51.operationId, state: error51.state, code: error51.code, approvalRequestId: error51.approvalRequestId, message: error51.message })}
+`);
+    process.exitCode = 2;
+    return;
+  }
+  if (error51 instanceof CodemodeOperationError) {
+    process.stdout.write(`${JSON.stringify({ operationId: error51.operation.operationId, state: error51.operation.state, code: error51.code, message: error51.message })}
+`);
+    process.exitCode = error51.operation.state === "outcome_unknown" ? 3 : 1;
+    return;
+  }
   const code = error51 && typeof error51 === "object" && "code" in error51 ? String(error51.code) : null;
   process.stderr.write(`${error51 instanceof Error ? error51.message : String(error51)}
 `);

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.2.1-canary.37222965366001",
+  "version": "1.4.0",
   "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.2.1-canary.37222965366001"
+    "@opengeni/codemode": "1.4.0",
+    "@opengeni/contracts": "1.4.0"
   },
   "engines": {
     "node": ">=18"

package/src/cli.ts

@@ -2,10 +2,13 @@ import { randomUUID } from "node:crypto";
 import { readFileSync, statSync, writeFileSync } from "node:fs";
 import {
   CodemodeClient,
+  CodemodeApprovalPendingError,
+  CodemodeOperationError,
   generateCodemodeDeclarations,
   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";
 
@@ -18,12 +21,15 @@ 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]",
     "  ogtool doctor",
     "  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");
@@ -160,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;
@@ -197,6 +213,14 @@ async function main(): Promise<void> {
   }
 
   const client = configuredClient();
+  if (command === "read" || command === "resume") {
+    if (args.length !== 1 || !/^[0-9a-f-]{36}$/iu.test(args[0]!))
+      throw new Error("A valid operation ID is required");
+    const result =
+      command === "read" ? await client.status(args[0]!) : await client.resume(args[0]!);
+    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+    return;
+  }
   if (command === "list") {
     const catalog = await client.catalog();
     if (listOptions!.full) {
@@ -211,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") {
@@ -240,6 +265,20 @@ async function main(): Promise<void> {
 }
 
 void main().catch((error: unknown) => {
+  if (error instanceof CodemodeApprovalPendingError) {
+    process.stdout.write(
+      `${JSON.stringify({ operationId: error.operationId, state: error.state, code: error.code, approvalRequestId: error.approvalRequestId, message: error.message })}\n`,
+    );
+    process.exitCode = 2;
+    return;
+  }
+  if (error instanceof CodemodeOperationError) {
+    process.stdout.write(
+      `${JSON.stringify({ operationId: error.operation.operationId, state: error.operation.state, code: error.code, message: error.message })}\n`,
+    );
+    process.exitCode = error.operation.state === "outcome_unknown" ? 3 : 1;
+    return;
+  }
   const code =
     error && typeof error === "object" && "code" in error
       ? String((error as { code: unknown }).code)