@really-knows-ai/foundry 3.3.7 → 3.3.9

package/dist/.opencode/plugins/foundry-tools/orchestrate-tool.js

@@ -110,10 +110,11 @@ export function createOrchestrateTool({ tool, pending }) {
           error: tool.schema.string().optional(),
         }).optional(),
         cycleDef: tool.schema.string().optional().describe('Test-mode cycle definition override (path to cycle file)'),
+        defaultModel: tool.schema.string().optional().describe('Fallback model for stages with no explicit model in the cycle definition (e.g. "opencode-go/deepseek-v4-flash")'),
       },
 
       async execute(args, context) {
-        const { runOrchestrate } = await import('../../scripts/orchestrate.js');
+        const { runOrchestrate } = await import('../../../scripts/orchestrate.js');
         const io = makeIO(context.worktree);
         const cwd = context.worktree;
         const secret = readOrCreateSecret(context.worktree);
@@ -145,6 +146,7 @@ export function createOrchestrateTool({ tool, pending }) {
             cwd, cycleDef: args.cycleDef, git, mint, finalize,
             now: () => Date.now(),
             lastResult: args.lastResult ?? null,
+            defaultModel: args.defaultModel,
           }, io);
 
           await injectDispatchPromptExtras(result, cwd);

package/dist/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [3.3.9] - 2026-05-19
+
+### Fixed
+
+- **Stage model fallback.** When a cycle's `models:` map omits a stage (e.g.,
+  `quench`), the orchestrator now falls back to the caller's `defaultModel`,
+  then `models.default`, then any available model in the map, instead of
+  failing with a hard violation. `foundry_orchestrate` accepts an optional
+  `defaultModel` arg for this purpose.
+- **No-models-map fallback.** When the cycle has no `models:` block at all but
+  `defaultModel` is provided, the orchestrator uses it — previously returned
+  a violation.
+
+## [3.3.8] - 2026-05-19
+
+### Fixed
+
+- **Build script now rewrites dynamic `import()` paths.** The `rewriteImports`
+  function only handled static `from '...'` imports, missing `await import()`
+  calls in `orchestrate-tool.js`. Added a second regex pass for dynamic imports.
+- **New packaging test** verifies every relative import in `dist/` resolves.
+- **add-flow now offers next steps after building.** After creating a flow on a
+  `config/*` branch, the skill presents dry-run / merge / leave options instead
+  of telling the LLM to auto-merge.
+
 ## [3.3.7] - 2026-05-18
 
 ### Fixed

package/dist/scripts/orchestrate.js

@@ -87,6 +87,7 @@ function buildSortArgs(args, now) {
     mint: args.mint,
     now: typeof now === 'function' ? now() : now,
     ulid: args.ulid ?? defaultUlid,
+    defaultModel: args.defaultModel,
   };
 }
 

package/dist/scripts/sort.js

@@ -147,10 +147,26 @@ function resolveRoute(ctx) {
   return determineRoute(ctx.stages, ctx.history, ctx.feedback, ctx.maxIterations);
 }
 
-function resolveModel(route, frontmatter, agentsDir, io) {
-  const routeBase = baseStage(route);
-  if (!frontmatter.models || !frontmatter.models[routeBase]) return null;
-  const modelId = frontmatter.models[routeBase];
+function firstModelValue(models) {
+  if (!models) return undefined;
+  const keys = Object.keys(models);
+  return keys.length > 0 ? models[keys[0]] : undefined;
+}
+
+function resolveModelId(routeBase, models, defaultModel) {
+  return models[routeBase] || defaultModel || models.default || firstModelValue(models);
+}
+
+function pickModelId(route, frontmatter, defaultModel) {
+  const models = frontmatter.models;
+  if (!models) return defaultModel || null;
+  return resolveModelId(baseStage(route), models, defaultModel) || null;
+}
+
+function resolveModel(route, frontmatter, agentsDir, io, defaultModel) {
+  const modelId = pickModelId(route, frontmatter, defaultModel);
+  if (!modelId) return null;
+
   const model = `foundry-${modelId.replace(/[/.]/g, '-')}`;
   const agentPath = `${agentsDir}/${model}.md`;
   if (!io.exists(agentPath)) {
@@ -162,8 +178,8 @@ function resolveModel(route, frontmatter, agentsDir, io) {
   return model;
 }
 
-function checkModel(route, frontmatter, agentsDir, io) {
-  const modelResult = resolveModel(route, frontmatter, agentsDir, io);
+function checkModel(route, frontmatter, agentsDir, io, defaultModel) {
+  const modelResult = resolveModel(route, frontmatter, agentsDir, io, defaultModel);
   if (modelResult && modelResult.error) return { error: modelResult.error };
   return { model: typeof modelResult === 'string' ? modelResult : null };
 }
@@ -217,6 +233,7 @@ const RUN_SORT_DEFAULTS = Object.freeze({
   historyPath: 'WORK.history.yaml',
   foundryDir: 'foundry',
   cycleDef: undefined,
+  defaultModel: undefined,
   agentsDir: '.opencode/agents',
   mint: undefined,
 });
@@ -246,7 +263,7 @@ export function runSort(args = {}, io = defaultIO) {
   if (prep.kind !== 'ok') return { route: prep.kind, details: prep.details };
 
   const route = resolveRoute(buildRouteCtx(prep));
-  const modelCheck = checkModel(route, prep.frontmatter, opts.agentsDir, io);
+  const modelCheck = checkModel(route, prep.frontmatter, opts.agentsDir, io, opts.defaultModel);
   if (modelCheck.error) return { route: 'violation', details: modelCheck.error };
 
   return mintToken({

package/dist/skills/add-flow/SKILL.md

@@ -145,7 +145,17 @@ After all dependencies are built, create the flow itself:
 
    If the tool returns `{ ok: false, errors }` because the target file already exists, read the existing flow file, incorporate the user's requested changes into the current body, propose the merged result for review, then write and commit the updated file.
 
-3. **Report**: Show the user the flow file and the commit hash. Also summarise each dependency that was created, with its commit hash. Tell the user they can now ask the Foundry agent to run the flow.
+3. **Report and offer next steps**: Show the user the flow file and the commit hash. Summarise each dependency that was created, with its commit hash. Then present these options:
+
+> The flow is built on the `config/*` branch. Before merging to main, you can:
+>
+> 1. **Dry-run the flow** — test it safely from the config branch without touching main. I'll run a dry-run: `dry-run/haiku-flow/01`.
+> 2. **Merge to main** — commit the configuration and make the flow available for normal runs.
+> 3. **Leave it on this branch** — you can review the configuration or come back later.
+>
+> Which would you like?
+
+Do NOT automatically merge or call `foundry_git_finish` unless the user explicitly asks for it.
 
 ## Safety Rules
 
@@ -153,3 +163,4 @@ After all dependencies are built, create the flow itself:
 - Do not skip dependency validation.
 - Do not expose internal tool-call syntax to the user.
 - Do not continue when a branch or worktree state could overwrite user changes.
+- Do not merge or call `foundry_git_finish` unless the user explicitly asks — always offer to dry-run first.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@really-knows-ai/foundry",
-  "version": "3.3.7",
+  "version": "3.3.9",
   "description": "A skill-driven framework for governed artefact generation with AI coding tools. Define your own artefact types, laws, and flows — Foundry handles the forge → quench → appraise pipeline with deterministic routing, quality gates, and iterative refinement.",
   "type": "module",
   "main": "dist/.opencode/plugins/foundry.js",