model-orchestrator 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project are documented here. The format follows [Kee
 
 ## [Unreleased]
 
+## [0.1.6] - 2026-09-05
+
+Issues #16 to #19, filed against 0.1.5. Each reproduced before the fix; each fix has a test.
+
+### Added
+
+- `--dry-run` as an alias for `--dry`; the package script was already named `dry-run` (#16).
+- `cli-run`: `killTree()` ends a lane's process tree with `taskkill /T /F` on Windows instead of killing only the root process. Windows is still not exercised by CI and stays documented as unsupported; the branch is unit-tested by argv capture (#18).
+
+### Fixed
+
+- `cli-run --expect-json` accepts a response that is exactly one markdown code fence around JSON (`\`\`\`json ... \`\`\``, CRLF included). Prose before or after the fence still fails the contract, because then the deliverable is not the JSON (#17).
+- `--yes` with several candidate agents and no `--primary` now prefers claude-code, then the first agent that can load subagent definitions, then the first listed. `--ais codex,agy` used to pick codex and write no subagents (#19).
+
 ## [0.1.5] - 2026-09-05
 
 First release published by the workflow, with provenance.
@@ -97,7 +111,8 @@ First release.
 - Tests: a case per fix, judges proven to go red, mutation checks; `npm test` prints the current count.
 - Adversarial audit: two Codex rounds plus a two-engine review (Codex, Antigravity); findings and fixes in `docs/audit-brief.md`. After the review: subagents go to the project root (`--project`), snippet paths computed from `--dir`, lane sections rendered from the selection, a primary agent required, level 3 asks for API keys separately from CLIs, images and CLI installs pinned, an activation summary at the end of every install.
 
-[Unreleased]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.6...HEAD
+[0.1.6]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/aunysillyme/model-orchestrator/compare/v0.1.2...v0.1.3

package/README.md

@@ -10,7 +10,7 @@ Built from a working system, not a diagram: the routing rules, the protocols and
 npx model-orchestrator
 ```
 
-That runs the latest published release from the npm registry. To run a specific release or the current main straight from GitHub: `npx github:aunysillyme/model-orchestrator#v0.1.5` (drop `#v0.1.5` for main).
+That runs the latest published release from the npm registry. To run a specific release or the current main straight from GitHub: `npx github:aunysillyme/model-orchestrator#v0.1.6` (drop `#v0.1.6` for main).
 
 The installer asks a few things, then writes a folder:
 
@@ -120,7 +120,7 @@ If you need a property in the third row to be enforced, that is a router, a poli
 
 ## Requirements
 
-Node 18 or newer. No dependencies. Works on macOS and Linux; the level 3 box templates assume Ubuntu.
+Node 18 or newer. No dependencies. Works on macOS and Linux; the level 3 box templates assume Ubuntu. Windows is untested: `cli-run` ends a lane's process tree there with `taskkill`, but nothing in CI runs on Windows, so treat it as unsupported until someone reports otherwise.
 
 **Privacy.** The installer makes no network call of its own and sends no telemetry; the only network activity is the `npm install -g` you approve per package. `cli-run` talks to nothing but the vendor CLI you name.
 

package/bin/cli-run.mjs

@@ -244,6 +244,27 @@ export function judge(lane, rc, out, err, outFile) {
 // an agent CLI that shelled out to a tool must not keep working after the
 // wrapper has reported 12. A child that calls setsid() itself escapes this
 // boundary; that is documented, not hidden.
+// Models often wrap JSON in one markdown fence. --expect-json accepts exactly that shape:
+// the whole trimmed response is one fenced block, optionally tagged json. Prose before or
+// after the fence still fails, because then the deliverable is not the JSON (#17).
+export function unfence(text) {
+  const t = String(text).trim();
+  const m = /^```(?:json|JSON)?[ \t]*\r?\n([\s\S]*?)\r?\n?```$/.exec(t);
+  return m ? m[1].trim() : t;
+}
+
+// Kill a lane and everything it spawned. POSIX: the detached process group.
+// Windows has no process groups a signal can reach, so taskkill walks the tree (#18).
+// Windows is not exercised by CI; this branch is unit-tested by argv capture only.
+export function killTree(pid, platform = process.platform, deps = { kill: (p, sig) => process.kill(p, sig), spawn }) {
+  if (platform === 'win32') {
+    deps.spawn('taskkill', ['/pid', String(pid), '/T', '/F'], { stdio: 'ignore', windowsHide: true });
+    return 'taskkill';
+  }
+  deps.kill(-pid, 'SIGKILL');
+  return 'group';
+}
+
 export function runBounded(argv, timeoutSec, maxBuffer = 16 * 1024 * 1024) {
   return new Promise((resolveRun) => {
     const t0 = Date.now();
@@ -257,8 +278,7 @@ export function runBounded(argv, timeoutSec, maxBuffer = 16 * 1024 * 1024) {
     const killGroup = () => {
       if (!child) return;
       try {
-        if (process.platform !== 'win32') process.kill(-child.pid, 'SIGKILL');
-        else child.kill('SIGKILL');
+        killTree(child.pid);
       } catch {
         try {
           child.kill('SIGKILL');
@@ -452,9 +472,9 @@ export function checkContracts(opts, text, before) {
   }
   if (opts.expectJson) {
     try {
-      JSON.parse(text);
+      JSON.parse(unfence(text));
     } catch {
-      return '--expect-json: the response is not valid JSON';
+      return '--expect-json: the response is not valid JSON (a single ```json fence around the whole response is accepted; prose around it is not)';
     }
   }
   return null;

package/bin/cli.js

@@ -17,7 +17,7 @@ import { planFiles, writeFiles, resolveSelection, resolveTools, resolveApis, dir
 // turn a dry run into a real one.
 const SPEC = {
   level: 'value', ais: 'value', primary: 'value', dir: 'value', project: 'value', tools: 'value', apis: 'value',
-  yes: 'bool', force: 'bool', dry: 'bool', 'no-install': 'bool', 'no-tools': 'bool', 'no-apis': 'bool', 'upgrade-runtime': 'bool', 'update-docs': 'bool', list: 'bool', help: 'bool', h: 'bool'
+  yes: 'bool', force: 'bool', dry: 'bool', 'dry-run': 'bool', 'no-install': 'bool', 'no-tools': 'bool', 'no-apis': 'bool', 'upgrade-runtime': 'bool', 'update-docs': 'bool', list: 'bool', help: 'bool', h: 'bool'
 };
 export function parseArgs(argv) {
   const out = {};
@@ -93,7 +93,7 @@ Flags
   --update-docs      regenerate the documents a previous run wrote and nobody edited since (hash-checked against
                      MANIFEST.json), so a changed selection reaches ROUTING.md and friends; edited documents are kept
                      and reported, and nothing happens without a manifest
-  --dry              print the plan, write nothing
+  --dry, --dry-run   print the plan, write nothing
   --no-install       never offer to run npm installs
   --list             print the catalog
 `);
@@ -178,7 +178,10 @@ async function main() {
   } else if (candidates.length === 0) {
     bad('pick at least one agent or chat app to be the orchestrator; a local model runtime on its own cannot run the system');
   } else if (candidates.length > 1) {
-    if (yes) primary = candidates.find((a) => a.id === 'claude-code') || candidates[0];
+    // --yes picks for the user: claude-code if present, else the first agent that can load subagent
+    // definitions (it gets five files written for it), else the first candidate. #19: codex listed
+    // before agy used to win and nothing was written to the project root.
+    if (yes) primary = candidates.find((a) => a.id === 'claude-code') || candidates.find((a) => a.agentsDir) || candidates[0];
     else {
       console.log('\nWhich one is your primary agent (the one that runs the system)?');
       candidates.forEach((a, i) => console.log(`  ${i + 1}  ${a.name}`));
@@ -250,7 +253,7 @@ async function main() {
   const lvl = LEVELS.find((l) => l.id === level);
   const agentFiles = files.filter((f) => f.root === 'project');
   console.log(`\nPlan\n  level    ${lvl.id} ${lvl.name}\n  access   ${selected.map((a) => a.id).join(', ')}\n  primary  ${primary ? primary.id : 'none'}\n  tools    ${tools.map((t) => t.id).join(', ') || 'none'}` + (level >= 3 ? `\n  api keys ${apis.map((p) => p.id).join(', ') || 'none'}` : '') + `\n  folder   ${dir}\n  project  ${project}${agentFiles.length ? ' (' + agentFiles.length + ' subagent files go here)' : ''}\n  files    ${files.length}`);
-  if (flag('dry')) {
+  if (flag('dry') || flag('dry-run')) {
     for (const f of files) console.log('  - ' + (f.root === 'project' ? '[project] ' : '') + f.rel);
     console.log('\n--dry: nothing written.');
     rl && rl.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "model-orchestrator",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A model orchestrator you can npm run: route every task to the cheapest AI that does it well, across one agent, many CLIs, or a whole virtual machine. Three levels, one installer that asks what you have access to.",
   "type": "module",
   "bin": {