@open-mercato/cli 0.7.1-develop.7193.1.910a5b0a1e → 0.7.1-develop.7194.1.ab4fc81f82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.7.1-develop.7193.1.910a5b0a1e",
+  "version": "0.7.1-develop.7194.1.ab4fc81f82",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,9 +60,9 @@
     "@mikro-orm/decorators": "^7.1.14",
     "@mikro-orm/migrations": "^7.1.14",
     "@mikro-orm/postgresql": "^7.1.14",
-    "@open-mercato/queue": "0.7.1-develop.7193.1.910a5b0a1e",
-    "@open-mercato/shared": "0.7.1-develop.7193.1.910a5b0a1e",
-    "@open-mercato/telemetry": "0.7.1-develop.7193.1.910a5b0a1e",
+    "@open-mercato/queue": "0.7.1-develop.7194.1.ab4fc81f82",
+    "@open-mercato/shared": "0.7.1-develop.7194.1.ab4fc81f82",
+    "@open-mercato/telemetry": "0.7.1-develop.7194.1.ab4fc81f82",
     "cross-spawn": "^7.0.6",
     "pg": "8.23.0",
     "semver": "^7.8.5",
@@ -73,10 +73,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.7.1-develop.7193.1.910a5b0a1e"
+    "@open-mercato/shared": "0.7.1-develop.7194.1.ab4fc81f82"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.7.1-develop.7193.1.910a5b0a1e",
+    "@open-mercato/shared": "0.7.1-develop.7194.1.ab4fc81f82",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.12"

package/src/__tests__/agent-files.test.ts

@@ -0,0 +1,199 @@
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { createAgentFilesExtension } from '../lib/generators/extensions/agent-files'
+import type { ModuleScanContext } from '../lib/generators/extension'
+
+/**
+ * Build a throwaway repo root carrying the `docker/opencode` + `packages`
+ * sentinels the extension uses to locate the repo, plus a module `agents/` tree
+ * under the app base. Returns the paths the extension's fs side effect targets.
+ */
+function makeRepo(): {
+  root: string
+  appBase: string
+  pkgBase: string
+  dockerAgentsDir: string
+  manifestPath: string
+} {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-files-repo-'))
+  fs.mkdirSync(path.join(root, 'docker', 'opencode'), { recursive: true })
+  fs.mkdirSync(path.join(root, 'packages'), { recursive: true })
+  const appBase = path.join(root, 'apps', 'mercato', 'src', 'modules', 'agent_examples')
+  const pkgBase = path.join(root, 'packages', 'core', 'src', 'modules', '__none__')
+  fs.mkdirSync(appBase, { recursive: true })
+  fs.mkdirSync(pkgBase, { recursive: true })
+  return {
+    root,
+    appBase,
+    pkgBase,
+    dockerAgentsDir: path.join(root, 'docker', 'opencode', 'agents'),
+    manifestPath: path.join(
+      root,
+      'packages',
+      'enterprise',
+      'src',
+      'modules',
+      'agent_orchestrator',
+      'generated',
+      'file-agents.generated.ts',
+    ),
+  }
+}
+
+function writeAgent(
+  agentDir: string,
+  files: { claude: string; outcome: string },
+): void {
+  fs.mkdirSync(agentDir, { recursive: true })
+  fs.writeFileSync(path.join(agentDir, 'AGENT.md'), files.claude, 'utf8')
+  fs.writeFileSync(path.join(agentDir, 'OUTCOME.md'), files.outcome, 'utf8')
+}
+
+const PRIMARY_CLAUDE = [
+  '---',
+  'id: deals.health_check',
+  'label: Deal health check',
+  'description: Assess a deal and propose the next stage.',
+  'subAgents: [deals.activity_scan]',
+  '---',
+  'You assess deal health.',
+].join('\n')
+
+const PRIMARY_OUTCOME = [
+  '---',
+  'kind: proposal',
+  '---',
+  '```json',
+  JSON.stringify({
+    type: 'object',
+    required: ['rationale'],
+    properties: { rationale: { type: 'string', minLength: 1 } },
+  }),
+  '```',
+].join('\n')
+
+const SUB_CLAUDE = [
+  '---',
+  'id: deals.activity_scan',
+  'label: Activity scan',
+  'description: Scan recent deal activity.',
+  '---',
+  'You scan activity.',
+].join('\n')
+
+const SUB_OUTCOME = [
+  '---',
+  'kind: research',
+  '---',
+  '```json',
+  JSON.stringify({
+    type: 'object',
+    required: ['momentum'],
+    properties: { momentum: { type: 'string', minLength: 1 } },
+  }),
+  '```',
+].join('\n')
+
+function makeCtx(repo: ReturnType<typeof makeRepo>, moduleId: string): ModuleScanContext {
+  return {
+    moduleId,
+    roots: { appBase: repo.appBase, pkgBase: repo.pkgBase },
+    imps: {} as ModuleScanContext['imps'],
+    importIdRef: { value: 0 },
+    sharedImports: [],
+    resolveModuleFile: (() => null) as unknown as ModuleScanContext['resolveModuleFile'],
+    resolveFirstModuleFile: (() => null) as unknown as ModuleScanContext['resolveFirstModuleFile'],
+    processStandaloneConfig: () => null,
+    sanitizeGeneratedModuleSpecifier: (importPath: string) => importPath,
+  }
+}
+
+describe('agent-files generator (Phase 4 sub-agents)', () => {
+  const created: string[] = []
+  afterAll(() => {
+    for (const root of created) fs.rmSync(root, { recursive: true, force: true })
+  })
+
+  it('emits a subagent .md, wires the primary task permission, and nests the manifest descriptor', () => {
+    const repo = makeRepo()
+    created.push(repo.root)
+    const agentDir = path.join(repo.appBase, 'agents', 'deals_health_check')
+    writeAgent(agentDir, { claude: PRIMARY_CLAUDE, outcome: PRIMARY_OUTCOME })
+    writeAgent(path.join(agentDir, 'sub-agents', 'activity_scan'), {
+      claude: SUB_CLAUDE,
+      outcome: SUB_OUTCOME,
+    })
+
+    const extension = createAgentFilesExtension()
+    extension.scanModule(makeCtx(repo, 'agent_examples'))
+    extension.generateOutput()
+
+    const primaryMd = fs.readFileSync(
+      path.join(repo.dockerAgentsDir, 'deals_health_check.md'),
+      'utf8',
+    )
+    const subMd = fs.readFileSync(path.join(repo.dockerAgentsDir, 'deals_activity_scan.md'), 'utf8')
+
+    // Sub-agent file is mode: subagent, read-only, and may NOT delegate (task deny).
+    expect(subMd).toContain('mode: subagent')
+    expect(subMd).toContain('write: deny')
+    expect(subMd).toContain('task: deny')
+    expect(subMd).not.toContain('"task": true')
+
+    // Primary allows the task tool and whitelists ONLY its sub-agent's name.
+    expect(primaryMd).toContain('mode: primary')
+    // Delegation runs through the orchestrator's own MCP tool, never OpenCode's
+    // native `task`: the server-side path is depth-capped, read-only and takes
+    // its scope from the run context rather than from model-supplied input. So
+    // `task` stays denied on the primary agent too, and the generated allowlist
+    // names the delegate tool instead.
+    expect(primaryMd).toContain('"open-mercato_agent_orchestrator_delegate_agent": true')
+    expect(primaryMd).toContain('task: deny')
+    expect(primaryMd).not.toContain('"task": true')
+    expect(primaryMd).toContain('## Sub-agents')
+
+    // Manifest carries the sub-agent as a nested descriptor.
+    const manifest = fs.readFileSync(repo.manifestPath, 'utf8')
+    expect(manifest).toContain('deals.health_check')
+    expect(manifest).toContain('subAgentDescriptors')
+    expect(manifest).toContain('deals.activity_scan')
+  })
+
+  it('fails generation when a sub-agent is proposal (only the primary proposes)', () => {
+    const repo = makeRepo()
+    created.push(repo.root)
+    const agentDir = path.join(repo.appBase, 'agents', 'deals_health_check')
+    writeAgent(agentDir, { claude: PRIMARY_CLAUDE, outcome: PRIMARY_OUTCOME })
+    writeAgent(path.join(agentDir, 'sub-agents', 'bad'), {
+      claude: SUB_CLAUDE,
+      // proposal sub-agent — must be rejected
+      outcome: PRIMARY_OUTCOME,
+    })
+
+    const extension = createAgentFilesExtension()
+    expect(() => extension.scanModule(makeCtx(repo, 'agent_examples'))).toThrow(/research/i)
+  })
+
+  it('fails generation when a sub-agent declares its own subAgents (depth cap = 1)', () => {
+    const repo = makeRepo()
+    created.push(repo.root)
+    const agentDir = path.join(repo.appBase, 'agents', 'deals_health_check')
+    writeAgent(agentDir, { claude: PRIMARY_CLAUDE, outcome: PRIMARY_OUTCOME })
+    writeAgent(path.join(agentDir, 'sub-agents', 'nested'), {
+      claude: [
+        '---',
+        'id: deals.nested',
+        'label: Nested',
+        'description: Nested sub-agent.',
+        'subAgents: [deals.deeper]',
+        '---',
+        'body',
+      ].join('\n'),
+      outcome: SUB_OUTCOME,
+    })
+
+    const extension = createAgentFilesExtension()
+    expect(() => extension.scanModule(makeCtx(repo, 'agent_examples'))).toThrow(/depth cap/i)
+  })
+})

package/src/__tests__/mercato.test.ts

@@ -359,6 +359,7 @@ describe('init command failure output', () => {
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
       generateOpenApi: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
@@ -405,6 +406,7 @@ describe('init command failure output', () => {
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
       generateOpenApi: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
@@ -454,6 +456,7 @@ describe('init command failure output', () => {
       generateModuleEntities: jest.fn().mockResolvedValue(undefined),
       generateModuleDi: jest.fn().mockResolvedValue(undefined),
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
       generateOpenApi: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/db', () => ({
@@ -554,6 +557,7 @@ describe('generate post-step structural invalidation', () => {
     const generateModuleEntities = jest.fn().mockResolvedValue(undefined)
     const generateModuleDi = jest.fn().mockResolvedValue(undefined)
     const generateModulePackageSources = jest.fn().mockResolvedValue(undefined)
+    const generateWebResearchAdapters = jest.fn().mockResolvedValue(undefined)
     const generateOpenApi = jest.fn().mockResolvedValue(undefined)
     const invalidate = jest.fn().mockResolvedValue({
       cacheEntriesDeleted: 2,
@@ -568,6 +572,7 @@ describe('generate post-step structural invalidation', () => {
       generateModuleEntities,
       generateModuleDi,
       generateModulePackageSources,
+      generateWebResearchAdapters,
       generateOpenApi,
     }))
     jest.doMock('../lib/resolver', () => ({
@@ -610,6 +615,7 @@ describe('generate post-step structural invalidation', () => {
       generateModuleDi: jest.fn().mockResolvedValue(unchangedResult),
       generateModulePackageSources: jest.fn().mockResolvedValue(unchangedResult),
       generateOpenApi: jest.fn().mockResolvedValue(unchangedResult),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(unchangedResult),
     }
     const invalidate = jest.fn()
 
@@ -649,6 +655,7 @@ describe('generate post-step structural invalidation', () => {
     const generateModuleEntities = jest.fn().mockResolvedValue(undefined)
     const generateModuleDi = jest.fn().mockResolvedValue(undefined)
     const generateModulePackageSources = jest.fn().mockResolvedValue(undefined)
+    const generateWebResearchAdapters = jest.fn().mockResolvedValue(undefined)
     const generateOpenApi = jest.fn().mockResolvedValue(undefined)
     const invalidate = jest.fn().mockRejectedValue(new Error('cache maintenance unavailable'))
 
@@ -658,6 +665,7 @@ describe('generate post-step structural invalidation', () => {
       generateModuleEntities,
       generateModuleDi,
       generateModulePackageSources,
+      generateWebResearchAdapters,
       generateOpenApi,
     }))
     jest.doMock('../lib/resolver', () => ({
@@ -695,6 +703,7 @@ describe('generate post-step structural invalidation', () => {
       generateModuleDi: generate,
       generateModulePackageSources: generate,
       generateOpenApi: generate,
+      generateWebResearchAdapters: generate,
     }))
     jest.doMock('../lib/resolver', () => ({
       createResolver: () => ({
@@ -800,6 +809,7 @@ describe('server dev managed process exits', () => {
     })
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
       resolveEnvironment: () => ({
@@ -841,6 +851,7 @@ describe('server dev managed process exits', () => {
     })
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
       resolveEnvironment: () => ({
@@ -1209,6 +1220,7 @@ describe('server dev managed process exits', () => {
     })
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
       resolveEnvironment: () => ({
@@ -1363,6 +1375,7 @@ describe('server dev managed process exits', () => {
     })
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
       resolveEnvironment: () => ({
@@ -1643,6 +1656,7 @@ describe('server start managed process exits', () => {
     }))
     jest.doMock('../lib/generators', () => ({
       generateModulePackageSources: jest.fn().mockResolvedValue(undefined),
+      generateWebResearchAdapters: jest.fn().mockResolvedValue(undefined),
     }))
     jest.doMock('../lib/resolver', () => ({
       resolveEnvironment: () => ({

package/src/lib/__tests__/agentic-init.test.ts

@@ -94,6 +94,13 @@ describe('resolveRelevantAgenticFiles', () => {
     ])
   })
 
+  it('resolves github-copilot existing files', () => {
+    expect(loadActualModule().resolveRelevantAgenticFiles('github-copilot')).toEqual([
+      '.github/copilot-instructions.md',
+      '.vscode/mcp.json.example',
+    ])
+  })
+
   it('falls back to the full known file list when no tool is provided', () => {
     expect(loadActualModule().resolveRelevantAgenticFiles()).toEqual([
       'CLAUDE.md',
@@ -101,6 +108,8 @@ describe('resolveRelevantAgenticFiles', () => {
       '.mcp.json.example',
       '.codex/mcp.json.example',
       '.cursor/hooks.json',
+      '.github/copilot-instructions.md',
+      '.vscode/mcp.json.example',
     ])
   })
 
@@ -111,6 +120,8 @@ describe('resolveRelevantAgenticFiles', () => {
       '.mcp.json.example',
       '.codex/mcp.json.example',
       '.cursor/hooks.json',
+      '.github/copilot-instructions.md',
+      '.vscode/mcp.json.example',
     ])
   })
 })

package/src/lib/__tests__/agentic-setup.ownership.test.ts

@@ -397,9 +397,14 @@ describe('runAgenticSetup ownership modes', () => {
     expect(existsSync(join(appDir, '.claude', 'settings.json'))).toBe(true)
     expect(existsSync(join(appDir, '.codex', 'mcp.json.example'))).toBe(true)
     expect(existsSync(join(appDir, '.cursor', 'hooks.json'))).toBe(false)
+    expect(existsSync(join(appDir, '.github', 'copilot-instructions.md'))).toBe(false)
     const tiers = JSON.parse(readFileSync(join(appDir, '.ai', 'skills', 'tiers.json'), 'utf8')) as {
       agents?: { ignore?: string[] }
     }
+    // Every SKILL-MANAGED tool the app did not select is ignored, so the skills
+    // installer skips its links. GitHub Copilot is deliberately absent: it reads
+    // `.github/` instruction files rather than a skills directory, and the
+    // installer rejects its id as an unknown agent.
     expect(tiers.agents?.ignore).toEqual(['cursor'])
   })
 })

package/src/lib/agentic-init.ts

@@ -21,6 +21,10 @@ const TOOL_EXISTING_FILES: Record<string, string[]> = {
   'cursor': [
     '.cursor/hooks.json',
   ],
+  'github-copilot': [
+    '.github/copilot-instructions.md',
+    '.vscode/mcp.json.example',
+  ],
 }
 
 function parseArgs(args: string[]): AgenticInitOptions {

package/src/lib/agentic-setup.ts

@@ -811,18 +811,39 @@ function generateCursor(config: AgenticConfig): void {
   // which scripts/install-skills.sh populates.
 }
 
+function generateGithubCopilot(config: AgenticConfig): void {
+  const { targetDir } = config
+  const srcDir = join(AGENTIC_DIR, 'github-copilot')
+
+  writeTemplate(srcDir, 'copilot-instructions.md.template', join(targetDir, '.github', 'copilot-instructions.md'), config)
+  copyFile(srcDir, 'instructions/entity-guard.instructions.md', join(targetDir, '.github', 'instructions', 'entity-guard.instructions.md'))
+  copyFile(srcDir, 'instructions/generated-guard.instructions.md', join(targetDir, '.github', 'instructions', 'generated-guard.instructions.md'))
+  copyFile(srcDir, 'mcp.json.example', join(targetDir, '.vscode', 'mcp.json.example'))
+
+  // No .github/skills directory: Copilot reads the canonical .agents/skills/,
+  // which scripts/install-skills.sh populates.
+}
 // ─── Wizard ──────────────────────────────────────────────────────────────
 
 const TOOLS = [
   { key: '1', label: 'Claude Code     (Anthropic)', id: 'claude-code' },
   { key: '2', label: 'Codex           (OpenAI)', id: 'codex' },
   { key: '3', label: 'Cursor          (Anysphere)', id: 'cursor' },
-  { key: '4', label: 'Multiple tools  (select individually)', id: 'multiple' },
-  { key: '5', label: 'Skip — set up manually later', id: 'skip' },
+  { key: '4', label: 'GitHub Copilot  (GitHub)', id: 'github-copilot' },
+  { key: '5', label: 'Multiple tools  (select individually)', id: 'multiple' },
+  { key: '6', label: 'Skip — set up manually later', id: 'skip' },
 ] as const
 
 const SELECTABLE = TOOLS.filter((t) => t.id !== 'multiple' && t.id !== 'skip')
 
+/**
+ * The agents whose SKILL directories `scripts/install-skills.mjs` manages.
+ * GitHub Copilot is selectable here but reads instruction files under
+ * `.github/`, not a skills directory, so the installer does not know that id —
+ * naming it in `agents.ignore` aborts the install with "unknown agent".
+ */
+const SKILL_MANAGED_AGENT_IDS = ['claude-code', 'codex', 'cursor']
+
 function persistedAgentSelection(targetDir: string): string[] | null {
   const selectableIds = SELECTABLE.map((tool) => tool.id)
   const tiersPath = join(targetDir, '.ai', 'skills', 'tiers.json')
@@ -865,9 +886,9 @@ async function promptSelection(ask: AskFn): Promise<string[]> {
 
   const answer = (await ask('   Enter number(s) separated by comma [1]: ')).trim() || '1'
 
-  if (answer === '5') return ['skip']
+  if (answer === '6') return ['skip']
 
-  if (answer === '4') {
+  if (answer === '5') {
     const selected: string[] = []
     for (const tool of SELECTABLE) {
       const yn = await ask(`   Include ${tool.label}? [y/N]: `)
@@ -962,6 +983,9 @@ export async function runAgenticSetup(
   if (selectedIds.includes('cursor')) {
     console.log('   ✓ Cursor — .cursor/rules/, .cursor/hooks/, .cursor/mcp.json.example')
   }
+  if (selectedIds.includes('github-copilot')) {
+    console.log('   ✓ GitHub Copilot — .github/copilot-instructions.md, .github/instructions/, .vscode/mcp.json.example')
+  }
   if (config.experimentalHooksValidator) {
     console.log('   ✓ Experimental gate-evidence/typecheck validator hooks')
   }
@@ -978,6 +1002,7 @@ function generateHarness(config: AgenticConfig, selectedIds: string[]): void {
   if (selectedIds.includes('claude-code')) generateClaudeCode(config)
   if (selectedIds.includes('codex')) generateCodex(config)
   if (selectedIds.includes('cursor')) generateCursor(config)
+  if (selectedIds.includes('github-copilot')) generateGithubCopilot(config)
 
   enforceGeneratedRootBudget(config)
 
@@ -1003,7 +1028,7 @@ function enforceGeneratedRootBudget(
 function persistAgentSelection(targetDir: string, selectedIds: string[]): void {
   const manifestPath = join(targetDir, '.ai', 'skills', 'tiers.json')
   if (!existsSync(manifestPath)) return
-  const ignore = SELECTABLE.map((tool) => tool.id).filter((id) => !selectedIds.includes(id))
+  const ignore = SKILL_MANAGED_AGENT_IDS.filter((id) => !selectedIds.includes(id))
   const manifest = JSON.parse(readFileSync(manifestPath, 'utf-8')) as Record<string, unknown>
   if (ignore.length > 0) {
     manifest.agents = { ignore }