@opengeni/ogtool 1.2.1-canary.37222177070001 → 1.3.0

package/dist/bin/ogtool.cjs

@@ -14619,6 +14619,7 @@ function requireCompleteSiteToolContext(value, context) {
 }
 var CodemodeOperationState = exports_external.enum([
   "queued",
+  "waiting_for_approval",
   "running",
   "completed",
   "failed",
@@ -14642,6 +14643,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 +14655,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,
@@ -15089,6 +15093,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 +15230,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 +15279,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 +15329,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 +15469,7 @@ async function abortableDelay(delayMs, signal) {
 // package.json
 var package_default = {
   name: "@opengeni/ogtool",
-  version: "1.2.1-canary.37222177070001",
+  version: "1.3.0",
   description: "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -15549,6 +15599,8 @@ function usage(exitCode = 1) {
     "              [--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 read <operation-id>",
+    "  ogtool resume <operation-id>",
     "  ogtool declarations [output-file]",
     "  ogtool doctor",
     "  ogtool --version",
@@ -15709,6 +15761,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) {
@@ -15753,6 +15813,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/ogtool",
-  "version": "1.2.1-canary.37222177070001",
+  "version": "1.3.0",
   "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": "1.2.1-canary.37222177070001"
+    "@opengeni/codemode": "1.3.0"
   },
   "engines": {
     "node": ">=18"

package/src/cli.ts

@@ -2,6 +2,8 @@ import { randomUUID } from "node:crypto";
 import { readFileSync, statSync, writeFileSync } from "node:fs";
 import {
   CodemodeClient,
+  CodemodeApprovalPendingError,
+  CodemodeOperationError,
   generateCodemodeDeclarations,
   type AttemptToolCatalog,
   type AttemptToolCatalogEntry,
@@ -19,6 +21,8 @@ function usage(exitCode = 1): void {
     "              [--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 read <operation-id>",
+    "  ogtool resume <operation-id>",
     "  ogtool declarations [output-file]",
     "  ogtool doctor",
     "  ogtool --version",
@@ -197,6 +201,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) {
@@ -240,6 +252,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)