@opengeni/ogtool 0.2.2 → 0.3.6

package/README.md

@@ -15,10 +15,11 @@ Always replace `<version>` with the exact version in the deployment BOM; do not
 `latest` in a production image. An embedding host may expose that pinned spec through
 `OPENGENI_OGTOOL_PACKAGE_SPEC`.
 
-The CLI reads `OPENGENI_CODEMODE_URL` and the bearer path in
-`OPENGENI_CODEMODE_TOKEN_FILE`. The token remains in the protected file and is read anew for
-each CLI process, so worker-side token renewal does not require reinstalling or restarting the
-CLI. `ogtool doctor` checks local availability without printing the token.
+The CLI reads `OPENGENI_CODEMODE_URL` plus either the bearer in
+`OPENGENI_CODEMODE_TOKEN` or its path in `OPENGENI_CODEMODE_TOKEN_FILE`. Managed sandboxes use
+the protected file and reread it for every request. Connected Machines receive the direct bearer
+only in the exact agent command's child environment; it is not installed machine-wide or written
+to disk. `ogtool doctor` reports the selected delivery mode without printing the token.
 
 Commands:
 

package/dist/bin/ogtool.cjs

@@ -15195,7 +15195,12 @@ var CodemodeClient = class {
       method: "POST",
       ...signal ? { signal } : {},
       headers: { "content-type": "application/json" },
-      body: JSON.stringify({ operationId, catalogDigest, identity, arguments: argumentsValue })
+      body: JSON.stringify({
+        operationId,
+        catalogDigest,
+        identity,
+        arguments: argumentsValue
+      })
     });
     return CodemodeCallSubmission.parse(await response.json()).operation;
   }
@@ -15316,7 +15321,7 @@ async function abortableDelay(delayMs, signal) {
 // package.json
 var package_default = {
   name: "@opengeni/ogtool",
-  version: "0.2.2",
+  version: "0.3.6",
   description: "Codemode CLI and typed client entrypoint for an OpenGeni execution attempt.",
   license: "Apache-2.0",
   repository: {
@@ -15376,7 +15381,7 @@ function usage(exitCode = 1) {
     "  ogtool doctor",
     "  ogtool --version",
     "",
-    "requires OPENGENI_CODEMODE_TOKEN_FILE and OPENGENI_CODEMODE_URL"
+    "requires OPENGENI_CODEMODE_URL and OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE"
   ].join("\n");
   (exitCode === 0 ? process.stdout : process.stderr).write(`${output}
 `);
@@ -15384,14 +15389,22 @@ function usage(exitCode = 1) {
 }
 function configuredClient() {
   const baseUrl = process.env.OPENGENI_CODEMODE_URL?.trim();
+  const directTokenConfigured = process.env.OPENGENI_CODEMODE_TOKEN !== void 0;
   const tokenFile = process.env.OPENGENI_CODEMODE_TOKEN_FILE?.trim();
   if (!baseUrl) throw new Error("OPENGENI_CODEMODE_URL is required");
-  if (!tokenFile) throw new Error("OPENGENI_CODEMODE_TOKEN_FILE is required");
+  if (!directTokenConfigured && !tokenFile) {
+    throw new Error("OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE is required");
+  }
   return new CodemodeClient({
     baseUrl,
-    token: async () => readToken(tokenFile)
+    token: directTokenConfigured ? async () => requiredDirectToken() : async () => readToken(tokenFile)
   });
 }
+function requiredDirectToken() {
+  const token = process.env.OPENGENI_CODEMODE_TOKEN?.trim();
+  if (!token) throw new Error("OPENGENI_CODEMODE_TOKEN is empty");
+  return token;
+}
 function readToken(tokenFile) {
   let token;
   try {
@@ -15403,6 +15416,9 @@ function readToken(tokenFile) {
   return token;
 }
 function doctor() {
+  const directTokenRaw = process.env.OPENGENI_CODEMODE_TOKEN;
+  const directTokenConfigured = directTokenRaw !== void 0;
+  const directTokenNonempty = Boolean(directTokenRaw?.trim().length);
   const tokenFile = process.env.OPENGENI_CODEMODE_TOKEN_FILE ?? null;
   const rawUrl = process.env.OPENGENI_CODEMODE_URL ?? null;
   let urlValid = false;
@@ -15426,7 +15442,9 @@ function doctor() {
       tokenFileReadable = false;
     }
   }
-  const ok = urlValid && tokenFileReadable && tokenFileNonempty;
+  const tokenMode = directTokenConfigured ? "environment" : tokenFile ? "file" : null;
+  const tokenReady = directTokenConfigured ? directTokenNonempty : tokenFileNonempty;
+  const ok = urlValid && tokenReady;
   process.stdout.write(
     `${JSON.stringify(
       {
@@ -15437,6 +15455,9 @@ function doctor() {
         urlConfigured: rawUrl !== null,
         urlValid,
         protocol,
+        tokenMode,
+        directTokenConfigured,
+        directTokenNonempty,
         tokenFileConfigured: tokenFile !== null,
         tokenFileReadable,
         tokenFileNonempty,

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export declare const OGTOOL_PACKAGE_NAME: "@opengeni/ogtool";
 /** Environment variables consumed by the standalone bundled CLI. */
 export declare const OGTOOL_ENVIRONMENT: {
     readonly url: "OPENGENI_CODEMODE_URL";
+    readonly token: "OPENGENI_CODEMODE_TOKEN";
     readonly tokenFile: "OPENGENI_CODEMODE_TOKEN_FILE";
     readonly packageSpec: "OPENGENI_OGTOOL_PACKAGE_SPEC";
 };

package/dist/index.js

@@ -3,6 +3,7 @@ export * from "@opengeni/codemode";
 var OGTOOL_PACKAGE_NAME = "@opengeni/ogtool";
 var OGTOOL_ENVIRONMENT = {
   url: "OPENGENI_CODEMODE_URL",
+  token: "OPENGENI_CODEMODE_TOKEN",
   tokenFile: "OPENGENI_CODEMODE_TOKEN_FILE",
   packageSpec: "OPENGENI_OGTOOL_PACKAGE_SPEC"
 };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["/** npm package name used by deployment BOMs and custom-rig bootstrap hints. */\nexport const OGTOOL_PACKAGE_NAME = \"@opengeni/ogtool\" as const;\n\n/** Environment variables consumed by the standalone bundled CLI. */\nexport const OGTOOL_ENVIRONMENT = {\n  url: \"OPENGENI_CODEMODE_URL\",\n  tokenFile: \"OPENGENI_CODEMODE_TOKEN_FILE\",\n  packageSpec: \"OPENGENI_OGTOOL_PACKAGE_SPEC\",\n} as const;\n\nexport * from \"@opengeni/codemode\";\n"],"mappings":";AAUA,cAAc;AATP,IAAM,sBAAsB;AAG5B,IAAM,qBAAqB;AAAA,EAChC,KAAK;AAAA,EACL,WAAW;AAAA,EACX,aAAa;AACf;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["/** npm package name used by deployment BOMs and custom-rig bootstrap hints. */\nexport const OGTOOL_PACKAGE_NAME = \"@opengeni/ogtool\" as const;\n\n/** Environment variables consumed by the standalone bundled CLI. */\nexport const OGTOOL_ENVIRONMENT = {\n  url: \"OPENGENI_CODEMODE_URL\",\n  token: \"OPENGENI_CODEMODE_TOKEN\",\n  tokenFile: \"OPENGENI_CODEMODE_TOKEN_FILE\",\n  packageSpec: \"OPENGENI_OGTOOL_PACKAGE_SPEC\",\n} as const;\n\nexport * from \"@opengeni/codemode\";\n"],"mappings":";AAWA,cAAc;AAVP,IAAM,sBAAsB;AAG5B,IAAM,qBAAqB;AAAA,EAChC,KAAK;AAAA,EACL,OAAO;AAAA,EACP,WAAW;AAAA,EACX,aAAa;AACf;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/ogtool",
-  "version": "0.2.2",
+  "version": "0.3.6",
   "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.2.2"
+    "@opengeni/codemode": "^0.4.2"
   },
   "engines": {
     "node": ">=18"

package/src/cli.ts

@@ -20,7 +20,7 @@ function usage(exitCode = 1): void {
     "  ogtool doctor",
     "  ogtool --version",
     "",
-    "requires OPENGENI_CODEMODE_TOKEN_FILE and OPENGENI_CODEMODE_URL",
+    "requires OPENGENI_CODEMODE_URL and OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE",
   ].join("\n");
   (exitCode === 0 ? process.stdout : process.stderr).write(`${output}\n`);
   process.exitCode = exitCode;
@@ -28,15 +28,26 @@ function usage(exitCode = 1): void {
 
 function configuredClient(): CodemodeClient {
   const baseUrl = process.env.OPENGENI_CODEMODE_URL?.trim();
+  const directTokenConfigured = process.env.OPENGENI_CODEMODE_TOKEN !== undefined;
   const tokenFile = process.env.OPENGENI_CODEMODE_TOKEN_FILE?.trim();
   if (!baseUrl) throw new Error("OPENGENI_CODEMODE_URL is required");
-  if (!tokenFile) throw new Error("OPENGENI_CODEMODE_TOKEN_FILE is required");
+  if (!directTokenConfigured && !tokenFile) {
+    throw new Error("OPENGENI_CODEMODE_TOKEN or OPENGENI_CODEMODE_TOKEN_FILE is required");
+  }
   return new CodemodeClient({
     baseUrl,
-    token: async () => readToken(tokenFile),
+    token: directTokenConfigured
+      ? async () => requiredDirectToken()
+      : async () => readToken(tokenFile!),
   });
 }
 
+function requiredDirectToken(): string {
+  const token = process.env.OPENGENI_CODEMODE_TOKEN?.trim();
+  if (!token) throw new Error("OPENGENI_CODEMODE_TOKEN is empty");
+  return token;
+}
+
 function readToken(tokenFile: string): string {
   let token: string;
   try {
@@ -49,6 +60,9 @@ function readToken(tokenFile: string): string {
 }
 
 function doctor(): void {
+  const directTokenRaw = process.env.OPENGENI_CODEMODE_TOKEN;
+  const directTokenConfigured = directTokenRaw !== undefined;
+  const directTokenNonempty = Boolean(directTokenRaw?.trim().length);
   const tokenFile = process.env.OPENGENI_CODEMODE_TOKEN_FILE ?? null;
   const rawUrl = process.env.OPENGENI_CODEMODE_URL ?? null;
   let urlValid = false;
@@ -72,7 +86,9 @@ function doctor(): void {
       tokenFileReadable = false;
     }
   }
-  const ok = urlValid && tokenFileReadable && tokenFileNonempty;
+  const tokenMode = directTokenConfigured ? "environment" : tokenFile ? "file" : null;
+  const tokenReady = directTokenConfigured ? directTokenNonempty : tokenFileNonempty;
+  const ok = urlValid && tokenReady;
   process.stdout.write(
     `${JSON.stringify(
       {
@@ -83,6 +99,9 @@ function doctor(): void {
         urlConfigured: rawUrl !== null,
         urlValid,
         protocol,
+        tokenMode,
+        directTokenConfigured,
+        directTokenNonempty,
         tokenFileConfigured: tokenFile !== null,
         tokenFileReadable,
         tokenFileNonempty,

package/src/index.ts

@@ -4,6 +4,7 @@ export const OGTOOL_PACKAGE_NAME = "@opengeni/ogtool" as const;
 /** Environment variables consumed by the standalone bundled CLI. */
 export const OGTOOL_ENVIRONMENT = {
   url: "OPENGENI_CODEMODE_URL",
+  token: "OPENGENI_CODEMODE_TOKEN",
   tokenFile: "OPENGENI_CODEMODE_TOKEN_FILE",
   packageSpec: "OPENGENI_OGTOOL_PACKAGE_SPEC",
 } as const;