From c7acfbae8bb1899760a73440bbf6d69da4aafbf4 Mon Sep 17 00:00:00 2001 From: Jarvis Date: Sun, 5 Apr 2026 01:26:41 -0500 Subject: [PATCH] fix(macp): wire commander dep, registerMacpCommand export, and CLI registration Add commander dependency to @mosaicstack/macp, export registerMacpCommand from the package index, and register the macp command in the mosaic CLI. These were missing from the previous rebase due to conflicting parallel task merges. Ref CU-05-08. Co-Authored-By: Claude Sonnet 4.6 --- packages/macp/package.json | 3 +++ packages/macp/src/index.ts | 3 +++ packages/mosaic/src/cli.ts | 5 ++++ pnpm-lock.yaml | 55 +++++--------------------------------- 4 files changed, 17 insertions(+), 49 deletions(-) diff --git a/packages/macp/package.json b/packages/macp/package.json index cb3378a..8131d3a 100644 --- a/packages/macp/package.json +++ b/packages/macp/package.json @@ -21,6 +21,9 @@ "typecheck": "tsc --noEmit", "test": "vitest run --passWithNoTests" }, + "dependencies": { + "commander": "^13.0.0" + }, "devDependencies": { "@types/node": "^22.0.0", "@vitest/coverage-v8": "^2.0.0", diff --git a/packages/macp/src/index.ts b/packages/macp/src/index.ts index 7c5283d..073c886 100644 --- a/packages/macp/src/index.ts +++ b/packages/macp/src/index.ts @@ -41,3 +41,6 @@ export type { NormalizedGate } from './gate-runner.js'; // Event emitter export { nowISO, appendEvent, emitEvent } from './event-emitter.js'; + +// CLI +export { registerMacpCommand } from './cli.js'; diff --git a/packages/mosaic/src/cli.ts b/packages/mosaic/src/cli.ts index 5c1a07a..e885b3e 100644 --- a/packages/mosaic/src/cli.ts +++ b/packages/mosaic/src/cli.ts @@ -5,6 +5,7 @@ import { Command } from 'commander'; import { registerBrainCommand } from '@mosaicstack/brain'; import { registerForgeCommand } from '@mosaicstack/forge'; import { registerLogCommand } from '@mosaicstack/log'; +import { registerMacpCommand } from '@mosaicstack/macp'; import { registerMemoryCommand } from '@mosaicstack/memory'; import { registerQualityRails } from '@mosaicstack/quality-rails'; import { registerQueueCommand } from '@mosaicstack/queue'; @@ -357,6 +358,10 @@ registerBrainCommand(program); registerForgeCommand(program); +// ─── macp ──────────────────────────────────────────────────────────────── + +registerMacpCommand(program); + // ─── quality-rails ────────────────────────────────────────────────────── registerQualityRails(program); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 053413d..ba52099 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -422,6 +422,10 @@ importers: version: 2.1.9(@types/node@24.12.0)(jsdom@29.0.0(@noble/hashes@2.0.1))(lightningcss@1.31.1) packages/macp: + dependencies: + commander: + specifier: ^13.0.0 + version: 13.1.0 devDependencies: '@types/node': specifier: ^22.0.0 @@ -667,10 +671,10 @@ importers: dependencies: '@mariozechner/pi-agent-core': specifier: ^0.63.1 - version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76) + version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6) '@mariozechner/pi-ai': specifier: ^0.63.1 - version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76) + version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6) '@sinclair/typebox': specifier: ^0.34.41 version: 0.34.48 @@ -7045,12 +7049,6 @@ snapshots: '@jridgewell/gen-mapping': 0.3.13 '@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)': dependencies: json-schema-to-ts: 3.1.1 @@ -8392,18 +8390,6 @@ snapshots: - ws - 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)': dependencies: '@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6) @@ -8452,30 +8438,6 @@ snapshots: - ws - 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)': dependencies: '@anthropic-ai/sdk': 0.73.0(zod@4.3.6) @@ -12851,11 +12813,6 @@ snapshots: dependencies: 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): optionalDependencies: ws: 8.20.0