@oisincoveney/pipeline 3.11.18 → 3.11.19

package/dist/config/schemas.d.ts

@@ -509,8 +509,8 @@ declare const configSchema: z.ZodObject<{
   schedules: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     baseline: z.ZodEnum<{
-      quick: "quick";
       execute: "execute";
+      quick: "quick";
     }>;
     max_parallel_nodes: z.ZodOptional<z.ZodNumber>;
     node_catalog: z.ZodOptional<z.ZodString>;

package/dist/hooks.d.ts

@@ -13,8 +13,8 @@ declare const hookResultSchema: z.ZodObject<{
     taskContext: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
   }, z.core.$strict>>;
   status: z.ZodEnum<{
-    pass: "pass";
     fail: "fail";
+    pass: "pass";
     skip: "skip";
   }>;
   summary: z.ZodOptional<z.ZodString>;

package/dist/moka-submit.d.ts

@@ -5,13 +5,13 @@ import { z } from "zod";
 //#region src/moka-submit.d.ts
 declare const mokaSubmitDirectHooksSchema: z.ZodRecord<z.ZodEnum<{
   "workflow.start": "workflow.start";
+  "node.finish": "node.finish";
+  "node.start": "node.start";
   "workflow.success": "workflow.success";
   "workflow.failure": "workflow.failure";
   "workflow.complete": "workflow.complete";
-  "node.start": "node.start";
   "node.success": "node.success";
   "node.error": "node.error";
-  "node.finish": "node.finish";
   "gate.failure": "gate.failure";
 }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
   failure: z.ZodDefault<z.ZodEnum<{
@@ -94,13 +94,13 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
     "workflow.start": "workflow.start";
+    "node.finish": "node.finish";
+    "node.start": "node.start";
     "workflow.success": "workflow.success";
     "workflow.failure": "workflow.failure";
     "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
     "node.success": "node.success";
     "node.error": "node.error";
-    "node.finish": "node.finish";
     "gate.failure": "gate.failure";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
@@ -161,8 +161,8 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   }, z.core.$strict>>;
   serviceAccountName: z.ZodOptional<z.ZodString>;
   mode: z.ZodEnum<{
-    full: "full";
     quick: "quick";
+    full: "full";
   }>;
   schedulePath: z.ZodOptional<z.ZodString>;
   scheduleYaml: z.ZodOptional<z.ZodString>;
@@ -207,13 +207,13 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
     "workflow.start": "workflow.start";
+    "node.finish": "node.finish";
+    "node.start": "node.start";
     "workflow.success": "workflow.success";
     "workflow.failure": "workflow.failure";
     "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
     "node.success": "node.success";
     "node.error": "node.error";
-    "node.finish": "node.finish";
     "gate.failure": "gate.failure";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{

package/dist/run-state/opencode-accounts.js

@@ -1,26 +1,30 @@
-import { chmodSync, copyFileSync, existsSync, mkdirSync } from "node:fs";
+import { isRecord } from "../safe-json.js";
+import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
 //#region src/run-state/opencode-accounts.ts
 const OPENCODE_OPENAI_ACCOUNTS_STAGING_DIR = "/etc/pipeline/opencode-openai-accounts";
 const OPENCODE_AUTH_STAGING_DIR = "/etc/pipeline/opencode-auth";
+const ACCOUNTS_FILE_NAME = "oc-codex-multi-auth-accounts.json";
+const AUTH_FILE_NAME = "auth.json";
+const HOST_OPENAI_PROVIDER = "openai";
 const WRITABLE_OPENCODE_CREDENTIAL_FILES = [{
-	destFromHome: [".opencode", "oc-codex-multi-auth-accounts.json"],
+	destFromHome: [".opencode", ACCOUNTS_FILE_NAME],
 	stagedPath: join(OPENCODE_OPENAI_ACCOUNTS_STAGING_DIR, "accounts.json")
 }, {
 	destFromHome: [
 		".local",
 		"share",
 		"opencode",
-		"auth.json"
+		AUTH_FILE_NAME
 	],
-	stagedPath: join(OPENCODE_AUTH_STAGING_DIR, "auth.json")
+	stagedPath: join(OPENCODE_AUTH_STAGING_DIR, AUTH_FILE_NAME)
 }];
 /**
-* Copy each staged opencode credential secret to its writable live path so the
-* plugin can rewrite tokens. Only files whose staged source exists are copied
-* (local dev / tests / configs without a given secret keep whatever store is
-* already present). Returns the basenames copied, for run-log evidence.
+* Copy each staged opencode credential secret to its writable live path, then
+* sync the account pool's active openai token into auth.json's openai entry.
+* Only files whose staged source exists are copied (local dev / tests / configs
+* without a given secret keep whatever store is already present).
 */
 function prepareOpencodeCredentials(options = {}) {
 	const home = homedir();
@@ -36,7 +40,53 @@ function prepareOpencodeCredentials(options = {}) {
 		chmodSync(destPath, 384);
 		copied.push(basename(destPath));
 	}
-	return { copied };
+	const accountsPath = files.find((file) => basename(file.destPath) === ACCOUNTS_FILE_NAME)?.destPath;
+	const authPath = files.find((file) => basename(file.destPath) === AUTH_FILE_NAME)?.destPath;
+	return {
+		copied,
+		hostOpenaiTokenSynced: accountsPath !== void 0 && authPath !== void 0 && syncHostOpenaiToken(accountsPath, authPath)
+	};
+}
+function activeAccountOAuth(accountsRaw) {
+	if (!isRecord(accountsRaw)) return;
+	const accounts = accountsRaw.accounts;
+	if (!Array.isArray(accounts)) return;
+	const account = accounts[activeAccountIndex(accountsRaw)] ?? accounts[0];
+	return isRecord(account) ? oauthFromAccount(account) : void 0;
+}
+function nonEmptyString(value) {
+	return typeof value === "string" && value.length > 0;
+}
+function oauthFromAccount(account) {
+	const { accessToken, refreshToken, expiresAt } = account;
+	if (nonEmptyString(accessToken) && nonEmptyString(refreshToken) && typeof expiresAt === "number") return {
+		access: accessToken,
+		expires: expiresAt,
+		refresh: refreshToken
+	};
+}
+function activeAccountIndex(accountsRaw) {
+	const byFamily = accountsRaw.activeIndexByFamily;
+	if (isRecord(byFamily) && typeof byFamily.codex === "number") return byFamily.codex;
+	return typeof accountsRaw.activeIndex === "number" ? accountsRaw.activeIndex : 0;
+}
+function syncHostOpenaiToken(accountsPath, authPath) {
+	if (!(existsSync(accountsPath) && existsSync(authPath))) return false;
+	const token = activeAccountOAuth(JSON.parse(readFileSync(accountsPath, "utf8")));
+	if (!token) return false;
+	const auth = JSON.parse(readFileSync(authPath, "utf8"));
+	if (!isRecord(auth)) return false;
+	const next = {
+		...auth,
+		[HOST_OPENAI_PROVIDER]: {
+			access: token.access,
+			expires: token.expires,
+			refresh: token.refresh,
+			type: "oauth"
+		}
+	};
+	writeFileSync(authPath, `${JSON.stringify(next, null, 2)}\n`, { mode: 384 });
+	return true;
 }
 //#endregion
 export { OPENCODE_AUTH_STAGING_DIR, OPENCODE_OPENAI_ACCOUNTS_STAGING_DIR, prepareOpencodeCredentials };

package/dist/runner-command/run.js

@@ -107,6 +107,7 @@ function runRunnerCommandEffect(options, runtime) {
 		const credentialsPrep = yield* io.prepareOpencodeCredentials();
 		logger.info({
 			copied: credentialsPrep.copied,
+			hostOpenaiTokenSynced: credentialsPrep.hostOpenaiTokenSynced,
 			phase: "opencode.credentials.prepare",
 			status: "finish"
 		}, "opencode.credentials.prepare finish");

package/dist/runner-command-contract.d.ts

@@ -43,8 +43,8 @@ declare const runnerDeliverySchema: z.ZodObject<{
 declare const mokaSubmissionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   kind: z.ZodLiteral<"graph">;
   mode: z.ZodEnum<{
-    full: "full";
     quick: "quick";
+    full: "full";
   }>;
 }, z.core.$strict>, z.ZodObject<{
   argv: z.ZodArray<z.ZodString>;
@@ -104,8 +104,8 @@ declare const runnerCommandPayloadSchema: z.ZodObject<{
   submission: z.ZodDefault<z.ZodDiscriminatedUnion<[z.ZodObject<{
     kind: z.ZodLiteral<"graph">;
     mode: z.ZodEnum<{
-      full: "full";
       quick: "quick";
+      full: "full";
     }>;
   }, z.core.$strict>, z.ZodObject<{
     argv: z.ZodArray<z.ZodString>;

package/dist/runner-event-schema.d.ts

@@ -11,8 +11,8 @@ declare const runnerEventRecordSchema: z.ZodUnion<readonly [z.ZodObject<{
   runId: z.ZodString;
   sequence: z.ZodNumber;
   type: z.ZodEnum<{
-    "workflow.start": "workflow.start";
     "workflow.planned": "workflow.planned";
+    "workflow.start": "workflow.start";
   }>;
   workflowPlan: z.ZodObject<{
     edges: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -58,10 +58,10 @@ declare const runnerEventRecordSchema: z.ZodUnion<readonly [z.ZodObject<{
     }>;
   }, z.core.$strip>;
   type: z.ZodEnum<{
-    "node.start": "node.start";
-    "node.finish": "node.finish";
     "agent.finish": "agent.finish";
     "agent.start": "agent.start";
+    "node.finish": "node.finish";
+    "node.start": "node.start";
   }>;
 }, z.core.$strip>, z.ZodObject<{
   at: z.ZodOptional<z.ZodString>;
@@ -108,8 +108,8 @@ declare const runnerEventRecordSchema: z.ZodUnion<readonly [z.ZodObject<{
     nodeId: z.ZodOptional<z.ZodString>;
     outputs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     status: z.ZodEnum<{
-      pass: "pass";
       fail: "fail";
+      pass: "pass";
       skip: "skip";
     }>;
     summary: z.ZodOptional<z.ZodString>;
@@ -189,8 +189,8 @@ declare const runnerEventBatchSchema: z.ZodObject<{
     runId: z.ZodString;
     sequence: z.ZodNumber;
     type: z.ZodEnum<{
-      "workflow.start": "workflow.start";
       "workflow.planned": "workflow.planned";
+      "workflow.start": "workflow.start";
     }>;
     workflowPlan: z.ZodObject<{
       edges: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -236,10 +236,10 @@ declare const runnerEventBatchSchema: z.ZodObject<{
       }>;
     }, z.core.$strip>;
     type: z.ZodEnum<{
-      "node.start": "node.start";
-      "node.finish": "node.finish";
       "agent.finish": "agent.finish";
       "agent.start": "agent.start";
+      "node.finish": "node.finish";
+      "node.start": "node.start";
     }>;
   }, z.core.$strip>, z.ZodObject<{
     at: z.ZodOptional<z.ZodString>;
@@ -286,8 +286,8 @@ declare const runnerEventBatchSchema: z.ZodObject<{
       nodeId: z.ZodOptional<z.ZodString>;
       outputs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
       status: z.ZodEnum<{
-        pass: "pass";
         fail: "fail";
+        pass: "pass";
         skip: "skip";
       }>;
       summary: z.ZodOptional<z.ZodString>;

package/dist/runtime/events/events.js

@@ -1,5 +1,5 @@
-import { flattenNodes } from "../../planning/graph.js";
 import { isRecord } from "../../safe-json.js";
+import { flattenNodes } from "../../planning/graph.js";
 import { runtimeActorId } from "../actor-ids.js";
 import { parseRuntimeOutput, validateJsonSchemaSource } from "../json-validation/json-validation.js";
 import "../json-validation/index.js";

package/dist/runtime/json-validation/json-validation.js

@@ -1,5 +1,5 @@
-import { standardOutputSchemaJson, standardOutputSchemaNameFromPath } from "../../standard-output-schemas.js";
 import { isRecord, parseJson, parseJsonRecord } from "../../safe-json.js";
+import { standardOutputSchemaJson, standardOutputSchemaNameFromPath } from "../../standard-output-schemas.js";
 import { FileSystemService, FileSystemServiceLive, runFileSystemSync } from "../services/file-system-service.js";
 import { Effect } from "effect";
 import { join } from "node:path";

package/package.json

@@ -128,7 +128,7 @@
     "prepack": "bun run build:cli"
   },
   "type": "module",
-  "version": "3.11.18",
+  "version": "3.11.19",
   "description": "Config-driven multi-agent pipeline runner for repository work",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",