infra-kit 0.1.128 → 0.1.129

package/src/entry/dev-server.ts

@@ -1,103 +0,0 @@
-/**
- * Long-running CLI entry for the local dev-server. Owns flag parsing, OS signal
- * handling, and process exit — the orchestrator (`src/dev/dev-server`) is signal-
- * and exit-agnostic. Kept off the eager cli.js graph: entry/cli.ts reaches this
- * module (and the fastify/chokidar it pulls in) only via `await import(...)`, so
- * those heavy deps never load on the machine command paths.
- */
-import { Command } from 'commander'
-import process from 'node:process'
-import { pathToFileURL } from 'node:url'
-
-import { run } from 'src/dev/dev-server'
-import type { DevServerOptions } from 'src/dev/dev-server'
-
-/** Raw option object as produced by Commander (comma-joined strings). */
-export interface DevCliOptions {
-  watch?: boolean
-  app?: string
-  ui?: boolean
-}
-
-/** Split a comma-separated flag value into a trimmed, non-empty list (`null` when unset/empty). */
-const splitList = (value: string | undefined): string[] | null => {
-  if (value == null) return null
-
-  const parts = value
-    .split(',')
-    .map((s) => {
-      return s.trim()
-    })
-    .filter(Boolean)
-
-  return parts.length > 0 ? parts : null
-}
-
-/**
- * Map raw Commander flags to the orchestrator's typed options. Shared by the
- * `infra-kit dev` subcommand and the standalone entry so the two never diverge.
- */
-export const toDevServerOptions = (raw: DevCliOptions): DevServerOptions => {
-  return {
-    watch: raw.watch ?? false,
-    include: splitList(raw.app),
-    ui: raw.ui ?? false,
-  }
-}
-
-/**
- * Start the dev-server, then wait for an OS signal and shut every server down
- * cleanly before exiting. This is the ONLY place SIGINT/SIGTERM handlers and
- * `process.exit` live for the dev-server feature.
- */
-export const runDevServer = async (options: DevServerOptions): Promise<void> => {
-  const runner = await run(options)
-
-  let shuttingDown = false
-
-  const shutdown = (signal: NodeJS.Signals): void => {
-    if (shuttingDown) return
-    shuttingDown = true
-
-    void (async () => {
-      try {
-        process.stdout.write(`\nReceived ${signal}, shutting down dev-server...\n`)
-        await runner.shutdown()
-      } finally {
-        process.exit(0)
-      }
-    })()
-  }
-
-  process.on('SIGINT', () => {
-    return shutdown('SIGINT')
-  })
-  process.on('SIGTERM', () => {
-    return shutdown('SIGTERM')
-  })
-}
-
-/** Parse `node dist/dev-server.js ...` flags and start the server. */
-const parseAndRun = async (argv: string[]): Promise<void> => {
-  const program = new Command()
-
-  program
-    .name('infra-kit-dev-server')
-    .description('Run local dev servers for every apps/<app>/api that has a serverless.yml')
-    .option('-w, --watch', 'Rebuild and restart on file save')
-    .option('--app <names>', 'Only run these apps (comma-separated folder names)')
-    .option('--ui', 'Also run frontends (apps/<app>/ui with a `dev` script) via turbo run dev')
-
-  program.parse(argv)
-
-  await runDevServer(toDevServerOptions(program.opts<DevCliOptions>()))
-}
-
-// Self-execute only when run directly (`node dist/dev-server.js`), not when the
-// `infra-kit dev` subcommand imports this module for its exported helpers.
-if (import.meta.url === pathToFileURL(process.argv[1] ?? '').href) {
-  parseAndRun(process.argv).catch((error: unknown) => {
-    console.error(error)
-    process.exit(1)
-  })
-}

package/src/entry/index.ts

@@ -1,11 +0,0 @@
-// Public library entry for `import { defineConfig } from 'infra-kit'`. Uses
-// relative imports (no `src/*` alias) so the emitted .d.ts stays portable for
-// external consumers. Keep this surface minimal.
-export { defineConfig } from '../lib/package-config/package-config'
-export type { InfraKitPackageConfig, InfraKitPackageConfigInput } from '../lib/package-config/package-config'
-// Vendor sync config authoring (`import { defineVendorConfig } from 'infra-kit'`).
-// Imported from the node-free schema module so the emitted .d.ts needs no node types.
-export { defineVendorConfig } from '../lib/vendor/config-schema'
-export type { VendorConfig, VendorCopyItem } from '../lib/vendor/config-schema'
-// The machine-local factory registry is now static JSON (~/.infra-kit/vendor.json),
-// not authored in TypeScript — so there is no `defineFactoryConfig` to export.

package/src/entry/mcp.ts

@@ -1,43 +0,0 @@
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
-import process from 'node:process'
-
-import { setupErrorHandlers } from 'src/lib/error-handlers'
-import { initLoggerMcp } from 'src/lib/logger'
-
-import { createMcpServer } from '../mcp/server'
-
-const logger = initLoggerMcp()
-
-const startServer = async () => {
-  let server
-
-  try {
-    server = await createMcpServer()
-
-    logger.info('MCP Server instance created')
-  } catch (error) {
-    logger.error({ err: error, msg: 'Failed to create MCP server' })
-    logger.error(`Fatal error during server creation.`)
-
-    process.exit(1)
-  }
-
-  try {
-    const transport = new StdioServerTransport()
-
-    await server.connect(transport)
-
-    logger.info({ msg: 'Server connected to transport. Ready.' })
-  } catch (error) {
-    logger.error({ err: error, msg: 'Failed to initialize server' })
-    logger.error(`Fatal error during server transport init.`)
-
-    process.exit(1)
-  }
-}
-
-// Setup error handlers
-setupErrorHandlers(logger)
-
-// Start the server
-startServer()

package/src/integrations/cmux/__tests__/canonicalize-cmux-title.test.ts

@@ -1,56 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { buildCmuxWorkspaceTitle } from 'src/integrations/cmux'
-
-import { canonicalizeCmuxTitle } from '../canonicalize-cmux-title'
-
-describe('canonicalizeCmuxTitle', () => {
-  it('trims and collapses internal whitespace', () => {
-    expect(canonicalizeCmuxTitle('  hulyo-monorepo   1.48.0  ')).toBe('hulyo-monorepo 1.48.0')
-  })
-
-  it('normalizes a v-prefixed semver token to its bare form', () => {
-    expect(canonicalizeCmuxTitle('hulyo-monorepo v1.48.0')).toBe('hulyo-monorepo 1.48.0')
-  })
-
-  it('treats the v-prefixed and bare semver titles as the same key (cross-version drift)', () => {
-    expect(canonicalizeCmuxTitle('hulyo-monorepo v1.48.0')).toBe(canonicalizeCmuxTitle('hulyo-monorepo 1.48.0'))
-  })
-
-  it('does NOT strip a leading v from a named release', () => {
-    expect(canonicalizeCmuxTitle('hulyo-monorepo vega-redesign')).toBe('hulyo-monorepo vega-redesign')
-  })
-
-  it('leaves a non-release fallback title containing a slash untouched', () => {
-    expect(canonicalizeCmuxTitle('hulyo-monorepo feature/foo')).toBe('hulyo-monorepo feature/foo')
-  })
-
-  it('does not corrupt a non-semver token that merely starts with v', () => {
-    expect(canonicalizeCmuxTitle('v8-engine 1.2.3')).toBe('v8-engine 1.2.3')
-    expect(canonicalizeCmuxTitle('appv1.2.3 main')).toBe('appv1.2.3 main')
-  })
-
-  it('is idempotent', () => {
-    const once = canonicalizeCmuxTitle('hulyo-monorepo   v1.48.0 ')
-
-    expect(canonicalizeCmuxTitle(once)).toBe(once)
-  })
-
-  // The invariant that generalizes the whole fix: the title a workspace is
-  // created/renamed with must round-trip through canonicalization to the same
-  // key the dedup/close check builds — regardless of which CLI version stored it.
-  describe('round-trip invariant', () => {
-    it('built title canonicalizes to a stable key for a versioned release', () => {
-      const built = buildCmuxWorkspaceTitle({ repoName: 'hulyo-monorepo', branch: 'release/v1.48.0' })
-      const storedByOldCli = 'hulyo-monorepo v1.48.0'
-
-      expect(canonicalizeCmuxTitle(built)).toBe(canonicalizeCmuxTitle(storedByOldCli))
-    })
-
-    it('built title canonicalizes to a stable key for a named release', () => {
-      const built = buildCmuxWorkspaceTitle({ repoName: 'hulyo-monorepo', branch: 'release/checkout-redesign' })
-
-      expect(canonicalizeCmuxTitle(built)).toBe('hulyo-monorepo checkout-redesign')
-    })
-  })
-})

package/src/integrations/cmux/__tests__/close-workspace-by-title.test.ts

@@ -1,63 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { $ } from 'zx'
-
-import { closeCmuxWorkspaceByTitle } from '../close-workspace-by-title'
-
-const listOutput = vi.hoisted(() => {
-  return { value: '' }
-})
-
-vi.mock('zx', () => {
-  function makeResult(stdout: string) {
-    return Object.assign(Promise.resolve({ stdout }), {
-      quiet: () => {
-        return Promise.resolve({ stdout })
-      },
-    })
-  }
-
-  return {
-    $: vi.fn((strings: TemplateStringsArray) => {
-      return strings.join('').includes('list-workspaces') ? makeResult(listOutput.value) : makeResult('')
-    }),
-  }
-})
-
-type CmuxCall = [TemplateStringsArray, ...string[]]
-
-function isCloseCall(call: CmuxCall): boolean {
-  return call[0].join('').includes('close-workspace')
-}
-
-const closeCallRef = (): string | undefined => {
-  const calls = vi.mocked($).mock.calls as unknown as CmuxCall[]
-
-  return calls.find(isCloseCall)?.[1]
-}
-
-describe('closeCmuxWorkspaceByTitle', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    listOutput.value = ''
-  })
-
-  it('closes a workspace stored under an old v-prefixed title when asked with the bare-semver title', async () => {
-    listOutput.value = [
-      '  workspace:8  hulyo-monorepo v1.48.0',
-      '* workspace:6  obsidian-workspace  [selected]',
-      '',
-    ].join('\n')
-
-    await closeCmuxWorkspaceByTitle('hulyo-monorepo 1.48.0')
-
-    expect(closeCallRef()).toBe('workspace:8')
-  })
-
-  it('does not close anything when no title matches', async () => {
-    listOutput.value = '  workspace:8  hulyo-monorepo 2.0.0\n'
-
-    await closeCmuxWorkspaceByTitle('hulyo-monorepo 1.48.0')
-
-    expect(closeCallRef()).toBeUndefined()
-  })
-})

package/src/integrations/cmux/__tests__/list-workspace-titles.test.ts

@@ -1,65 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { listCmuxWorkspaceTitles } from '../list-workspace-titles'
-
-const listOutput = vi.hoisted(() => {
-  return { value: '' }
-})
-
-vi.mock('zx', () => {
-  function makeResult() {
-    return Object.assign(Promise.resolve({ stdout: listOutput.value }), {
-      quiet: () => {
-        return Promise.resolve({ stdout: listOutput.value })
-      },
-    })
-  }
-
-  return {
-    $: vi.fn(makeResult),
-  }
-})
-
-describe('listCmuxWorkspaceTitles', () => {
-  beforeEach(() => {
-    listOutput.value = ''
-  })
-
-  it('parses titles, stripping the [selected] suffix and leading * marker', async () => {
-    listOutput.value = [
-      '  workspace:8  hulyo-monorepo 1.48.0',
-      '* workspace:6  obsidian-workspace  [selected]',
-      '',
-    ].join('\n')
-
-    const titles = await listCmuxWorkspaceTitles()
-
-    expect(titles.has('hulyo-monorepo 1.48.0')).toBe(true)
-    expect(titles.has('obsidian-workspace')).toBe(true)
-  })
-
-  it('canonicalizes a v-prefixed (old CLI) stored title to the bare-semver key', async () => {
-    listOutput.value = '  workspace:8  hulyo-monorepo v1.48.0\n'
-
-    const titles = await listCmuxWorkspaceTitles()
-
-    expect(titles.has('hulyo-monorepo 1.48.0')).toBe(true)
-    expect(titles.has('hulyo-monorepo v1.48.0')).toBe(false)
-  })
-
-  it('collapses extra internal whitespace into the canonical key', async () => {
-    listOutput.value = '  workspace:3  hulyo-monorepo    1.48.0\n'
-
-    const titles = await listCmuxWorkspaceTitles()
-
-    expect(titles.has('hulyo-monorepo 1.48.0')).toBe(true)
-  })
-
-  it('returns an empty set when cmux output is empty', async () => {
-    listOutput.value = ''
-
-    const titles = await listCmuxWorkspaceTitles()
-
-    expect(titles.size).toBe(0)
-  })
-})

package/src/integrations/cmux/__tests__/open-workspace-with-layout.test.ts

@@ -1,127 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { $ } from 'zx'
-
-import { getInfraKitConfig } from 'src/lib/infra-kit-config'
-import type { CmuxLayout } from 'src/lib/infra-kit-config'
-
-import { openCmuxWorkspaceWithLayout } from '../open-workspace-with-layout'
-
-vi.mock('src/lib/infra-kit-config', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('src/lib/infra-kit-config')>()
-
-  return {
-    ...actual,
-    getInfraKitConfig: vi.fn(),
-  }
-})
-
-vi.mock('zx', () => {
-  function makeResult(stdout: string) {
-    return Object.assign(Promise.resolve({ stdout }), {
-      quiet: () => {
-        return Promise.resolve({ stdout })
-      },
-    })
-  }
-
-  return {
-    $: vi.fn((strings: TemplateStringsArray) => {
-      const cmd = strings.join('')
-
-      if (cmd.includes('workspace create')) return makeResult('created workspace:7\n')
-      if (cmd.includes('list-pane-surfaces')) return makeResult('surface:12 (active)\n')
-
-      return makeResult('')
-    }),
-  }
-})
-
-// A worktree cwd that is not under a publicly writable directory (avoids the
-// sonarjs/publicly-writable-directories lint that flags /tmp paths).
-const WORKTREE_CWD = '/home/dev/repo/wt'
-
-type CmuxCall = [TemplateStringsArray, ...string[]]
-
-const allCommands = (): string[] => {
-  const calls = vi.mocked($).mock.calls as unknown as CmuxCall[]
-
-  return calls.map((call) => {
-    return call[0].join('')
-  })
-}
-
-const splitCommands = (): string[] => {
-  return allCommands().filter((cmd) => {
-    return cmd.includes('new-split')
-  })
-}
-
-const mockLayout = (layout: CmuxLayout): void => {
-  vi.mocked(getInfraKitConfig).mockResolvedValue({
-    environments: ['dev'],
-    envManagement: { provider: 'doppler', config: { name: 'p' } },
-    worktrees: { cmux: { layout } },
-  } as Awaited<ReturnType<typeof getInfraKitConfig>>)
-}
-
-describe('openCmuxWorkspaceWithLayout', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('two-columns layout issues a single right split (no down split)', async () => {
-    mockLayout('two-columns')
-
-    await openCmuxWorkspaceWithLayout({ cwd: WORKTREE_CWD })
-
-    const splits = splitCommands()
-
-    expect(
-      splits.some((cmd) => {
-        return cmd.includes('new-split right')
-      }),
-    ).toBe(true)
-    expect(
-      splits.some((cmd) => {
-        return cmd.includes('new-split down')
-      }),
-    ).toBe(false)
-    expect(splits).toHaveLength(1)
-  })
-
-  it('three-pane layout issues both a right and a down split', async () => {
-    mockLayout('three-pane')
-
-    await openCmuxWorkspaceWithLayout({ cwd: WORKTREE_CWD })
-
-    const splits = splitCommands()
-
-    expect(
-      splits.some((cmd) => {
-        return cmd.includes('new-split right')
-      }),
-    ).toBe(true)
-    expect(
-      splits.some((cmd) => {
-        return cmd.includes('new-split down')
-      }),
-    ).toBe(true)
-    expect(splits).toHaveLength(2)
-  })
-
-  it('renames the workspace when a title is provided', async () => {
-    mockLayout('two-columns')
-
-    await openCmuxWorkspaceWithLayout({ cwd: WORKTREE_CWD, title: 'my-title' })
-
-    const calls = vi.mocked($).mock.calls as unknown as CmuxCall[]
-    const renameCall = calls.find((call) => {
-      return call[0].join('').includes('workspace rename')
-    })
-
-    expect(renameCall).toBeDefined()
-    // The title is the last interpolated value of `cmux workspace rename … --title ${title}`,
-    // so it lands in the final tuple slot — assert on that value, not tuple membership.
-    expect(renameCall?.at(-1)).toBe('my-title')
-  })
-})

package/src/integrations/cmux/canonicalize-cmux-title.ts

@@ -1,31 +0,0 @@
-/** Matches a `v`-prefixed semver token (e.g. `v1.48.0`) anchored on shape. */
-const V_SEMVER_TOKEN_RE = /\bv(\d+\.\d+\.\d+)\b/g
-
-/**
- * Canonicalizes a cmux workspace title into a stable dedup/close key.
- *
- * cmux workspace titles are human display strings built by
- * `buildCmuxWorkspaceTitle`, so the value stored when a workspace is created can
- * drift from the value rebuilt later — across whitespace and across CLI versions
- * (an older build titled version releases `v1.48.0`; the current build titles
- * them `1.48.0`). Keying dedup or close on the raw title silently creates
- * duplicate / unclosable workspaces whenever that drift occurs.
- *
- * Canonicalization collapses the known drift axes so both sides round-trip to an
- * equal key:
- *   - trims and collapses internal whitespace to single spaces;
- *   - normalizes a `v`-prefixed semver token to its bare form
- *     (`v1.48.0` → `1.48.0`), anchored on semver shape so named releases that
- *     merely start with `v` (e.g. `vega-redesign`) are left untouched.
- *
- * Non-release fallback titles (which may contain `/`, e.g. `feature/foo`) are
- * preserved as-is apart from whitespace normalization.
- *
- * @example
- * canonicalizeCmuxTitle('hulyo-monorepo  v1.48.0')      // => 'hulyo-monorepo 1.48.0'
- * canonicalizeCmuxTitle('hulyo-monorepo 1.48.0')        // => 'hulyo-monorepo 1.48.0'
- * canonicalizeCmuxTitle('hulyo-monorepo vega-redesign') // => 'hulyo-monorepo vega-redesign'
- */
-export const canonicalizeCmuxTitle = (raw: string): string => {
-  return raw.trim().replace(/\s+/g, ' ').replace(V_SEMVER_TOKEN_RE, '$1')
-}

package/src/integrations/cmux/close-workspace-by-title.ts

@@ -1,59 +0,0 @@
-import { $ } from 'zx'
-
-import { logger } from 'src/lib/logger'
-
-import { canonicalizeCmuxTitle } from './canonicalize-cmux-title'
-
-/**
- * Best-effort close of the cmux workspace whose title matches `title` (compared
- * via {@link canonicalizeCmuxTitle}, so a drifted stored title still resolves).
- * Silently no-ops if cmux isn't running, the workspace isn't found, or close fails.
- */
-export const closeCmuxWorkspaceByTitle = async (title: string): Promise<void> => {
-  try {
-    const listOutput = (await $`cmux list-workspaces`.quiet()).stdout
-
-    const ref = findWorkspaceRefByTitle(listOutput, title)
-
-    if (!ref) {
-      return
-    }
-
-    await $`cmux close-workspace --workspace ${ref}`.quiet()
-  } catch (error) {
-    logger.debug({ error, title }, 'cmux: skipped closing workspace')
-  }
-}
-
-/**
- * Parses `cmux list-workspaces` output and returns the workspace ref whose
- * title matches `title`, or undefined if no match. Both sides are compared via
- * {@link canonicalizeCmuxTitle} so a workspace stored under a drifted title
- * (whitespace, or an older CLI's `v`-prefixed semver) is still found — keeping
- * close symmetric with the cmux open dedup in `worktrees-reload`.
- *
- * Each line looks like:
- *   "  workspace:8  hulyo-monorepo 1.48.0"
- *   "* workspace:6  obsidian-workspace  [selected]"
- */
-const findWorkspaceRefByTitle = (output: string, title: string): string | undefined => {
-  const target = canonicalizeCmuxTitle(title)
-
-  for (const rawLine of output.split('\n')) {
-    // eslint-disable-next-line sonarjs/super-linear-regex, regexp/no-super-linear-backtracking
-    const match = rawLine.match(/^[* ]\s*(workspace:\d+)\s+(.+?)(?:\s+\[selected\])?\s*$/)
-
-    if (!match) {
-      continue
-    }
-
-    const ref = match[1]
-    const lineTitle = match[2]?.trim() ?? ''
-
-    if (canonicalizeCmuxTitle(lineTitle) === target) {
-      return ref
-    }
-  }
-
-  return undefined
-}

package/src/integrations/cmux/index.ts

@@ -1,5 +0,0 @@
-export { canonicalizeCmuxTitle } from './canonicalize-cmux-title'
-export { closeCmuxWorkspaceByTitle } from './close-workspace-by-title'
-export { listCmuxWorkspaceTitles } from './list-workspace-titles'
-export { openCmuxWorkspaceWithLayout } from './open-workspace-with-layout'
-export { buildCmuxWorkspaceTitle } from './workspace-title'

package/src/integrations/cmux/list-workspace-titles.ts

@@ -1,47 +0,0 @@
-import { $ } from 'zx'
-
-import { logger } from 'src/lib/logger'
-
-import { canonicalizeCmuxTitle } from './canonicalize-cmux-title'
-
-/**
- * Returns the set of **canonical** titles for all currently-open cmux
- * workspaces (see {@link canonicalizeCmuxTitle}). Keying on the canonical form
- * lets callers match a workspace even when its stored title drifted from the
- * title they rebuild (whitespace, or an older CLI's `v`-prefixed semver).
- * Returns an empty set if cmux isn't running, the call fails, or the output
- * can't be parsed — callers should treat "empty" as "unknown, proceed as if
- * nothing is open".
- *
- * Each line of `cmux list-workspaces` looks like:
- *   "  workspace:8  hulyo-monorepo 1.48.0"
- *   "* workspace:6  obsidian-workspace  [selected]"
- */
-export const listCmuxWorkspaceTitles = async (): Promise<Set<string>> => {
-  try {
-    const output = (await $`cmux list-workspaces`.quiet()).stdout
-
-    const titles = new Set<string>()
-
-    for (const rawLine of output.split('\n')) {
-      // eslint-disable-next-line sonarjs/super-linear-regex, regexp/no-super-linear-backtracking
-      const match = rawLine.match(/^[* ]\s*workspace:\d+\s+(.+?)(?:\s+\[selected\])?\s*$/)
-
-      if (!match) {
-        continue
-      }
-
-      const title = match[1]?.trim()
-
-      if (title) {
-        titles.add(canonicalizeCmuxTitle(title))
-      }
-    }
-
-    return titles
-  } catch (error) {
-    logger.debug({ error }, 'cmux: skipped listing workspace titles')
-
-    return new Set()
-  }
-}