mirror of
https://github.com/ruvnet/ruflo.git
synced 2026-11-09 14:04:06 +09:00
* fix(codex): correct codex MCP server subcommand + sync package version - mcp-bridge: `@openai/codex mcp serve` → `@openai/codex mcp-server`. `codex mcp` manages *external* MCP servers (list/get/add/remove); `codex mcp-server` is the "start Codex as an MCP server (stdio)" command. `codex mcp serve` errors with "unrecognized subcommand 'serve'", so the `codex` MCP backend never started. Fixed in both ruflo/src/mcp-bridge/index.js and ruflo/src/ruvocal/mcp-bridge/index.js. - @claude-flow/codex: VERSION const was '3.0.0-alpha.8' while package.json is '3.0.0-alpha.9' — `--version`/`info` reported the wrong version. Synced to alpha.9. Verified: `codex mcp serve` → error; `codex mcp-server` is valid. @claude-flow/codex builds clean (tsc), 162 unit tests pass, `claude-flow-codex` CLI (init/validate/doctor/templates/skills/dual) all functional. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): W1 — dual-mode orchestrator spawns real `codex exec` for codex workers Previously `codexCommand` defaulted to `'claude'` ("Both use claude CLI") and every worker — claude or codex — was launched with Claude-CLI flags (`-p`, `--output-format text`, `--max-turns`), so "dual-mode" was two Claude instances. Now: - `codexCommand` defaults to `'codex'` - `executeHeadless` builds platform-specific args: - claude: `-p <prompt> --output-format text [--max-turns N] [--model M]` - codex: `exec --sandbox workspace-write --skip-git-repo-check [-m M] <prompt>` (PROMPT is positional -> last; `codex exec` runs autonomously) Remaining in W1 (next iterations): update `.claude/agents/dual-mode/ codex-worker.md` + `codex-coordinator.md` to invoke `codex exec` instead of `claude -p`; add mocked-spawn smoke test (W4). Tracked: #1909. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): W1 (cont.) — dual-mode agent defs invoke `codex exec`, not `claude -p` codex-worker.md / codex-coordinator.md described "headless Codex workers" but every spawn example was `claude -p "..." --session-id X` with Claude-only flags (--max-budget-usd, --allowedTools, --output-format). Updated to match the W1 orchestrator change: - spawn syntax → `codex exec --sandbox <workspace-write|read-only> --skip-git-repo-check "<prompt>" &` - dropped Claude-only flags; note that mixed-platform runs still use `claude -p` for Claude workers - swarm/memory CLI refs `claude-flow@v3alpha` → `ruflo@latest` - MCP tool refs `mcp__claude-flow__*` / `mcp__ruv-swarm__*` → `mcp__ruflo__*` W1 now complete (orchestrator + agent defs). dual-orchestrator.md left as-is — it correctly documents the mixed Claude+Codex split. Smoke test is W4. Tracked: #1909. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): W2 — `dual run --worker "<platform>:<role>:<prompt>"` + positional template `dual run` only accepted `--template <name>` / `--config <path>`, so the custom-worker syntax documented in CLAUDE.md (`dual run --worker "claude:architect:..." --worker "codex:coder:..."`) didn't exist, and `dual run feature` (positional) silently fell through to "specify --template". Now: - `dual run [template]` — positional alias for `--template` - `-w, --worker "<platform>:<role>:<prompt>"` (repeatable; platform = claude|codex; prompt may contain `:` — split on first two only). Workers chain sequentially (each `dependsOn` the previous) unless `--parallel-workers`. Unique ids derived from role. - `parseWorkerSpecs()` exported for testing; clear errors on malformed specs / bad platform. - improved no-args usage text. build clean (tsc), 162 tests pass. Tracked: #1909 (W2). Tests for parseWorkerSpecs land in W4. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): W3 — standardize CLI ref claude-flow@alpha -> ruflo; fix MCP-server registration The dual-mode orchestrator/CLI shelled out to `npx claude-flow@alpha memory ...`, `claude-flow-codex init` registered the MCP server as `codex mcp add claude-flow -- npx claude-flow mcp start`, and the config.toml / migration generators emitted `[mcp_servers.claude-flow]` with `args = ["-y", "@claude-flow/cli@latest"]` — the wrong package, an inner-package name, and (in config-toml) **missing the `mcp start` subcommand** so the server never actually started. - dual-mode/{orchestrator,cli}.ts: `claude-flow@alpha` -> `ruflo@alpha` - initializer.ts: `codex mcp add claude-flow -- npx claude-flow mcp start` -> `codex mcp add ruflo -- npx ruflo mcp start`; "MCP server (ruflo) registered"; `npx @claude-flow/cli mcp start` -> `npx ruflo mcp start` - generators/config-toml.ts: default server `name: 'ruflo'`, `args: ['-y', 'ruflo@latest', 'mcp', 'start']` (adds the missing subcommand); `[mcp_servers.ruflo]` in all examples; the already-configured check accepts both `ruflo` and legacy `claude-flow` - generators/{agents-md,skill-md}.ts: `npx @claude-flow/cli ...` -> `npx ruflo ...` - migrations/index.ts: default emitted server -> `[mcp_servers.ruflo]` / `args = ["-y", "ruflo@latest", "mcp", "start"]` (user-provided servers pass through unchanged) - validators/index.ts: suggestion text -> `[mcp_servers.ruflo]` - tests: updated generator/migration assertions to the new output `npx vitest run` 162/162 pass. Note: `npm run build` (tsc) currently fails on an UNRELATED uncommitted WIP file `src/loop/index.ts` (exactOptionalPropertyTypes on prompt/command) — not from this change; my files compile clean. Branding-only refs (config-toml header, repo URLs in generated docs, remaining `@claude-flow/cli` in skill-md examples) deferred to W7. Tracked: #1909 (W3). Co-Authored-By: RuFlo <ruv@ruv.net> * test(codex): W4 — dual-mode tests (parseWorkerSpecs, templates, orchestrator leveling, `dual` wiring) New tests/dual-mode.test.ts (18 tests, no real workers spawned): - parseWorkerSpecs: single spec, sequential chaining, --parallel-workers, colons-in-prompt, id dedup, whitespace trim, and the 3 error paths (too-few-colons / empty-prompt / unknown-platform) - CollaborationTemplates: feature/security/refactor pipelines — ids, platforms, dependsOn chains, task interpolation - `dual` command wiring: run/templates/status subcommands; `run` exposes --worker / --parallel-workers / --template and a positional [template] - DualModeOrchestrator: safe defaults (codexCommand === 'codex'), buildDependencyLevels for linear / fan-in / circular cases Full suite: 184/184 pass (162 prior + 18 new + 4 loop). `npm run build` still blocked on the unrelated uncommitted `src/loop/index.ts`. Deferred: a full `CodexInitializer.initialize()` integration test (it shells out `codex mcp add`, which would touch the user's real codex config — needs a mock first). Tracked: #1909 (W4). Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): W5 — generated SKILL.md frontmatter gets version/author/tags `claude-flow-codex init` / `generate-skill` produced SKILL.md files with only `name` + `description`, so `claude-flow-codex validate` flagged 3 "Consider adding field: version/author/tags" warnings per skill. - SkillMdOptions: optional `version` ("1.0.0"), `author` ("rUv"), `tags` (defaults to the skill name split on `-`) - generateSkillMd emits `version: "..."`, `author: ...`, `tags: [...]` in the frontmatter; built-in skills (via generateBuiltInSkill) inherit the defaults automatically Verified: a generated built-in skill validates with 0 warnings (was 3); a bare `generate-skill` stub now has 1 warning ("No examples provided", expected for a skill with no commands — out of scope here). `init → validate → doctor` clean on the local build. `npm run build` + 184/184 tests pass. (The ~150 repo `.agents/skills/*/SKILL.md` are generated by @claude-flow/cli, not this generator — out of scope.) Tracked: #1909 (W5). Co-Authored-By: RuFlo <ruv@ruv.net> * ci(codex): W6 — codex-integration-audit guard + workflow `scripts/audit-codex-integration.mjs` — pure-Node static checks for the Codex ↔ Ruflo invariants (issue #1909), exits non-zero on any failure: - `codex` MCP backend uses `mcp-server` (not the invalid `mcp serve`) in both ruflo/src/mcp-bridge and ruvocal/mcp-bridge - @claude-flow/codex VERSION const === its package.json version - dual-mode orchestrator: `codexCommand` defaults to 'codex', codex workers spawn `codex exec --sandbox …`, no 'claude' fallback - dual-mode agent defs reference `codex exec`, no legacy `claude -p … --session-id` worker pattern - no `claude-flow@alpha` / `@claude-flow/cli@latest` left in codex src - `dual run` exposes `--worker <spec>` + positional `[template]`, `parseWorkerSpecs` exported - generateSkillMd emits version/author/tags frontmatter - config.toml generator default MCP server = `ruflo` w/ `mcp start` `.github/workflows/codex-integration-audit.yml` runs it on PRs / pushes touching the codex package, mcp-bridge, dual-mode agents, or the script. No `npm install` needed — build + tests stay in the main CI. Audit passes on current branch. `npm run build` + 184/184 tests pass. Tracked: #1909 (W6). Co-Authored-By: RuFlo <ruv@ruv.net> * feat(codex): claude-flow-codex loop runner — Codex-native /loop equivalent Codex doesn't expose Claude Code's ScheduleWakeup, so this is a process-based runner with the same behaviour: - `loop run [prompt]` — repeated `codex exec` runs (or a custom `--command`), bounded by `--max-iterations`/`--interval`, with `--dry-run`, model/sandbox options, and a completion-marker-file contract - `loop status [--name <name>]` / `loop stop [--name <name>]` - state persisted to `.codex/loop/<name>.json`; stop-file aware - wired into the CLI (`src/cli.ts`), exported (`src/index.ts`), with a `./loop` package export and README docs (Implemented by rUv; landing it here so it isn't sitting dirty in the worktree while the #1909 loop commits around it. `npm run build` + 184/184 tests pass; `git diff --check` clean.) Co-Authored-By: RuFlo <ruv@ruv.net> * chore(codex): W7 — package.json hygiene + repo URLs ruvnet/claude-flow -> ruvnet/ruflo - package.json: drop dead `"templates"` from `files` (no templates/ dir at the package root — templates compile to dist/templates/); repository / homepage / bugs URLs -> ruvnet/ruflo; description -> "Ruflo (claude-flow)" - src/index.ts: PACKAGE_INFO.repository -> ruvnet/ruflo - src/initializer.ts, generators/{agents-md,config-toml}.ts: generated AGENTS.md / config.toml doc URLs -> ruvnet/ruflo (+ "Ruflo:" label) - README.md: badge + footer URLs -> ruvnet/ruflo - tests: assertion for the config.toml Documentation line `npm run build` + 184/184 tests pass; codex-integration audit passes. (Committed `.agents/AGENTS.md` / `.agents/config.toml` in the repo still carry old URLs — generated artifacts; the generators are now fixed so re-init produces ruvnet/ruflo. The published `claude-flow-codex` package name stays as-is.) Tracked: #1909 (W7). Co-Authored-By: RuFlo <ruv@ruv.net> --------- Co-authored-by: Reuven <cohen@ruv-mac-mini.local>
117 lines
6.5 KiB
JavaScript
Executable File
117 lines
6.5 KiB
JavaScript
Executable File
#!/usr/bin/env node
|
|
/**
|
|
* Codex ↔ Ruflo integration audit (issue #1909).
|
|
*
|
|
* Static invariants that must hold for the OpenAI Codex integration to work.
|
|
* Build + unit tests are covered by the main CI; this guards the
|
|
* integration-specific contracts that a regular test run won't catch.
|
|
*
|
|
* Usage: node scripts/audit-codex-integration.mjs
|
|
* Exits non-zero on any failure.
|
|
*/
|
|
import { readFileSync, existsSync, readdirSync, statSync } from 'node:fs';
|
|
import { resolve, dirname, relative } from 'node:path';
|
|
import { fileURLToPath } from 'node:url';
|
|
|
|
const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
|
|
const read = (p) => readFileSync(resolve(ROOT, p), 'utf8');
|
|
const rel = (p) => relative(ROOT, p);
|
|
|
|
let failures = 0;
|
|
const C = { g: '\x1b[32m', r: '\x1b[31m', dim: '\x1b[2m', x: '\x1b[0m' };
|
|
const ok = (m) => console.log(` ${C.g}✓${C.x} ${m}`);
|
|
const fail = (m) => { console.log(` ${C.r}✗${C.x} ${m}`); failures++; };
|
|
const check = (cond, passMsg, failMsg) => (cond ? ok(passMsg) : fail(failMsg ?? passMsg));
|
|
const section = (t) => console.log(`\n${t}`);
|
|
|
|
console.log('Codex ↔ Ruflo integration audit (#1909)\n' + '─'.repeat(48));
|
|
|
|
// ── 1. Codex MCP backend uses the real `mcp-server` subcommand ──────────────
|
|
section('MCP backend registration (`codex` group):');
|
|
for (const p of ['ruflo/src/mcp-bridge/index.js', 'ruflo/src/ruvocal/mcp-bridge/index.js']) {
|
|
if (!existsSync(resolve(ROOT, p))) { fail(`${p}: file missing`); continue; }
|
|
const src = read(p);
|
|
const codexLine = (src.match(/.*@openai\/codex.*/g) ?? [])[0]?.trim() ?? '(no @openai/codex entry)';
|
|
check(/@openai\/codex"\s*,\s*"mcp-server"/.test(src),
|
|
`${p}: codex backend uses "mcp-server"`,
|
|
`${p}: codex backend must use "mcp-server" — found: ${codexLine}`);
|
|
check(!/@openai\/codex"\s*,\s*"mcp"\s*,\s*"serve"/.test(src),
|
|
`${p}: no invalid "mcp serve" subcommand`,
|
|
`${p}: still uses "mcp serve" (not a valid \`codex\` subcommand) — ${codexLine}`);
|
|
}
|
|
|
|
// ── 2. @claude-flow/codex VERSION const tracks package.json ─────────────────
|
|
section('@claude-flow/codex version sync:');
|
|
const cfPkg = JSON.parse(read('v3/@claude-flow/codex/package.json'));
|
|
const versionMatch = read('v3/@claude-flow/codex/src/index.ts').match(/export const VERSION\s*=\s*'([^']+)'/);
|
|
check(versionMatch && versionMatch[1] === cfPkg.version,
|
|
`VERSION const === package.json version ("${cfPkg.version}")`,
|
|
`VERSION const (${versionMatch ? `"${versionMatch[1]}"` : 'not found'}) != package.json ("${cfPkg.version}")`);
|
|
|
|
// ── 3. Dual-mode orchestrator drives a real `codex exec` for codex workers ──
|
|
section('Dual-mode orchestrator:');
|
|
const orch = read('v3/@claude-flow/codex/src/dual-mode/orchestrator.ts');
|
|
check(/codexCommand:\s*config\.codexCommand\s*\?\?\s*'codex'/.test(orch),
|
|
`codexCommand defaults to 'codex'`,
|
|
`codexCommand must default to 'codex' (it was 'claude' — "Both use claude CLI")`);
|
|
check(!/codexCommand:\s*config\.codexCommand\s*\?\?\s*'claude'/.test(orch),
|
|
`codexCommand no longer falls back to 'claude'`);
|
|
check(/\['exec',\s*'--sandbox'/.test(orch),
|
|
`codex workers spawn \`codex exec --sandbox …\``,
|
|
`codex worker branch must build \`['exec', '--sandbox', …]\` args`);
|
|
|
|
// ── 4. Dual-mode agent defs invoke `codex exec`, not `claude -p` ────────────
|
|
section('Dual-mode agent definitions:');
|
|
for (const p of ['.claude/agents/dual-mode/codex-worker.md', '.claude/agents/dual-mode/codex-coordinator.md']) {
|
|
if (!existsSync(resolve(ROOT, p))) { fail(`${p}: file missing`); continue; }
|
|
const src = read(p);
|
|
check(/codex exec /.test(src), `${p}: references \`codex exec\``);
|
|
// The legacy worker examples all used `claude -p "<task>" --session-id <id>`.
|
|
// (A generic `claude -p "<prompt>"` mention in the mixed-platform note is fine.)
|
|
check(!/--session-id/.test(src) && !/(via|using) `claude -p`/.test(src),
|
|
`${p}: no legacy \`claude -p … --session-id\` worker spawns`,
|
|
`${p}: still uses the legacy \`claude -p\` worker pattern (should be \`codex exec\`)`);
|
|
}
|
|
|
|
// ── 5. No stale claude-flow CLI refs left in the codex package source ───────
|
|
section('CLI references standardized to ruflo:');
|
|
const walk = (dir) => readdirSync(dir).flatMap((e) => {
|
|
const f = resolve(dir, e);
|
|
return statSync(f).isDirectory() ? walk(f) : [f];
|
|
});
|
|
const stale = walk(resolve(ROOT, 'v3/@claude-flow/codex/src'))
|
|
.filter((f) => f.endsWith('.ts'))
|
|
.filter((f) => /claude-flow@alpha|@claude-flow\/cli@latest/.test(readFileSync(f, 'utf8')))
|
|
.map(rel);
|
|
check(stale.length === 0,
|
|
`no \`claude-flow@alpha\` / \`@claude-flow/cli@latest\` in codex src`,
|
|
`stale CLI refs remain in: ${stale.join(', ')}`);
|
|
|
|
// ── 6. `dual run` CLI surface (W2) ─────────────────────────────────────────
|
|
section('`dual run` CLI surface:');
|
|
const dualCli = read('v3/@claude-flow/codex/src/dual-mode/cli.ts');
|
|
check(/'-w, --worker <spec>'/.test(dualCli), `\`dual run\` exposes \`--worker <spec>\``);
|
|
check(/\.argument\('\[template\]'/.test(dualCli), `\`dual run\` accepts positional \`[template]\``);
|
|
check(/export function parseWorkerSpecs/.test(dualCli), `\`parseWorkerSpecs\` exported (so it's unit-testable)`);
|
|
|
|
// ── 7. Generated SKILL.md frontmatter (W5) ─────────────────────────────────
|
|
section('SKILL.md generator frontmatter:');
|
|
const skillGen = read('v3/@claude-flow/codex/src/generators/skill-md.ts');
|
|
check(/version: "\$\{version\}"/.test(skillGen) && /author: \$\{author\}/.test(skillGen) && /tags: \[\$\{tagList/.test(skillGen),
|
|
`generateSkillMd emits version/author/tags frontmatter`,
|
|
`generateSkillMd must emit version/author/tags so generated skills validate clean`);
|
|
|
|
// ── 8. config.toml generator emits a working `ruflo` MCP server ────────────
|
|
section('config.toml generator MCP default:');
|
|
const cfgGen = read('v3/@claude-flow/codex/src/generators/config-toml.ts');
|
|
check(/name:\s*'ruflo'/.test(cfgGen) && /args:\s*\['-y',\s*'ruflo@latest',\s*'mcp',\s*'start'\]/.test(cfgGen),
|
|
`default MCP server is \`ruflo\` with \`mcp start\` subcommand`,
|
|
`default MCP server must be \`{ name: 'ruflo', args: ['-y','ruflo@latest','mcp','start'] }\` (was \`claude-flow\` w/o \`mcp start\`)`);
|
|
|
|
console.log('\n' + '─'.repeat(48));
|
|
if (failures > 0) {
|
|
console.error(`${C.r}${failures} check(s) failed${C.x}`);
|
|
process.exit(1);
|
|
}
|
|
console.log(`${C.g}All codex-integration checks passed${C.x}`);
|