infra-kit 0.1.128 → 0.1.130

package/src/commands/vendor-diff/vendor-diff.ts

@@ -1,77 +0,0 @@
-import { z } from 'zod'
-
-import { getProjectRoot } from 'src/lib/git-utils'
-import { logger } from 'src/lib/logger'
-import { loadVendorConfig } from 'src/lib/vendor/config'
-import { loadFactoryConfig } from 'src/lib/vendor/factory-config'
-import { runDiff, selectTargets } from 'src/lib/vendor/sync-ops'
-import { defineMcpTool, textContent } from 'src/types'
-
-/** Max itemized changes to print per drifted path before truncating. */
-const MAX_REPORTED = 20
-
-interface VendorDiffOptions {
-  cwd?: string
-  repos?: string[]
-}
-
-/**
- * Source-aware drift check: compare each target repo's `vendored:true` subtree
- * against the source via `rsync --dry-run --delete`. Read-only (does NOT extend
- * RequiredConfirmedOptionArg).
- */
-export const vendorDiff = async (options: VendorDiffOptions = {}) => {
-  const sourceRoot = options.cwd ?? (await getProjectRoot())
-
-  const config = await loadVendorConfig(sourceRoot)
-  const factory = await loadFactoryConfig()
-  const targets = selectTargets(factory.targets, options.repos)
-
-  const entries = await runDiff(config, sourceRoot, factory.workspaceDir, targets)
-
-  if (entries.length === 0) {
-    logger.info('🎉 No drift detected.')
-  } else {
-    for (const entry of entries) {
-      logger.info(`❌ ${entry.repo} → ${entry.target} (${entry.changes.length} change(s)):`)
-
-      for (const change of entry.changes.slice(0, MAX_REPORTED)) {
-        logger.info(`   ${change}`)
-      }
-
-      if (entry.changes.length > MAX_REPORTED) {
-        logger.info(`   …and ${entry.changes.length - MAX_REPORTED} more`)
-      }
-    }
-  }
-
-  const structuredContent = { ok: entries.length === 0, drifted: entries.length, entries }
-
-  return { content: textContent(JSON.stringify(structuredContent, null, 2)), structuredContent }
-}
-
-const vendorDiffOutputSchema = {
-  ok: z.boolean().describe('Whether every target is in sync with the source'),
-  drifted: z.number(),
-  entries: z.array(
-    z.object({
-      repo: z.string(),
-      target: z.string(),
-      changes: z.array(z.string()),
-    }),
-  ),
-}
-
-// MCP Tool Registration (read-only; safe to expose).
-export const vendorDiffMcpTool = defineMcpTool({
-  name: 'vendor-diff',
-  description:
-    'Source-aware drift check: compare each target repo vendored subtree against the source via rsync dry-run. Read-only; run from the source repo root. ok=false when any target has drifted.',
-  inputSchema: {
-    repos: z.array(z.string()).optional().describe('Restrict to these target repo names'),
-  },
-  outputSchema: vendorDiffOutputSchema,
-  handler: (params) => {
-    return vendorDiff({ repos: params.repos })
-  },
-})

package/src/commands/vendor-manifest/index.ts

@@ -1 +0,0 @@
-export { vendorManifest, vendorManifestMcpTool } from './vendor-manifest'

package/src/commands/vendor-manifest/vendor-manifest.ts

@@ -1,60 +0,0 @@
-import path from 'node:path'
-import { z } from 'zod'
-
-import { getProjectRoot } from 'src/lib/git-utils'
-import { logger } from 'src/lib/logger'
-import { loadFactoryConfig } from 'src/lib/vendor/factory-config'
-import { getSourceCommit, runManifest, selectTargets } from 'src/lib/vendor/sync-ops'
-import { defineMcpTool, textContent } from 'src/types'
-import type { RequiredConfirmedOptionArg } from 'src/types'
-
-interface VendorManifestOptions extends RequiredConfirmedOptionArg {
-  cwd?: string
-  repos?: string[]
-}
-
-/**
- * Regenerate each target repo's `vendor/.sync-manifest.json` + README from the
- * CURRENT vendor content, without copying anything. Mutating (writes manifests).
- */
-export const vendorManifest = async (options: VendorManifestOptions) => {
-  const sourceRoot = options.cwd ?? (await getProjectRoot())
-
-  const factory = await loadFactoryConfig()
-  const targets = selectTargets(factory.targets, options.repos)
-
-  const commit = await getSourceCommit(sourceRoot)
-  const source = path.basename(sourceRoot)
-
-  const repos = await runManifest(factory.workspaceDir, targets, { source, commit })
-
-  for (const repo of repos) {
-    logger.info(
-      repo.skipped ? `⚠️  ${repo.repo}: target does not exist — skipped` : `📝 ${repo.repo}: manifest written`,
-    )
-  }
-
-  const structuredContent = { source, commit, repos }
-
-  return { content: textContent(JSON.stringify(structuredContent, null, 2)), structuredContent }
-}
-
-const vendorManifestOutputSchema = {
-  source: z.string(),
-  commit: z.string(),
-  repos: z.array(z.object({ repo: z.string(), skipped: z.boolean() })),
-}
-
-// MCP Tool Registration (mutating).
-export const vendorManifestMcpTool = defineMcpTool({
-  name: 'vendor-manifest',
-  description:
-    'Regenerate each target repo vendor/.sync-manifest.json + README from current content without copying. Mutating; run from the source repo root.',
-  inputSchema: {
-    repos: z.array(z.string()).optional().describe('Restrict to these target repo names'),
-  },
-  outputSchema: vendorManifestOutputSchema,
-  handler: (params) => {
-    return vendorManifest({ repos: params.repos, confirmedCommand: params.confirmedCommand })
-  },
-})

package/src/commands/vendor-sync/__tests__/vendor-write.test.ts

@@ -1,86 +0,0 @@
-import fs from 'node:fs'
-import os from 'node:os'
-import path from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { execMock, zxModuleMock } from 'src/lib/vendor/__tests__/zx-mock'
-
-import { vendorSync } from '../vendor-sync'
-
-// Mock zx so the write commands run without shelling out to rsync/cp/git.
-vi.mock('zx', () => {
-  return zxModuleMock()
-})
-
-let parent: string
-let home: string
-let sourceRoot: string
-let targetRoot: string
-
-const write = (root: string, rel: string, content: string): void => {
-  const full = path.join(root, rel)
-
-  fs.mkdirSync(path.dirname(full), { recursive: true })
-  fs.writeFileSync(full, content, 'utf8')
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  execMock.mockResolvedValue({ stdout: 'deadbeef\n' })
-
-  parent = fs.mkdtempSync(path.join(os.tmpdir(), 'vendor-write-test-'))
-  sourceRoot = path.join(parent, 'source-repo')
-  targetRoot = path.join(parent, 'target-repo')
-
-  // Machine-local factory config (workspaceDir + targets) lives under ~/.infra-kit;
-  // point os.homedir() at a fixture so the loader finds it.
-  home = fs.mkdtempSync(path.join(os.tmpdir(), 'vendor-write-home-'))
-  vi.spyOn(os, 'homedir').mockReturnValue(home)
-  write(home, '.infra-kit/vendor.json', JSON.stringify({ workspaceDir: parent, targets: ['target-repo'] }))
-
-  // Source repo: vendor content + config (copy[] only — targets is machine-local now).
-  write(sourceRoot, 'vendor/configs/a.js', 'aaa')
-  write(
-    sourceRoot,
-    'vendor.config.ts',
-    `export default { copy: [{ name: 'Configs', source: 'vendor/configs', target: 'vendor/configs', type: 'directory', vendored: true }] }`,
-  )
-
-  // Target repo: pre-existing vendor content (rsync is mocked, so this stays).
-  write(targetRoot, 'vendor/configs/a.js', 'aaa')
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  fs.rmSync(parent, { recursive: true, force: true })
-  fs.rmSync(home, { recursive: true, force: true })
-})
-
-describe('vendorSync', () => {
-  it('writes a manifest + README into the target vendor/ tree', async () => {
-    const { structuredContent } = await vendorSync({ cwd: sourceRoot, confirmedCommand: true })
-
-    expect(structuredContent.source).toBe('source-repo')
-    expect(structuredContent.repos).toHaveLength(1)
-    expect(structuredContent.repos[0]?.skipped).toBe(false)
-
-    const manifestPath = path.join(targetRoot, 'vendor', '.sync-manifest.json')
-    const readmePath = path.join(targetRoot, 'vendor', 'README.md')
-
-    expect(fs.existsSync(manifestPath)).toBe(true)
-    expect(fs.existsSync(readmePath)).toBe(true)
-
-    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'))
-
-    expect(manifest.schemaVersion).toBe(1)
-    expect(Object.keys(manifest.files)).toContain('configs/a.js')
-  })
-
-  it('marks a non-existent target as skipped', async () => {
-    fs.rmSync(targetRoot, { recursive: true, force: true })
-
-    const { structuredContent } = await vendorSync({ cwd: sourceRoot, confirmedCommand: true })
-
-    expect(structuredContent.repos[0]?.skipped).toBe(true)
-  })
-})

package/src/commands/vendor-sync/index.ts

@@ -1 +0,0 @@
-export { vendorSync, vendorSyncMcpTool } from './vendor-sync'

package/src/commands/vendor-sync/vendor-sync.ts

@@ -1,90 +0,0 @@
-import confirm from '@inquirer/confirm'
-import path from 'node:path'
-import process from 'node:process'
-import { z } from 'zod'
-
-import { getProjectRoot } from 'src/lib/git-utils'
-import { logger } from 'src/lib/logger'
-import { loadVendorConfig } from 'src/lib/vendor/config'
-import { loadFactoryConfig } from 'src/lib/vendor/factory-config'
-import { getSourceCommit, runSync, selectTargets } from 'src/lib/vendor/sync-ops'
-import { defineMcpTool, textContent } from 'src/types'
-import type { RequiredConfirmedOptionArg } from 'src/types'
-
-interface VendorSyncOptions extends RequiredConfirmedOptionArg {
-  /** Source repo root. Defaults to the git toplevel. */
-  cwd?: string
-  /** Restrict the sync to these target repo names (defaults to all configured targets). */
-  repos?: string[]
-}
-
-/**
- * Copy every item declared in the source repo's `vendor.config.ts` into each
- * target repo, then (re)write each target's `vendor/README.md` +
- * `.sync-manifest.json`. Mutating: extends {@link RequiredConfirmedOptionArg} and
- * prompts for confirmation unless `confirmedCommand` is set (MCP injects it).
- *
- * The config loader and `zx`/rsync live in `config`/`sync-ops`. `vendor check`
- * stays free of them because it never imports the write commands — not because
- * of how they are imported here.
- */
-export const vendorSync = async (options: VendorSyncOptions) => {
-  const sourceRoot = options.cwd ?? (await getProjectRoot())
-
-  const config = await loadVendorConfig(sourceRoot)
-  const factory = await loadFactoryConfig()
-  const targets = selectTargets(factory.targets, options.repos)
-
-  if (!options.confirmedCommand) {
-    const proceed = await confirm(
-      { message: `Sync vendor files from ${path.basename(sourceRoot)} into ${targets.length} repo(s)?` },
-      { output: process.stderr },
-    )
-
-    if (!proceed) {
-      process.exit(0)
-    }
-  }
-
-  const commit = await getSourceCommit(sourceRoot)
-  const source = path.basename(sourceRoot)
-
-  const structuredContent = await runSync(config, sourceRoot, factory.workspaceDir, targets, { source, commit })
-
-  for (const repo of structuredContent.repos) {
-    if (repo.skipped) {
-      logger.info(`⚠️  ${repo.repo}: target does not exist — skipped`)
-    } else {
-      logger.info(`✅ ${repo.repo}: copied ${repo.copied}/${repo.total} items + manifest`)
-    }
-  }
-
-  return { content: textContent(JSON.stringify(structuredContent, null, 2)), structuredContent }
-}
-
-const vendorSyncOutputSchema = {
-  source: z.string(),
-  commit: z.string(),
-  repos: z.array(
-    z.object({
-      repo: z.string(),
-      copied: z.number(),
-      total: z.number(),
-      skipped: z.boolean(),
-    }),
-  ),
-}
-
-// MCP Tool Registration (mutating — createToolHandler injects confirmedCommand:true).
-export const vendorSyncMcpTool = defineMcpTool({
-  name: 'vendor-sync',
-  description:
-    'Copy vendored files from the source repo (vendor.config.ts) into each target repo and regenerate their vendor/.sync-manifest.json + README. Mutating; run from the source repo root.',
-  inputSchema: {
-    repos: z.array(z.string()).optional().describe('Restrict to these target repo names'),
-  },
-  outputSchema: vendorSyncOutputSchema,
-  handler: (params) => {
-    return vendorSync({ repos: params.repos, confirmedCommand: params.confirmedCommand })
-  },
-})

package/src/commands/version/index.ts

@@ -1 +0,0 @@
-export { version, versionMcpTool } from './version'

package/src/commands/version/version.ts

@@ -1,33 +0,0 @@
-import { z } from 'zod'
-
-import { logger } from 'src/lib/logger'
-import { defineMcpTool, textContent } from 'src/types'
-
-import packageJson from '../../../package.json' with { type: 'json' }
-
-/**
- * Print the infra-kit CLI version
- */
-export const version = async () => {
-  const cliVersion = packageJson.version
-
-  logger.info(cliVersion)
-
-  const structuredContent = { version: cliVersion }
-
-  return {
-    content: textContent(JSON.stringify(structuredContent, null, 2)),
-    structuredContent,
-  }
-}
-
-// MCP Tool Registration
-export const versionMcpTool = defineMcpTool({
-  name: 'version',
-  description: 'Print the installed infra-kit CLI version',
-  inputSchema: {},
-  outputSchema: {
-    version: z.string().describe('Installed infra-kit CLI version (from package.json)'),
-  },
-  handler: version,
-})

package/src/commands/worktrees-add/index.ts

@@ -1 +0,0 @@
-export { worktreesAdd, worktreesAddMcpTool } from './worktrees-add'