Compare commits
3 Commits
feat/mosai
...
006b7352c7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
006b7352c7 | ||
| 7b4f1d249d | |||
| 5425f9268e |
@@ -26,7 +26,8 @@
|
|||||||
"test": "vitest run --passWithNoTests"
|
"test": "vitest run --passWithNoTests"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mosaicstack/macp": "workspace:*"
|
"@mosaicstack/macp": "workspace:*",
|
||||||
|
"commander": "^13.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^22.0.0",
|
||||||
|
|||||||
57
packages/forge/src/cli.spec.ts
Normal file
57
packages/forge/src/cli.spec.ts
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
import { Command } from 'commander';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { registerForgeCommand } from './cli.js';
|
||||||
|
|
||||||
|
describe('registerForgeCommand', () => {
|
||||||
|
it('registers a "forge" command on the parent program', () => {
|
||||||
|
const program = new Command();
|
||||||
|
registerForgeCommand(program);
|
||||||
|
|
||||||
|
const forgeCmd = program.commands.find((c) => c.name() === 'forge');
|
||||||
|
expect(forgeCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers the four required subcommands under forge', () => {
|
||||||
|
const program = new Command();
|
||||||
|
registerForgeCommand(program);
|
||||||
|
|
||||||
|
const forgeCmd = program.commands.find((c) => c.name() === 'forge');
|
||||||
|
expect(forgeCmd).toBeDefined();
|
||||||
|
|
||||||
|
const subNames = forgeCmd!.commands.map((c) => c.name());
|
||||||
|
|
||||||
|
expect(subNames).toContain('run');
|
||||||
|
expect(subNames).toContain('status');
|
||||||
|
expect(subNames).toContain('resume');
|
||||||
|
expect(subNames).toContain('personas');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "personas list" as a subcommand of "forge personas"', () => {
|
||||||
|
const program = new Command();
|
||||||
|
registerForgeCommand(program);
|
||||||
|
|
||||||
|
const forgeCmd = program.commands.find((c) => c.name() === 'forge');
|
||||||
|
const personasCmd = forgeCmd!.commands.find((c) => c.name() === 'personas');
|
||||||
|
expect(personasCmd).toBeDefined();
|
||||||
|
|
||||||
|
const personasSubNames = personasCmd!.commands.map((c) => c.name());
|
||||||
|
expect(personasSubNames).toContain('list');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not modify the parent program name or description', () => {
|
||||||
|
const program = new Command('mosaic');
|
||||||
|
program.description('Mosaic Stack CLI');
|
||||||
|
registerForgeCommand(program);
|
||||||
|
|
||||||
|
expect(program.name()).toBe('mosaic');
|
||||||
|
expect(program.description()).toBe('Mosaic Stack CLI');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('can be called multiple times without throwing', () => {
|
||||||
|
const program = new Command();
|
||||||
|
expect(() => {
|
||||||
|
registerForgeCommand(program);
|
||||||
|
}).not.toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
280
packages/forge/src/cli.ts
Normal file
280
packages/forge/src/cli.ts
Normal file
@@ -0,0 +1,280 @@
|
|||||||
|
import fs from 'node:fs';
|
||||||
|
import path from 'node:path';
|
||||||
|
|
||||||
|
import type { Command } from 'commander';
|
||||||
|
|
||||||
|
import { classifyBrief } from './brief-classifier.js';
|
||||||
|
import { STAGE_LABELS, STAGE_SEQUENCE } from './constants.js';
|
||||||
|
import { getEffectivePersonas, loadBoardPersonas } from './persona-loader.js';
|
||||||
|
import { generateRunId, getPipelineStatus, loadManifest, runPipeline } from './pipeline-runner.js';
|
||||||
|
import type { PipelineOptions, RunManifest, TaskExecutor } from './types.js';
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Stub executor — used when no real executor is wired at CLI invocation time.
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
const stubExecutor: TaskExecutor = {
|
||||||
|
async submitTask(task) {
|
||||||
|
console.log(` [forge] stage submitted: ${task.id} (${task.title})`);
|
||||||
|
},
|
||||||
|
async waitForCompletion(taskId, _timeoutMs) {
|
||||||
|
console.log(` [forge] stage complete: ${taskId}`);
|
||||||
|
return {
|
||||||
|
task_id: taskId,
|
||||||
|
status: 'completed' as const,
|
||||||
|
completed_at: new Date().toISOString(),
|
||||||
|
exit_code: 0,
|
||||||
|
gate_results: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
async getTaskStatus(_taskId) {
|
||||||
|
return 'completed' as const;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Helpers
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
function formatDuration(startedAt?: string, completedAt?: string): string {
|
||||||
|
if (!startedAt || !completedAt) return '-';
|
||||||
|
const ms = new Date(completedAt).getTime() - new Date(startedAt).getTime();
|
||||||
|
const secs = Math.round(ms / 1000);
|
||||||
|
return secs < 60 ? `${secs}s` : `${Math.floor(secs / 60)}m${secs % 60}s`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function printManifestTable(manifest: RunManifest): void {
|
||||||
|
console.log(`\nRun ID : ${manifest.runId}`);
|
||||||
|
console.log(`Status : ${manifest.status}`);
|
||||||
|
console.log(`Brief : ${manifest.brief}`);
|
||||||
|
console.log(`Class : ${manifest.briefClass} (${manifest.classSource})`);
|
||||||
|
console.log(`Updated: ${manifest.updatedAt}`);
|
||||||
|
console.log('');
|
||||||
|
console.log('Stage'.padEnd(22) + 'Status'.padEnd(14) + 'Duration');
|
||||||
|
console.log('-'.repeat(50));
|
||||||
|
for (const stage of STAGE_SEQUENCE) {
|
||||||
|
const s = manifest.stages[stage];
|
||||||
|
if (!s) continue;
|
||||||
|
const label = (STAGE_LABELS[stage] ?? stage).padEnd(22);
|
||||||
|
const status = s.status.padEnd(14);
|
||||||
|
const dur = formatDuration(s.startedAt, s.completedAt);
|
||||||
|
console.log(`${label}${status}${dur}`);
|
||||||
|
}
|
||||||
|
console.log('');
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveRunDir(runId: string, projectRoot?: string): string {
|
||||||
|
const root = projectRoot ?? process.cwd();
|
||||||
|
return path.join(root, '.forge', 'runs', runId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function listRecentRuns(projectRoot?: string): void {
|
||||||
|
const root = projectRoot ?? process.cwd();
|
||||||
|
const runsDir = path.join(root, '.forge', 'runs');
|
||||||
|
|
||||||
|
if (!fs.existsSync(runsDir)) {
|
||||||
|
console.log('No runs found. Run `mosaic forge run` to start a pipeline.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const entries = fs
|
||||||
|
.readdirSync(runsDir)
|
||||||
|
.filter((name) => fs.statSync(path.join(runsDir, name)).isDirectory())
|
||||||
|
.sort()
|
||||||
|
.reverse()
|
||||||
|
.slice(0, 10);
|
||||||
|
|
||||||
|
if (entries.length === 0) {
|
||||||
|
console.log('No runs found.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('\nRecent runs:');
|
||||||
|
console.log('Run ID'.padEnd(22) + 'Status'.padEnd(14) + 'Brief');
|
||||||
|
console.log('-'.repeat(70));
|
||||||
|
|
||||||
|
for (const runId of entries) {
|
||||||
|
const runDir = path.join(runsDir, runId);
|
||||||
|
try {
|
||||||
|
const manifest = loadManifest(runDir);
|
||||||
|
const status = manifest.status.padEnd(14);
|
||||||
|
const brief = path.basename(manifest.brief);
|
||||||
|
console.log(`${runId.padEnd(22)}${status}${brief}`);
|
||||||
|
} catch {
|
||||||
|
console.log(`${runId.padEnd(22)}${'(unreadable)'.padEnd(14)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Register function
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register forge subcommands on an existing Commander program.
|
||||||
|
* Mirrors the pattern used by registerQualityRails in @mosaicstack/quality-rails.
|
||||||
|
*/
|
||||||
|
export function registerForgeCommand(parent: Command): void {
|
||||||
|
const forge = parent.command('forge').description('Run and manage Forge pipelines');
|
||||||
|
|
||||||
|
// ── forge run ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
forge
|
||||||
|
.command('run')
|
||||||
|
.description('Run a Forge pipeline from a brief markdown file')
|
||||||
|
.requiredOption('--brief <path>', 'Path to the brief markdown file')
|
||||||
|
.option('--run-id <id>', 'Override the auto-generated run ID')
|
||||||
|
.option('--resume', 'Resume an existing run instead of starting a new one', false)
|
||||||
|
.option('--config <path>', 'Path to forge config file (.forge/config.yaml)')
|
||||||
|
.option('--codebase <path>', 'Codebase root to pass to the pipeline', process.cwd())
|
||||||
|
.option('--dry-run', 'Print planned stages without executing', false)
|
||||||
|
.action(
|
||||||
|
async (opts: {
|
||||||
|
brief: string;
|
||||||
|
runId?: string;
|
||||||
|
resume: boolean;
|
||||||
|
config?: string;
|
||||||
|
codebase: string;
|
||||||
|
dryRun: boolean;
|
||||||
|
}) => {
|
||||||
|
const briefPath = path.resolve(opts.brief);
|
||||||
|
|
||||||
|
if (!fs.existsSync(briefPath)) {
|
||||||
|
console.error(`[forge] brief not found: ${briefPath}`);
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const briefContent = fs.readFileSync(briefPath, 'utf-8');
|
||||||
|
const briefClass = classifyBrief(briefContent);
|
||||||
|
const projectRoot = opts.codebase;
|
||||||
|
|
||||||
|
if (opts.resume) {
|
||||||
|
const runId = opts.runId ?? generateRunId();
|
||||||
|
const runDir = resolveRunDir(runId, projectRoot);
|
||||||
|
console.log(`[forge] resuming run: ${runId}`);
|
||||||
|
const { resumePipeline } = await import('./pipeline-runner.js');
|
||||||
|
const result = await resumePipeline(runDir, stubExecutor);
|
||||||
|
console.log(`[forge] pipeline complete: ${result.runId}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pipelineOptions: PipelineOptions = {
|
||||||
|
briefClass,
|
||||||
|
codebase: projectRoot,
|
||||||
|
dryRun: opts.dryRun,
|
||||||
|
executor: stubExecutor,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (opts.dryRun) {
|
||||||
|
const { stagesForClass } = await import('./brief-classifier.js');
|
||||||
|
const stages = stagesForClass(briefClass);
|
||||||
|
console.log(`[forge] dry-run — brief class: ${briefClass}`);
|
||||||
|
console.log('[forge] planned stages:');
|
||||||
|
for (const stage of stages) {
|
||||||
|
console.log(` - ${stage} (${STAGE_LABELS[stage] ?? stage})`);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[forge] starting pipeline for brief: ${briefPath}`);
|
||||||
|
console.log(`[forge] classified as: ${briefClass}`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await runPipeline(briefPath, projectRoot, pipelineOptions);
|
||||||
|
console.log(`[forge] pipeline complete: ${result.runId}`);
|
||||||
|
console.log(`[forge] run directory: ${result.runDir}`);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(
|
||||||
|
`[forge] pipeline failed: ${err instanceof Error ? err.message : String(err)}`,
|
||||||
|
);
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// ── forge status ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
forge
|
||||||
|
.command('status [runId]')
|
||||||
|
.description('Show the status of a pipeline run (omit runId to list recent runs)')
|
||||||
|
.option('--project <path>', 'Project root (defaults to cwd)', process.cwd())
|
||||||
|
.action(async (runId: string | undefined, opts: { project: string }) => {
|
||||||
|
if (!runId) {
|
||||||
|
listRecentRuns(opts.project);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const runDir = resolveRunDir(runId, opts.project);
|
||||||
|
try {
|
||||||
|
const manifest = getPipelineStatus(runDir);
|
||||||
|
printManifestTable(manifest);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(
|
||||||
|
`[forge] could not load run "${runId}": ${err instanceof Error ? err.message : String(err)}`,
|
||||||
|
);
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── forge resume ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
forge
|
||||||
|
.command('resume <runId>')
|
||||||
|
.description('Resume a stopped or failed pipeline run')
|
||||||
|
.option('--project <path>', 'Project root (defaults to cwd)', process.cwd())
|
||||||
|
.action(async (runId: string, opts: { project: string }) => {
|
||||||
|
const runDir = resolveRunDir(runId, opts.project);
|
||||||
|
|
||||||
|
if (!fs.existsSync(runDir)) {
|
||||||
|
console.error(`[forge] run not found: ${runDir}`);
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[forge] resuming run: ${runId}`);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { resumePipeline } = await import('./pipeline-runner.js');
|
||||||
|
const result = await resumePipeline(runDir, stubExecutor);
|
||||||
|
console.log(`[forge] pipeline complete: ${result.runId}`);
|
||||||
|
console.log(`[forge] run directory: ${result.runDir}`);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`[forge] resume failed: ${err instanceof Error ? err.message : String(err)}`);
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── forge personas ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const personas = forge.command('personas').description('Manage Forge board personas');
|
||||||
|
|
||||||
|
personas
|
||||||
|
.command('list')
|
||||||
|
.description('List configured board personas')
|
||||||
|
.option(
|
||||||
|
'--project <path>',
|
||||||
|
'Project root for persona overrides (defaults to cwd)',
|
||||||
|
process.cwd(),
|
||||||
|
)
|
||||||
|
.option('--board-dir <path>', 'Override the board agents directory')
|
||||||
|
.action((opts: { project: string; boardDir?: string }) => {
|
||||||
|
const effectivePersonas = opts.boardDir
|
||||||
|
? loadBoardPersonas(opts.boardDir)
|
||||||
|
: getEffectivePersonas(opts.project);
|
||||||
|
|
||||||
|
if (effectivePersonas.length === 0) {
|
||||||
|
console.log('[forge] no board personas configured.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`\nBoard personas (${effectivePersonas.length}):\n`);
|
||||||
|
console.log('Slug'.padEnd(24) + 'Name');
|
||||||
|
console.log('-'.repeat(50));
|
||||||
|
for (const p of effectivePersonas) {
|
||||||
|
console.log(`${p.slug.padEnd(24)}${p.name}`);
|
||||||
|
}
|
||||||
|
console.log('');
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -80,3 +80,6 @@ export {
|
|||||||
resumePipeline,
|
resumePipeline,
|
||||||
getPipelineStatus,
|
getPipelineStatus,
|
||||||
} from './pipeline-runner.js';
|
} from './pipeline-runner.js';
|
||||||
|
|
||||||
|
// CLI
|
||||||
|
export { registerForgeCommand } from './cli.js';
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
"@mosaicstack/macp": "workspace:*",
|
"@mosaicstack/macp": "workspace:*",
|
||||||
"@mosaicstack/prdy": "workspace:*",
|
"@mosaicstack/prdy": "workspace:*",
|
||||||
"@mosaicstack/quality-rails": "workspace:*",
|
"@mosaicstack/quality-rails": "workspace:*",
|
||||||
|
"@mosaicstack/queue": "workspace:*",
|
||||||
"@mosaicstack/types": "workspace:*",
|
"@mosaicstack/types": "workspace:*",
|
||||||
"@clack/prompts": "^0.9.1",
|
"@clack/prompts": "^0.9.1",
|
||||||
"commander": "^13.0.0",
|
"commander": "^13.0.0",
|
||||||
|
|||||||
@@ -3,7 +3,9 @@
|
|||||||
import { createRequire } from 'module';
|
import { createRequire } from 'module';
|
||||||
import { Command } from 'commander';
|
import { Command } from 'commander';
|
||||||
import { registerBrainCommand } from '@mosaicstack/brain';
|
import { registerBrainCommand } from '@mosaicstack/brain';
|
||||||
|
import { registerForgeCommand } from '@mosaicstack/forge';
|
||||||
import { registerQualityRails } from '@mosaicstack/quality-rails';
|
import { registerQualityRails } from '@mosaicstack/quality-rails';
|
||||||
|
import { registerQueueCommand } from '@mosaicstack/queue';
|
||||||
import { registerAgentCommand } from './commands/agent.js';
|
import { registerAgentCommand } from './commands/agent.js';
|
||||||
import { registerConfigCommand } from './commands/config.js';
|
import { registerConfigCommand } from './commands/config.js';
|
||||||
import { registerMissionCommand } from './commands/mission.js';
|
import { registerMissionCommand } from './commands/mission.js';
|
||||||
@@ -343,10 +345,18 @@ registerMissionCommand(program);
|
|||||||
|
|
||||||
registerBrainCommand(program);
|
registerBrainCommand(program);
|
||||||
|
|
||||||
|
// ─── forge ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
registerForgeCommand(program);
|
||||||
|
|
||||||
// ─── quality-rails ──────────────────────────────────────────────────────
|
// ─── quality-rails ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
registerQualityRails(program);
|
registerQualityRails(program);
|
||||||
|
|
||||||
|
// ─── queue ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
registerQueueCommand(program);
|
||||||
|
|
||||||
// ─── update ─────────────────────────────────────────────────────────────
|
// ─── update ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
program
|
program
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mosaicstack/types": "workspace:*",
|
"@mosaicstack/types": "workspace:*",
|
||||||
|
"commander": "^13.0.0",
|
||||||
"ioredis": "^5.10.0"
|
"ioredis": "^5.10.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
62
packages/queue/src/cli.spec.ts
Normal file
62
packages/queue/src/cli.spec.ts
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { Command } from 'commander';
|
||||||
|
import { registerQueueCommand } from './cli.js';
|
||||||
|
|
||||||
|
describe('registerQueueCommand', () => {
|
||||||
|
function buildProgram(): Command {
|
||||||
|
const program = new Command('mosaic');
|
||||||
|
registerQueueCommand(program);
|
||||||
|
return program;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('registers a "queue" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const queueCmd = program.commands.find((c) => c.name() === 'queue');
|
||||||
|
expect(queueCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queue has list, stats, pause, resume, jobs, drain subcommands', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const queueCmd = program.commands.find((c) => c.name() === 'queue');
|
||||||
|
expect(queueCmd).toBeDefined();
|
||||||
|
|
||||||
|
const names = queueCmd!.commands.map((c) => c.name());
|
||||||
|
expect(names).toContain('list');
|
||||||
|
expect(names).toContain('stats');
|
||||||
|
expect(names).toContain('pause');
|
||||||
|
expect(names).toContain('resume');
|
||||||
|
expect(names).toContain('jobs');
|
||||||
|
expect(names).toContain('drain');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('jobs subcommand has a "tail" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const queueCmd = program.commands.find((c) => c.name() === 'queue');
|
||||||
|
const jobsCmd = queueCmd!.commands.find((c) => c.name() === 'jobs');
|
||||||
|
expect(jobsCmd).toBeDefined();
|
||||||
|
|
||||||
|
const tailCmd = jobsCmd!.commands.find((c) => c.name() === 'tail');
|
||||||
|
expect(tailCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('drain has a --yes option', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const queueCmd = program.commands.find((c) => c.name() === 'queue');
|
||||||
|
const drainCmd = queueCmd!.commands.find((c) => c.name() === 'drain');
|
||||||
|
expect(drainCmd).toBeDefined();
|
||||||
|
|
||||||
|
const optionNames = drainCmd!.options.map((o) => o.long);
|
||||||
|
expect(optionNames).toContain('--yes');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stats accepts an optional [name] argument', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const queueCmd = program.commands.find((c) => c.name() === 'queue');
|
||||||
|
const statsCmd = queueCmd!.commands.find((c) => c.name() === 'stats');
|
||||||
|
expect(statsCmd).toBeDefined();
|
||||||
|
// Should not throw when called without argument
|
||||||
|
const args = statsCmd!.registeredArguments;
|
||||||
|
expect(args.length).toBe(1);
|
||||||
|
expect(args[0]!.required).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
248
packages/queue/src/cli.ts
Normal file
248
packages/queue/src/cli.ts
Normal file
@@ -0,0 +1,248 @@
|
|||||||
|
import type { Command } from 'commander';
|
||||||
|
|
||||||
|
import { createLocalAdapter } from './adapters/local.js';
|
||||||
|
import type { QueueConfig } from './types.js';
|
||||||
|
|
||||||
|
/** Resolve adapter type from env; defaults to 'local'. */
|
||||||
|
function resolveAdapterType(): 'bullmq' | 'local' {
|
||||||
|
const t = process.env['QUEUE_ADAPTER'] ?? 'local';
|
||||||
|
return t === 'bullmq' ? 'bullmq' : 'local';
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveConfig(): QueueConfig {
|
||||||
|
const type = resolveAdapterType();
|
||||||
|
if (type === 'bullmq') {
|
||||||
|
return { type: 'bullmq', url: process.env['VALKEY_URL'] };
|
||||||
|
}
|
||||||
|
return { type: 'local', dataDir: process.env['QUEUE_DATA_DIR'] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const BULLMQ_ONLY_MSG =
|
||||||
|
'not supported by local adapter — use the bullmq tier for this (set QUEUE_ADAPTER=bullmq)';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register queue subcommands on an existing Commander program.
|
||||||
|
* Follows the same pattern as registerQualityRails in @mosaicstack/quality-rails.
|
||||||
|
*/
|
||||||
|
export function registerQueueCommand(parent: Command): void {
|
||||||
|
buildQueueCommand(parent.command('queue').description('Manage Mosaic job queues'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildQueueCommand(queue: Command): void {
|
||||||
|
// ─── list ──────────────────────────────────────────────────────────────
|
||||||
|
queue
|
||||||
|
.command('list')
|
||||||
|
.description('List all queues known to the configured adapter')
|
||||||
|
.action(async () => {
|
||||||
|
const config = resolveConfig();
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
const adapter = createLocalAdapter(config);
|
||||||
|
// Local adapter tracks queues in its internal Map; we expose them by
|
||||||
|
// listing JSON files in the data dir.
|
||||||
|
const { readdirSync } = await import('node:fs');
|
||||||
|
const { existsSync } = await import('node:fs');
|
||||||
|
const dataDir = config.dataDir ?? '.mosaic/queue';
|
||||||
|
if (!existsSync(dataDir)) {
|
||||||
|
console.log('No queues found (data dir does not exist yet).');
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const files = readdirSync(dataDir).filter((f: string) => f.endsWith('.json'));
|
||||||
|
if (files.length === 0) {
|
||||||
|
console.log('No queues found.');
|
||||||
|
} else {
|
||||||
|
console.log('Queues (local adapter):');
|
||||||
|
for (const f of files) {
|
||||||
|
console.log(` - ${f.slice(0, -5)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// bullmq — not enough info to enumerate queues without a BullMQ Board
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── stats ─────────────────────────────────────────────────────────────
|
||||||
|
queue
|
||||||
|
.command('stats [name]')
|
||||||
|
.description('Show stats for a queue (or all queues)')
|
||||||
|
.action(async (name?: string) => {
|
||||||
|
const config = resolveConfig();
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
const adapter = createLocalAdapter(config);
|
||||||
|
const { readdirSync } = await import('node:fs');
|
||||||
|
const { existsSync } = await import('node:fs');
|
||||||
|
const dataDir = config.dataDir ?? '.mosaic/queue';
|
||||||
|
|
||||||
|
let names: string[] = [];
|
||||||
|
if (name) {
|
||||||
|
names = [name];
|
||||||
|
} else {
|
||||||
|
if (existsSync(dataDir)) {
|
||||||
|
names = readdirSync(dataDir)
|
||||||
|
.filter((f: string) => f.endsWith('.json'))
|
||||||
|
.map((f: string) => f.slice(0, -5));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (names.length === 0) {
|
||||||
|
console.log('No queues found.');
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const queueName of names) {
|
||||||
|
const len = await adapter.length(queueName);
|
||||||
|
console.log(`Queue: ${queueName}`);
|
||||||
|
console.log(` waiting: ${len}`);
|
||||||
|
console.log(` active: 0 (local adapter — no active tracking)`);
|
||||||
|
console.log(` completed: 0 (local adapter — no completed tracking)`);
|
||||||
|
console.log(` failed: 0 (local adapter — no failed tracking)`);
|
||||||
|
console.log(` delayed: 0 (local adapter — no delayed tracking)`);
|
||||||
|
}
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// bullmq
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── pause ─────────────────────────────────────────────────────────────
|
||||||
|
queue
|
||||||
|
.command('pause <name>')
|
||||||
|
.description('Pause job processing for a queue')
|
||||||
|
.action(async (_name: string) => {
|
||||||
|
const config = resolveConfig();
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── resume ────────────────────────────────────────────────────────────
|
||||||
|
queue
|
||||||
|
.command('resume <name>')
|
||||||
|
.description('Resume job processing for a queue')
|
||||||
|
.action(async (_name: string) => {
|
||||||
|
const config = resolveConfig();
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── jobs tail ─────────────────────────────────────────────────────────
|
||||||
|
const jobs = queue.command('jobs').description('Job-level operations');
|
||||||
|
|
||||||
|
jobs
|
||||||
|
.command('tail [name]')
|
||||||
|
.description('Stream new jobs as they arrive (poll-based)')
|
||||||
|
.option('--interval <ms>', 'Poll interval in ms', '2000')
|
||||||
|
.action(async (name: string | undefined, opts: { interval: string }) => {
|
||||||
|
const config = resolveConfig();
|
||||||
|
const pollMs = parseInt(opts.interval, 10);
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
const adapter = createLocalAdapter(config);
|
||||||
|
const { existsSync, readdirSync } = await import('node:fs');
|
||||||
|
const dataDir = config.dataDir ?? '.mosaic/queue';
|
||||||
|
|
||||||
|
let names: string[] = [];
|
||||||
|
if (name) {
|
||||||
|
names = [name];
|
||||||
|
} else {
|
||||||
|
if (existsSync(dataDir)) {
|
||||||
|
names = readdirSync(dataDir)
|
||||||
|
.filter((f: string) => f.endsWith('.json'))
|
||||||
|
.map((f: string) => f.slice(0, -5));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (names.length === 0) {
|
||||||
|
console.log('No queues to tail.');
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`Tailing queues: ${names.join(', ')} (Ctrl-C to stop)`);
|
||||||
|
const lastLen = new Map<string, number>();
|
||||||
|
for (const qn of names) {
|
||||||
|
lastLen.set(qn, await adapter.length(qn));
|
||||||
|
}
|
||||||
|
|
||||||
|
const timer = setInterval(async () => {
|
||||||
|
for (const qn of names) {
|
||||||
|
const len = await adapter.length(qn);
|
||||||
|
const prev = lastLen.get(qn) ?? 0;
|
||||||
|
if (len > prev) {
|
||||||
|
console.log(
|
||||||
|
`[${new Date().toISOString()}] ${qn}: ${len - prev} new job(s) (total: ${len})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
lastLen.set(qn, len);
|
||||||
|
}
|
||||||
|
}, pollMs);
|
||||||
|
|
||||||
|
process.on('SIGINT', async () => {
|
||||||
|
clearInterval(timer);
|
||||||
|
await adapter.close();
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// bullmq — use subscribe on the channel
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── drain ─────────────────────────────────────────────────────────────
|
||||||
|
queue
|
||||||
|
.command('drain <name>')
|
||||||
|
.description('Drain all pending jobs from a queue')
|
||||||
|
.option('--yes', 'Skip confirmation prompt')
|
||||||
|
.action(async (name: string, opts: { yes?: boolean }) => {
|
||||||
|
if (!opts.yes) {
|
||||||
|
console.error(
|
||||||
|
`WARNING: This will remove all pending jobs from queue "${name}". Re-run with --yes to confirm.`,
|
||||||
|
);
|
||||||
|
process.exit(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = resolveConfig();
|
||||||
|
|
||||||
|
if (config.type === 'local') {
|
||||||
|
const adapter = createLocalAdapter(config);
|
||||||
|
let removed = 0;
|
||||||
|
while ((await adapter.length(name)) > 0) {
|
||||||
|
await adapter.dequeue(name);
|
||||||
|
removed++;
|
||||||
|
}
|
||||||
|
console.log(`Drained ${removed} job(s) from queue "${name}".`);
|
||||||
|
await adapter.close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(BULLMQ_ONLY_MSG);
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ export { type QueueAdapter, type QueueConfig as QueueAdapterConfig } from './typ
|
|||||||
export { createQueueAdapter, registerQueueAdapter } from './factory.js';
|
export { createQueueAdapter, registerQueueAdapter } from './factory.js';
|
||||||
export { createBullMQAdapter } from './adapters/bullmq.js';
|
export { createBullMQAdapter } from './adapters/bullmq.js';
|
||||||
export { createLocalAdapter } from './adapters/local.js';
|
export { createLocalAdapter } from './adapters/local.js';
|
||||||
|
export { registerQueueCommand } from './cli.js';
|
||||||
|
|
||||||
import { registerQueueAdapter } from './factory.js';
|
import { registerQueueAdapter } from './factory.js';
|
||||||
import { createBullMQAdapter } from './adapters/bullmq.js';
|
import { createBullMQAdapter } from './adapters/bullmq.js';
|
||||||
|
|||||||
60
pnpm-lock.yaml
generated
60
pnpm-lock.yaml
generated
@@ -385,6 +385,9 @@ importers:
|
|||||||
'@mosaicstack/macp':
|
'@mosaicstack/macp':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../macp
|
version: link:../macp
|
||||||
|
commander:
|
||||||
|
specifier: ^13.0.0
|
||||||
|
version: 13.1.0
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^22.0.0
|
specifier: ^22.0.0
|
||||||
@@ -475,6 +478,9 @@ importers:
|
|||||||
'@mosaicstack/quality-rails':
|
'@mosaicstack/quality-rails':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../quality-rails
|
version: link:../quality-rails
|
||||||
|
'@mosaicstack/queue':
|
||||||
|
specifier: workspace:*
|
||||||
|
version: link:../queue
|
||||||
'@mosaicstack/types':
|
'@mosaicstack/types':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../types
|
version: link:../types
|
||||||
@@ -571,6 +577,9 @@ importers:
|
|||||||
'@mosaicstack/types':
|
'@mosaicstack/types':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../types
|
version: link:../types
|
||||||
|
commander:
|
||||||
|
specifier: ^13.0.0
|
||||||
|
version: 13.1.0
|
||||||
ioredis:
|
ioredis:
|
||||||
specifier: ^5.10.0
|
specifier: ^5.10.0
|
||||||
version: 5.10.0
|
version: 5.10.0
|
||||||
@@ -640,10 +649,10 @@ importers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@mariozechner/pi-agent-core':
|
'@mariozechner/pi-agent-core':
|
||||||
specifier: ^0.63.1
|
specifier: ^0.63.1
|
||||||
version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
|
version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
|
||||||
'@mariozechner/pi-ai':
|
'@mariozechner/pi-ai':
|
||||||
specifier: ^0.63.1
|
specifier: ^0.63.1
|
||||||
version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
|
version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
|
||||||
'@sinclair/typebox':
|
'@sinclair/typebox':
|
||||||
specifier: ^0.34.41
|
specifier: ^0.34.41
|
||||||
version: 0.34.48
|
version: 0.34.48
|
||||||
@@ -7018,6 +7027,12 @@ snapshots:
|
|||||||
'@jridgewell/gen-mapping': 0.3.13
|
'@jridgewell/gen-mapping': 0.3.13
|
||||||
'@jridgewell/trace-mapping': 0.3.31
|
'@jridgewell/trace-mapping': 0.3.31
|
||||||
|
|
||||||
|
'@anthropic-ai/sdk@0.73.0(zod@3.25.76)':
|
||||||
|
dependencies:
|
||||||
|
json-schema-to-ts: 3.1.1
|
||||||
|
optionalDependencies:
|
||||||
|
zod: 3.25.76
|
||||||
|
|
||||||
'@anthropic-ai/sdk@0.73.0(zod@4.3.6)':
|
'@anthropic-ai/sdk@0.73.0(zod@4.3.6)':
|
||||||
dependencies:
|
dependencies:
|
||||||
json-schema-to-ts: 3.1.1
|
json-schema-to-ts: 3.1.1
|
||||||
@@ -8359,6 +8374,18 @@ snapshots:
|
|||||||
- ws
|
- ws
|
||||||
- zod
|
- zod
|
||||||
|
|
||||||
|
'@mariozechner/pi-agent-core@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)':
|
||||||
|
dependencies:
|
||||||
|
'@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- '@modelcontextprotocol/sdk'
|
||||||
|
- aws-crt
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
- ws
|
||||||
|
- zod
|
||||||
|
|
||||||
'@mariozechner/pi-agent-core@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
|
'@mariozechner/pi-agent-core@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
|
'@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
|
||||||
@@ -8407,6 +8434,30 @@ snapshots:
|
|||||||
- ws
|
- ws
|
||||||
- zod
|
- zod
|
||||||
|
|
||||||
|
'@mariozechner/pi-ai@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)':
|
||||||
|
dependencies:
|
||||||
|
'@anthropic-ai/sdk': 0.73.0(zod@3.25.76)
|
||||||
|
'@aws-sdk/client-bedrock-runtime': 3.1008.0
|
||||||
|
'@google/genai': 1.45.0(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))
|
||||||
|
'@mistralai/mistralai': 1.14.1
|
||||||
|
'@sinclair/typebox': 0.34.48
|
||||||
|
ajv: 8.18.0
|
||||||
|
ajv-formats: 3.0.1(ajv@8.18.0)
|
||||||
|
chalk: 5.6.2
|
||||||
|
openai: 6.26.0(ws@8.20.0)(zod@3.25.76)
|
||||||
|
partial-json: 0.1.7
|
||||||
|
proxy-agent: 6.5.0
|
||||||
|
undici: 7.24.3
|
||||||
|
zod-to-json-schema: 3.25.1(zod@3.25.76)
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- '@modelcontextprotocol/sdk'
|
||||||
|
- aws-crt
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
- ws
|
||||||
|
- zod
|
||||||
|
|
||||||
'@mariozechner/pi-ai@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
|
'@mariozechner/pi-ai@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@anthropic-ai/sdk': 0.73.0(zod@4.3.6)
|
'@anthropic-ai/sdk': 0.73.0(zod@4.3.6)
|
||||||
@@ -12782,6 +12833,11 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
mimic-function: 5.0.1
|
mimic-function: 5.0.1
|
||||||
|
|
||||||
|
openai@6.26.0(ws@8.20.0)(zod@3.25.76):
|
||||||
|
optionalDependencies:
|
||||||
|
ws: 8.20.0
|
||||||
|
zod: 3.25.76
|
||||||
|
|
||||||
openai@6.26.0(ws@8.20.0)(zod@4.3.6):
|
openai@6.26.0(ws@8.20.0)(zod@4.3.6):
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
ws: 8.20.0
|
ws: 8.20.0
|
||||||
|
|||||||
Reference in New Issue
Block a user