@oisincoveney/pipeline 3.16.0 → 3.17.1

package/dist/cli/submit-options.js

@@ -36,6 +36,7 @@ function mokaCommonSubmitOptions(input) {
 	return {
 		brokerAuth: resolveMokaBrokerAuth(input.globalConfig),
 		config: input.config,
+		dbAuth: momokaya?.submit.dbAuth,
 		delivery: { pullRequest: input.flags.openPr === true },
 		eventUrl: input.eventUrl,
 		eventAuthSecretKey: momokaya?.submit.eventAuthSecretKey,

package/dist/config/defaults.d.ts

@@ -80,8 +80,6 @@ declare const DEFAULT_OPENCODE_ECOSYSTEM_MANIFEST: {
     default_stack: true;
     id: string;
     name: string;
-    role: string;
-    source: string;
     package?: string | undefined;
     plugin?: {
       kind: "local";
@@ -91,6 +89,8 @@ declare const DEFAULT_OPENCODE_ECOSYSTEM_MANIFEST: {
       kind: "npm";
       package: string;
     } | undefined;
+    role: string;
+    source: string;
   }[];
   generated_by: "@oisincoveney/pipeline";
   host_capabilities: {
@@ -108,9 +108,9 @@ declare const DEFAULT_OPENCODE_ECOSYSTEM_MANIFEST: {
     credentials: string[];
     id: string;
     locality: string;
+    name?: string | undefined;
     required: boolean;
     role: string;
-    name?: string | undefined;
   }[];
   official_dependencies: {
     dependency_scope: string;
@@ -121,9 +121,9 @@ declare const DEFAULT_OPENCODE_ECOSYSTEM_MANIFEST: {
   }[];
   prompts: {
     id: string;
-    used_by: string[];
     path?: string | undefined;
     source?: string | undefined;
+    used_by: string[];
   }[];
   runtime: {
     compatibility_runners: string[];
@@ -133,9 +133,9 @@ declare const DEFAULT_OPENCODE_ECOSYSTEM_MANIFEST: {
   };
   skills: {
     id: string;
-    used_by: string[];
     path?: string | undefined;
     source?: string | undefined;
+    used_by: string[];
   }[];
   sources: {
     label: string;

package/dist/config/schemas.d.ts

@@ -92,10 +92,10 @@ declare const workflowNodeBaseSchema: z.ZodObject<{
   models: z.ZodOptional<z.ZodArray<z.ZodString>>;
   needs: z.ZodOptional<z.ZodArray<z.ZodString>>;
   reasoning_effort: z.ZodOptional<z.ZodEnum<{
-    none: "none";
+    high: "high";
     low: "low";
     medium: "medium";
-    high: "high";
+    none: "none";
     xhigh: "xhigh";
   }>>;
   retries: z.ZodOptional<z.ZodObject<{
@@ -176,8 +176,8 @@ declare const configSchema: z.ZodObject<{
           "workspace-write": "workspace-write";
         }>>;
         network: z.ZodOptional<z.ZodEnum<{
-          inherit: "inherit";
           disabled: "disabled";
+          inherit: "inherit";
         }>>;
       }, z.core.$strict>>;
       returns: z.ZodOptional<z.ZodObject<{
@@ -251,12 +251,12 @@ declare const configSchema: z.ZodObject<{
     }, z.core.$strict>>>;
     default_profile: z.ZodOptional<z.ZodString>;
     host_scope: z.ZodDefault<z.ZodEnum<{
-      project: "project";
       global: "global";
+      project: "project";
     }>>;
     mode: z.ZodEnum<{
-      local: "local";
       hosted: "hosted";
+      local: "local";
     }>;
     provider: z.ZodLiteral<"toolhive">;
     authorization_env: z.ZodDefault<z.ZodString>;
@@ -294,16 +294,16 @@ declare const configSchema: z.ZodObject<{
     model: z.ZodOptional<z.ZodString>;
     network: z.ZodOptional<z.ZodObject<{
       mode: z.ZodEnum<{
-        inherit: "inherit";
         disabled: "disabled";
+        inherit: "inherit";
       }>;
     }, z.core.$strict>>;
     output: z.ZodOptional<z.ZodObject<{
       format: z.ZodEnum<{
-        json_schema: "json_schema";
-        text: "text";
         json: "json";
+        json_schema: "json_schema";
         jsonl: "jsonl";
+        text: "text";
       }>;
       repair: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodOptional<z.ZodBoolean>;
@@ -313,10 +313,10 @@ declare const configSchema: z.ZodObject<{
       schema_path: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>;
     reasoning_effort: z.ZodOptional<z.ZodEnum<{
-      none: "none";
+      high: "high";
       low: "low";
       medium: "medium";
-      high: "high";
+      none: "none";
       xhigh: "xhigh";
     }>>;
     rules: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -328,13 +328,13 @@ declare const configSchema: z.ZodObject<{
     skills: z.ZodOptional<z.ZodArray<z.ZodString>>;
     timeout_ms: z.ZodOptional<z.ZodNumber>;
     tools: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-      task: "task";
-      read: "read";
-      list: "list";
-      grep: "grep";
-      glob: "glob";
       bash: "bash";
       edit: "edit";
+      glob: "glob";
+      grep: "grep";
+      list: "list";
+      read: "read";
+      task: "task";
       write: "write";
     }>>>;
   }, z.core.$strict>>>;
@@ -361,8 +361,8 @@ declare const configSchema: z.ZodObject<{
   rules: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
     path: z.ZodString;
     source_root: z.ZodDefault<z.ZodEnum<{
-      project: "project";
       package: "package";
+      project: "project";
     }>>;
   }, z.core.$strict>>>;
   runners: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -375,25 +375,25 @@ declare const configSchema: z.ZodObject<{
       mcp_servers: z.ZodOptional<z.ZodBoolean>;
       native_subagents: z.ZodOptional<z.ZodBoolean>;
       network: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        inherit: "inherit";
         disabled: "disabled";
+        inherit: "inherit";
       }>>>;
       output_formats: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        json_schema: "json_schema";
-        text: "text";
         json: "json";
+        json_schema: "json_schema";
         jsonl: "jsonl";
+        text: "text";
       }>>>;
       rules: z.ZodOptional<z.ZodBoolean>;
       skills: z.ZodOptional<z.ZodBoolean>;
       tools: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        task: "task";
-        read: "read";
-        list: "list";
-        grep: "grep";
-        glob: "glob";
         bash: "bash";
         edit: "edit";
+        glob: "glob";
+        grep: "grep";
+        list: "list";
+        read: "read";
+        task: "task";
         write: "write";
       }>>>;
     }, z.core.$strict>;
@@ -401,10 +401,10 @@ declare const configSchema: z.ZodObject<{
     host_models: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     model: z.ZodOptional<z.ZodString>;
     reasoning_effort: z.ZodOptional<z.ZodEnum<{
-      none: "none";
+      high: "high";
       low: "low";
       medium: "medium";
-      high: "high";
+      none: "none";
       xhigh: "xhigh";
     }>>;
     type: z.ZodEnum<{
@@ -490,10 +490,10 @@ declare const configSchema: z.ZodObject<{
         models: z.ZodArray<z.ZodString>;
         profile: z.ZodString;
         reasoning_effort: z.ZodOptional<z.ZodEnum<{
-          none: "none";
+          high: "high";
           low: "low";
           medium: "medium";
-          high: "high";
+          none: "none";
           xhigh: "xhigh";
         }>>;
       }, z.core.$strict>>>;
@@ -503,8 +503,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>;
@@ -516,8 +516,8 @@ declare const configSchema: z.ZodObject<{
   skills: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
     path: z.ZodString;
     source_root: z.ZodDefault<z.ZodEnum<{
-      project: "project";
       package: "package";
+      project: "project";
     }>>;
   }, z.core.$strict>>>;
   task_context: z.ZodOptional<z.ZodObject<{

package/dist/install-commands/shared.js

@@ -95,4 +95,4 @@ function commandIdForHost(host, entrypointId) {
 	return entrypointId;
 }
 //#endregion
-export { AGENTS_MD_END, AGENTS_MD_START, CLAUDE_PROJECT_CONFIG_PATH, CLAUDE_USER_CONFIG_PATH, CODEX_CONFIG_PATH, COMMAND_HOSTS, ENTRYPOINT_PATH_PATTERNS, GENERATED_MARKER, GENERATED_TS_MARKER, GENERATED_YAML_MARKER, INSTALL_HOSTS, OPENCODE_PROJECT_CONFIG_PATH, OWNER_MARKER_PREFIX, OWNER_TS_MARKER_PREFIX, OWNER_YAML_MARKER_PREFIX, SINGLE_OPENCODE_PLUGIN_ARRAY_RE, commandIdForHost, compactLines, entrypointDescription, entrypointEntries, instructionsPointer, invocationForHost, profileEntries, resolveHarnessTarget };
+export { AGENTS_MD_END, AGENTS_MD_START, CLAUDE_PROJECT_CONFIG_PATH, CLAUDE_USER_CONFIG_PATH, CODEX_CONFIG_PATH, COMMAND_HOSTS, ENTRYPOINT_PATH_PATTERNS, GENERATED_MARKER, GENERATED_TS_MARKER, GENERATED_YAML_MARKER, INSTALL_HOSTS, OPENCODE_PROJECT_CONFIG_PATH, OWNER_MARKER_PREFIX, OWNER_TS_MARKER_PREFIX, OWNER_YAML_MARKER_PREFIX, SINGLE_OPENCODE_PLUGIN_ARRAY_RE, claudeGlobalConfigDir, codexGlobalConfigDir, commandIdForHost, compactLines, entrypointDescription, entrypointEntries, instructionsPointer, invocationForHost, opencodeGlobalConfigDir, profileEntries, resolveHarnessTarget };

package/dist/install-hooks.js

@@ -24,8 +24,12 @@ const NON_HOOK_OWNED_TARGETS = new Set([".opencode/opencode.json"]);
 function hashContent(content) {
 	return createHash("sha256").update(content).digest("hex");
 }
-const MERGE_MANAGED = { ".claude/settings.json": ["hooks"] };
-function mergeKeyFor(path) {
+const MERGE_MANAGED = { ".claude/settings.json": [
+	["hooks"],
+	["skillListingBudgetFraction"],
+	["skillOverrides"]
+] };
+function mergeKeysFor(path) {
 	return MERGE_MANAGED[path];
 }
 function canonicalize(value) {
@@ -51,8 +55,12 @@ function managedSubtree(text, keyPath) {
 	return cursor;
 }
 function targetIdentityHash(path, content) {
-	const mergeKey = mergeKeyFor(path);
-	return mergeKey ? hashJson(managedSubtree(content.toString("utf8"), mergeKey)) : hashContent(content);
+	const mergeKeys = mergeKeysFor(path);
+	if (!mergeKeys) return hashContent(content);
+	const text = content.toString("utf8");
+	const subtrees = {};
+	for (const keyPath of mergeKeys) subtrees[keyPath.join(".")] = managedSubtree(text, keyPath);
+	return hashJson(subtrees);
 }
 async function cloneHookRepository(targetDir) {
 	await execa("gh", [
@@ -178,9 +186,15 @@ async function writePlannedFile(file) {
 	if (file.action === "conflict" || file.action === "unchanged") return;
 	const target = targetPath(file.path);
 	await mkdir(dirname(target), { recursive: true });
-	const mergeKey = mergeKeyFor(file.path);
-	if (mergeKey && existsSync(target)) {
-		await writeFile(target, ensureTrailingNewline(applyJsonEdit(readFileSync(target, "utf8"), mergeKey, managedSubtree(file.content.toString("utf8"), mergeKey))));
+	const mergeKeys = mergeKeysFor(file.path);
+	if (mergeKeys && existsSync(target)) {
+		const sourceText = file.content.toString("utf8");
+		let merged = readFileSync(target, "utf8");
+		for (const keyPath of mergeKeys) {
+			const desired = managedSubtree(sourceText, keyPath);
+			if (desired !== void 0) merged = applyJsonEdit(merged, keyPath, desired);
+		}
+		await writeFile(target, ensureTrailingNewline(merged));
 		return;
 	}
 	await writeFile(target, file.content);

package/dist/moka-global-config.d.ts

@@ -18,6 +18,10 @@ declare const mokaGlobalConfigSchema: z.ZodObject<{
         secretName: z.ZodString;
         url: z.ZodDefault<z.ZodString>;
       }, z.core.$strict>;
+      dbAuth: z.ZodOptional<z.ZodObject<{
+        secretKey: z.ZodDefault<z.ZodString>;
+        secretName: z.ZodString;
+      }, z.core.$strict>>;
       eventAuthSecretKey: z.ZodString;
       eventAuthSecretName: z.ZodString;
       eventUrl: z.ZodString;

package/dist/moka-global-config.js

@@ -1,3 +1,4 @@
+import { dbAuthOptionSchema } from "./remote/argo/model.js";
 import { brokerAuthOptionSchema } from "./credentials/broker.js";
 import { PipelineConfigError, configIssuesFromZodError, validationError } from "./config/schemas.js";
 import { ConfigIoService, runConfigIoSync } from "./runtime/services/config-io-service.js";
@@ -17,6 +18,7 @@ const mokaDbGlobalConfigSchema = z.object({ url: z.string().url().refine((value)
 }, { message: "db.url must use postgresql or postgres protocol" }) }).strict();
 const mokaSubmitGlobalConfigSchema = z.object({
 	brokerAuth: brokerAuthOptionSchema,
+	dbAuth: dbAuthOptionSchema.optional(),
 	eventAuthSecretKey: z.string().min(1),
 	eventAuthSecretName: z.string().min(1),
 	eventUrl: z.string().url(),

package/dist/moka-submit.d.ts

@@ -40,15 +40,15 @@ declare const mokaSubmitDirectHookSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   module: z.ZodString;
 }, z.core.$strict>], "kind">;
 declare const mokaSubmitDirectHooksSchema: z.ZodRecord<z.ZodEnum<{
-  "workflow.start": "workflow.start";
-  "workflow.success": "workflow.success";
-  "workflow.failure": "workflow.failure";
-  "workflow.complete": "workflow.complete";
-  "node.start": "node.start";
-  "node.success": "node.success";
+  "gate.failure": "gate.failure";
   "node.error": "node.error";
   "node.finish": "node.finish";
-  "gate.failure": "gate.failure";
+  "node.start": "node.start";
+  "node.success": "node.success";
+  "workflow.complete": "workflow.complete";
+  "workflow.failure": "workflow.failure";
+  "workflow.start": "workflow.start";
+  "workflow.success": "workflow.success";
 }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
   failure: z.ZodDefault<z.ZodEnum<{
     fail: "fail";
@@ -142,15 +142,15 @@ declare const mokaSubmitBaseOptionsSchema: z.ZodObject<{
     timeoutMs: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-    "workflow.start": "workflow.start";
-    "workflow.success": "workflow.success";
-    "workflow.failure": "workflow.failure";
-    "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
-    "node.success": "node.success";
+    "gate.failure": "gate.failure";
     "node.error": "node.error";
     "node.finish": "node.finish";
-    "gate.failure": "gate.failure";
+    "node.start": "node.start";
+    "node.success": "node.success";
+    "workflow.complete": "workflow.complete";
+    "workflow.failure": "workflow.failure";
+    "workflow.start": "workflow.start";
+    "workflow.success": "workflow.success";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
       fail: "fail";
@@ -251,15 +251,15 @@ declare const mokaGraphSubmitOptionsSchema: z.ZodObject<{
     timeoutMs: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-    "workflow.start": "workflow.start";
-    "workflow.success": "workflow.success";
-    "workflow.failure": "workflow.failure";
-    "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
-    "node.success": "node.success";
+    "gate.failure": "gate.failure";
     "node.error": "node.error";
     "node.finish": "node.finish";
-    "gate.failure": "gate.failure";
+    "node.start": "node.start";
+    "node.success": "node.success";
+    "workflow.complete": "workflow.complete";
+    "workflow.failure": "workflow.failure";
+    "workflow.start": "workflow.start";
+    "workflow.success": "workflow.success";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
       fail: "fail";
@@ -377,15 +377,15 @@ declare const mokaCommandSubmitOptionsSchema: z.ZodObject<{
     timeoutMs: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-    "workflow.start": "workflow.start";
-    "workflow.success": "workflow.success";
-    "workflow.failure": "workflow.failure";
-    "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
-    "node.success": "node.success";
+    "gate.failure": "gate.failure";
     "node.error": "node.error";
     "node.finish": "node.finish";
-    "gate.failure": "gate.failure";
+    "node.start": "node.start";
+    "node.success": "node.success";
+    "workflow.complete": "workflow.complete";
+    "workflow.failure": "workflow.failure";
+    "workflow.start": "workflow.start";
+    "workflow.success": "workflow.success";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
       fail: "fail";
@@ -498,15 +498,15 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     timeoutMs: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-    "workflow.start": "workflow.start";
-    "workflow.success": "workflow.success";
-    "workflow.failure": "workflow.failure";
-    "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
-    "node.success": "node.success";
+    "gate.failure": "gate.failure";
     "node.error": "node.error";
     "node.finish": "node.finish";
-    "gate.failure": "gate.failure";
+    "node.start": "node.start";
+    "node.success": "node.success";
+    "workflow.complete": "workflow.complete";
+    "workflow.failure": "workflow.failure";
+    "workflow.start": "workflow.start";
+    "workflow.success": "workflow.success";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
       fail: "fail";
@@ -623,15 +623,15 @@ declare const mokaSubmitOptionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     timeoutMs: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strict>>;
   hooks: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-    "workflow.start": "workflow.start";
-    "workflow.success": "workflow.success";
-    "workflow.failure": "workflow.failure";
-    "workflow.complete": "workflow.complete";
-    "node.start": "node.start";
-    "node.success": "node.success";
+    "gate.failure": "gate.failure";
     "node.error": "node.error";
     "node.finish": "node.finish";
-    "gate.failure": "gate.failure";
+    "node.start": "node.start";
+    "node.success": "node.success";
+    "workflow.complete": "workflow.complete";
+    "workflow.failure": "workflow.failure";
+    "workflow.start": "workflow.start";
+    "workflow.success": "workflow.success";
   }> & z.core.$partial, z.ZodDiscriminatedUnion<[z.ZodObject<{
     failure: z.ZodDefault<z.ZodEnum<{
       fail: "fail";

package/dist/pipeline-init.js

@@ -1,8 +1,12 @@
+import { claudeGlobalConfigDir, codexGlobalConfigDir, opencodeGlobalConfigDir } from "./install-commands/shared.js";
 import { AGENT_SKILL_SOURCE } from "./agent-assets.js";
 import { installCommands } from "./install-commands.js";
 import { installHooks } from "./install-hooks.js";
 import { installRules } from "./install-rules.js";
 import { execa } from "execa";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { rm } from "node:fs/promises";
 //#region src/pipeline-init.ts
 const DEFAULT_SKILL_INSTALL_SOURCE = AGENT_SKILL_SOURCE;
 const SKILL_INSTALL_AGENT_ARGS = [
@@ -17,8 +21,47 @@ const SKILL_INSTALL_AGENT_ARGS = [
 	"--yes",
 	"--global"
 ];
+/**
+* Every global location the `skills` CLI writes into for the three agents we
+* manage. The CLI copies each skill's real folder once into the shared master
+* store `~/.agents/skills` and points each agent's global skills dir at it via
+* symlinks, recording install state in `~/.agents/.skill-lock.json` (or
+* `$XDG_STATE_HOME/skills/.skill-lock.json`). Each entry below mirrors that
+* resolution from the skills CLI source (skills `dist/cli.mjs`): per-agent
+* config dirs honor `CLAUDE_CONFIG_DIR` / `CODEX_HOME` /
+* `OPENCODE_CONFIG_DIR`+`XDG_CONFIG_HOME` (reused from install-commands so the
+* test suite's env redirect isolates them), the master store and lock honor
+* the home dir and `XDG_STATE_HOME`.
+*/
+function globalSkillCleanTargets() {
+	const agentsHome = homedir();
+	const skillLockPath = process.env.XDG_STATE_HOME ? join(process.env.XDG_STATE_HOME, "skills", ".skill-lock.json") : join(agentsHome, ".agents", ".skill-lock.json");
+	return [
+		join(claudeGlobalConfigDir(), "skills"),
+		join(codexGlobalConfigDir(), "skills"),
+		join(opencodeGlobalConfigDir(), "skills"),
+		join(agentsHome, ".agents", "skills"),
+		skillLockPath
+	];
+}
+/**
+* Clean-replace step run before the additive `skills add`. `npx skills add`
+* only ever adds, so without this a renamed, removed, or foreign global skill
+* accumulates forever across `moka init` runs. Removing the per-agent symlink
+* farms + shared master store + lock resets global skill state so the post-add
+* set equals exactly the canonical `oisin-ee/agent` source. Safe when absent
+* (rm force); only `skills` subdirs, the master store, and the lock are
+* touched — never a whole host config dir.
+*/
+async function cleanGlobalSkills() {
+	await Promise.all(globalSkillCleanTargets().map((target) => rm(target, {
+		force: true,
+		recursive: true
+	})));
+}
 async function installDefaultSkills(cwd) {
 	try {
+		await cleanGlobalSkills();
 		await execa("npx", [
 			"--yes",
 			"skills",