infra-kit 0.1.117 → 0.1.121

package/dist/cli.js

@@ -1,4 +1,4 @@
-import{A as de,B as me,C as le,D as pe,E as fe,F as ue,G as ge,H as ve,I as ye,J as he,K as we,L as ke,M as Ce,N as Ae,O as xe,P as _,Q as Ee,R as Se,S as Re,T as Le,U as be,W as j,a as U,d as a,e as B,f as T,g as z,h as Y,i as h,j as u,k as D,l as q,m as Q,n as I,o as X,p as Z,q as ee,r as oe,s as te,t as re,u as ne,v as ie,w as C,x as ae,y as se,z as ce}from"./chunk-FEGOOVZE.js";import{e as $}from"./chunk-WA4BQRDC.js";import vo,{Separator as x}from"@inquirer/select";import{Command as yo}from"commander";import w from"node:process";import N from"node:fs/promises";import Xe from"node:path";import je from"node:process";import{$ as Ze}from"zx";var O=async()=>{let e=await T(),o=await Promise.all([{label:"project (committed)",path:e.main},{label:"user global",path:e.userGlobal},{label:"user project",path:e.userProject}].map(async r=>({...r,exists:await h(r.path)})));a.info(`Project name: ${e.projectName}
+import{A as de,B as me,C as le,D as pe,E as fe,F as ue,G as ge,H as ve,I as ye,J as he,K as we,L as ke,M as Ce,N as Ae,O as xe,P as _,Q as Ee,R as Se,S as Re,T as Le,U as be,W as j,a as U,d as a,e as B,f as T,g as z,h as Y,i as h,j as u,k as D,l as q,m as Q,n as I,o as X,p as Z,q as ee,r as oe,s as te,t as re,u as ne,v as ie,w as C,x as ae,y as se,z as ce}from"./chunk-PWOX6B3T.js";import{e as $}from"./chunk-WA4BQRDC.js";import vo,{Separator as x}from"@inquirer/select";import{Command as yo}from"commander";import w from"node:process";import N from"node:fs/promises";import Xe from"node:path";import je from"node:process";import{$ as Ze}from"zx";var O=async()=>{let e=await T(),o=await Promise.all([{label:"project (committed)",path:e.main},{label:"user global",path:e.userGlobal},{label:"user project",path:e.userProject}].map(async r=>({...r,exists:await h(r.path)})));a.info(`Project name: ${e.projectName}
 `),a.info(`Config merge chain (later overrides earlier):
 `);for(let r of o){let c=r.exists?"  [\u2713]":"  [ ]";a.info(`${c} ${r.label.padEnd(22)} ${u(r.path)}`)}let t={projectName:e.projectName,layers:o.map(r=>({label:r.label,path:r.path,exists:r.exists}))};return{content:[{type:"text",text:JSON.stringify(t,null,2)}],structuredContent:t}},M=async()=>{let e=await T(),o=je.env.EDITOR||je.env.VISUAL||"vi";if(await N.mkdir(Xe.dirname(e.userProject),{recursive:!0}),!await h(e.userProject)){let r=eo(e.userProject);await N.writeFile(e.userProject,`{}
 `,"utf-8"),await N.writeFile(r,oo(e.projectName),"utf-8"),a.info(`Created ${u(e.userProject)} \u2014 see ${u(r)} for the annotated reference.`)}a.info(`Opening ${u(e.userProject)} in ${o}`),await Ze({stdio:"inherit"})`${o} ${e.userProject}`,Y();let t={path:e.userProject,editor:o};return{content:[{type:"text",text:JSON.stringify(t,null,2)}],structuredContent:t}},eo=e=>e.replace(/\.json$/,".example.jsonc"),oo=e=>`// infra-kit user override for ${e} \u2014 ~/.infra-kit/projects/${e}/infra-kit.json

package/dist/mcp.js

@@ -1,2 +1,2 @@
-import{V as m,b as s,c as p,d as c}from"./chunk-FEGOOVZE.js";import"./chunk-WA4BQRDC.js";import{StdioServerTransport as g}from"@modelcontextprotocol/sdk/server/stdio.js";import h from"node:process";import o from"node:process";var l=r=>{o.on("SIGINT",()=>{r.info({msg:"Received SIGINT. Shutting down..."}),o.exit(0)}),o.on("SIGTERM",()=>{r.info({msg:"Received SIGTERM. Shutting down..."}),o.exit(0)}),o.on("uncaughtException",e=>{r.fatal({err:e,msg:"Uncaught Exception"}),r.error(`Uncaught Exception! Check ${s}. Shutting down...`),r.flush(),o.exit(1)}),o.on("unhandledRejection",(e,n)=>{r.fatal({reason:e,promise:n,msg:"Unhandled Rejection"}),r.error(`Unhandled Rejection! Check ${s}. Shutting down...`),r.flush(),o.exit(1)})};import{McpServer as x}from"@modelcontextprotocol/sdk/server/mcp.js";var d=async r=>{};var u=async r=>{};var a=r=>async e=>{let{toolName:n,handler:S}=r;c.info({msg:`Tool execution started: ${n}`,params:e});try{let i=await S({...e,confirmedCommand:!0});return c.info({msg:`Tool execution successful: ${n}`}),i}catch(i){throw c.error({err:i,params:e,msg:`Tool execution failed: ${n}`}),i}};var f=async r=>{for(let e of m())r.registerTool(e.name,{description:e.description,inputSchema:e.inputSchema,outputSchema:e.outputSchema},a({toolName:e.name,handler:e.handler}))};async function v(){let r=new x({name:"infra-kit",version:"1.0.0"},{capabilities:{resources:{},tools:{},prompts:{}}});return await d(r),await u(r),await f(r),r}var t=p(),T=async()=>{let r;try{r=await v(),t.info("MCP Server instance created")}catch(e){t.error({err:e,msg:"Failed to create MCP server"}),t.error("Fatal error during server creation."),h.exit(1)}try{let e=new g;await r.connect(e),t.info({msg:"Server connected to transport. Ready."})}catch(e){t.error({err:e,msg:"Failed to initialize server"}),t.error("Fatal error during server transport init."),h.exit(1)}};l(t);T();
+import{V as m,b as s,c as p,d as c}from"./chunk-PWOX6B3T.js";import"./chunk-WA4BQRDC.js";import{StdioServerTransport as g}from"@modelcontextprotocol/sdk/server/stdio.js";import h from"node:process";import o from"node:process";var l=r=>{o.on("SIGINT",()=>{r.info({msg:"Received SIGINT. Shutting down..."}),o.exit(0)}),o.on("SIGTERM",()=>{r.info({msg:"Received SIGTERM. Shutting down..."}),o.exit(0)}),o.on("uncaughtException",e=>{r.fatal({err:e,msg:"Uncaught Exception"}),r.error(`Uncaught Exception! Check ${s}. Shutting down...`),r.flush(),o.exit(1)}),o.on("unhandledRejection",(e,n)=>{r.fatal({reason:e,promise:n,msg:"Unhandled Rejection"}),r.error(`Unhandled Rejection! Check ${s}. Shutting down...`),r.flush(),o.exit(1)})};import{McpServer as x}from"@modelcontextprotocol/sdk/server/mcp.js";var d=async r=>{};var u=async r=>{};var a=r=>async e=>{let{toolName:n,handler:S}=r;c.info({msg:`Tool execution started: ${n}`,params:e});try{let i=await S({...e,confirmedCommand:!0});return c.info({msg:`Tool execution successful: ${n}`}),i}catch(i){throw c.error({err:i,params:e,msg:`Tool execution failed: ${n}`}),i}};var f=async r=>{for(let e of m())r.registerTool(e.name,{description:e.description,inputSchema:e.inputSchema,outputSchema:e.outputSchema},a({toolName:e.name,handler:e.handler}))};async function v(){let r=new x({name:"infra-kit",version:"1.0.0"},{capabilities:{resources:{},tools:{},prompts:{}}});return await d(r),await u(r),await f(r),r}var t=p(),T=async()=>{let r;try{r=await v(),t.info("MCP Server instance created")}catch(e){t.error({err:e,msg:"Failed to create MCP server"}),t.error("Fatal error during server creation."),h.exit(1)}try{let e=new g;await r.connect(e),t.info({msg:"Server connected to transport. Ready."})}catch(e){t.error({err:e,msg:"Failed to initialize server"}),t.error("Fatal error during server transport init."),h.exit(1)}};l(t);T();
 //# sourceMappingURL=mcp.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.117",
+  "version": "0.1.121",
   "description": "infra-kit",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/.omc/state/agent-replay-707b4784-2117-4b19-ae68-68a031f0d76d.jsonl

@@ -0,0 +1,2 @@
+{"t":0,"agent":"ab0bb13","agent_type":"architect","event":"agent_start","parent_mode":"none"}
+{"t":0,"agent":"ab0bb13","agent_type":"architect","event":"agent_stop","success":true,"duration_ms":146258}

package/src/.omc/state/sessions/707b4784-2117-4b19-ae68-68a031f0d76d/last-tool-error-state.json

@@ -0,0 +1,7 @@
+{
+  "tool_name": "Bash",
+  "tool_input_preview": "{\"command\":\"cd /Users/arthur/projects/infra-kit && rtk grep -rn \\\"WORKTREES_DIR_SUFFIX\\\" apps/infra-kit/cli/src/lib/constants.ts\",\"description\":\"Verify constants.ts line for suffix\"}",
+  "error": "Exit code 2\ngrep: apps/infra-kit/cli/src/lib/constants.ts: No such file or directory",
+  "timestamp": "2026-06-30T06:08:21.827Z",
+  "retry_count": 1
+}

package/src/.omc/state/sessions/707b4784-2117-4b19-ae68-68a031f0d76d/mission-state.json

@@ -0,0 +1,53 @@
+{
+  "updatedAt": "2026-06-30T06:10:31.962Z",
+  "missions": [
+    {
+      "id": "session:707b4784-2117-4b19-ae68-68a031f0d76d:none",
+      "source": "session",
+      "name": "none",
+      "objective": "Session mission",
+      "createdAt": "2026-06-30T06:08:05.704Z",
+      "updatedAt": "2026-06-30T06:10:31.962Z",
+      "status": "done",
+      "workerCount": 1,
+      "taskCounts": {
+        "total": 1,
+        "pending": 0,
+        "blocked": 0,
+        "inProgress": 0,
+        "completed": 1,
+        "failed": 0
+      },
+      "agents": [
+        {
+          "name": "architect:ab0bb13",
+          "role": "architect",
+          "ownership": "ab0bb13a5e2ee0436",
+          "status": "done",
+          "currentStep": null,
+          "latestUpdate": "completed",
+          "completedSummary": null,
+          "updatedAt": "2026-06-30T06:10:31.962Z"
+        }
+      ],
+      "timeline": [
+        {
+          "id": "session-start:ab0bb13a5e2ee0436:2026-06-30T06:08:05.704Z",
+          "at": "2026-06-30T06:08:05.704Z",
+          "kind": "update",
+          "agent": "architect:ab0bb13",
+          "detail": "started architect:ab0bb13",
+          "sourceKey": "session-start:ab0bb13a5e2ee0436"
+        },
+        {
+          "id": "session-stop:ab0bb13a5e2ee0436:2026-06-30T06:10:31.962Z",
+          "at": "2026-06-30T06:10:31.962Z",
+          "kind": "completion",
+          "agent": "architect:ab0bb13",
+          "detail": "completed",
+          "sourceKey": "session-stop:ab0bb13a5e2ee0436"
+        }
+      ]
+    }
+  ]
+}

package/src/.omc/state/sessions/707b4784-2117-4b19-ae68-68a031f0d76d/pre-tool-advisory-throttle.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "entries": {
+    "70618baf7ddd1c017d8e7ffe84ab90f8fa22ca1640c91f45c1731fe6330fc294": {
+      "last_emitted_at_ms": 1782799685575,
+      "message": "Spawning agent: oh-my-claudecode:architect (inherit) | Task: Architect review of worktree-folder plan"
+    },
+    "445ed27a3872b681d98190bae61ccb84954e1bc4e140df5370be958dee776b3a": {
+      "last_emitted_at_ms": 1782799670035,
+      "message": "Verify changes work after editing. Test functionality before marking complete."
+    },
+    "466399dafa2d20f60587180bad0a07358eb7f2bce724df0ff682f038ad33f5ad": {
+      "last_emitted_at_ms": 1782799612172,
+      "message": "Read multiple files in parallel when possible for faster analysis."
+    },
+    "79a93d4a2f8f50b95f852280616242fee1855dc99a3c75211917f55e72e95fae": {
+      "last_emitted_at_ms": 1782799606281,
+      "message": "Use parallel execution for independent tasks. Use run_in_background for long operations (npm install, builds, tests)."
+    }
+  },
+  "updated_at": "2026-06-30T06:08:05.575Z"
+}

package/src/.omc/state/sessions/707b4784-2117-4b19-ae68-68a031f0d76d/subagent-tracking-state.json

@@ -0,0 +1,17 @@
+{
+  "agents": [
+    {
+      "agent_id": "ab0bb13a5e2ee0436",
+      "agent_type": "oh-my-claudecode:architect",
+      "started_at": "2026-06-30T06:08:05.704Z",
+      "parent_mode": "none",
+      "status": "completed",
+      "completed_at": "2026-06-30T06:10:31.962Z",
+      "duration_ms": 146258
+    }
+  ],
+  "total_spawned": 1,
+  "total_completed": 1,
+  "total_failed": 0,
+  "last_updated": "2026-06-30T06:10:32.065Z"
+}

package/src/commands/worktrees-remove/worktrees-remove.ts

@@ -170,7 +170,7 @@ const logResults = (removed: string[]): void => {
 export const worktreesRemoveMcpTool = defineMcpTool({
   name: 'worktrees-remove',
   description:
-    'Remove local git worktrees for release branches. When everything is removed, also runs "git worktree prune" and deletes the worktrees directory. When invoked via MCP, pass either "versions" (comma-separated) or all=true — the branch picker is unreachable without a TTY, and the CLI confirmation is auto-skipped for MCP calls, so the caller is responsible for gating.',
+    'Remove local git worktrees for release branches. When everything is removed, also runs "git worktree prune" to clear stale metadata; the worktrees directory and its release/feature subfolders are left in place. When invoked via MCP, pass either "versions" (comma-separated) or all=true — the branch picker is unreachable without a TTY, and the CLI confirmation is auto-skipped for MCP calls, so the caller is responsible for gating.',
   inputSchema: {
     all: z
       .boolean()

package/src/lib/command-catalog/command-catalog.ts

@@ -98,8 +98,9 @@ export const commandCatalog: CommandCatalogEntry[] = [
   { cliName: 'worktrees-add', menuGroup: 'worktrees', mcpTool: worktreesAddMcpTool, mcpExposed: true },
   { cliName: 'worktrees-list', menuGroup: 'worktrees', mcpTool: worktreesListMcpTool, mcpExposed: true },
   { cliName: 'worktrees-reload', menuGroup: 'worktrees', mcpTool: worktreesReloadMcpTool, mcpExposed: true },
-  // worktrees-remove runs rm -rf on worktree dirs — genuinely irreversible, so
-  // it is CLI-only by design (mirrors the vendor-sync/manifest rationale).
+  // worktrees-remove runs `git worktree remove` on each leaf worktree —
+  // genuinely irreversible (uncommitted work is lost), so it is CLI-only by
+  // design (mirrors the vendor-sync/manifest rationale).
   { cliName: 'worktrees-remove', menuGroup: 'worktrees', mcpTool: worktreesRemoveMcpTool, mcpExposed: false },
   { cliName: 'worktrees-sync', menuGroup: 'worktrees', mcpTool: worktreesSyncMcpTool, mcpExposed: true },
 

package/src/lib/worktrees/__tests__/remove-worktrees.test.ts

@@ -0,0 +1,167 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { $ } from 'zx'
+
+import { removeWorktrees } from '../remove-worktrees'
+
+// `$` resolves to a bare awaitable result — removeWorktrees only ever `await`s
+// the tagged template (no `.quiet()`/`.nothrow()` chaining anymore), so a plain
+// resolved promise is a faithful stand-in.
+vi.mock('zx', () => {
+  return {
+    $: vi.fn(() => {
+      return Promise.resolve({ stdout: '', exitCode: 0 })
+    }),
+  }
+})
+
+vi.mock('src/integrations/cmux', () => {
+  return {
+    buildCmuxWorkspaceTitle: vi.fn(({ repoName, branch }: { repoName: string; branch: string }) => {
+      return `${repoName}:${branch}`
+    }),
+    closeCmuxWorkspaceByTitle: vi.fn(() => {
+      return Promise.resolve()
+    }),
+  }
+})
+
+vi.mock('src/lib/logger', () => {
+  return {
+    logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn() },
+  }
+})
+
+type DollarCall = [TemplateStringsArray, ...unknown[]]
+
+/** Reconstruct the full command string for a recorded `$` tagged-template call. */
+const commandOf = (call: DollarCall): string => {
+  const [strings, ...values] = call
+
+  return strings.reduce((acc, part, index) => {
+    const value = index < values.length ? String(values[index]) : ''
+
+    return acc + part + value
+  }, '')
+}
+
+/** Interpolated `${...}` arguments of a recorded `$` call (the dynamic paths). */
+const argsOf = (call: DollarCall): string[] => {
+  return call.slice(1).map((value) => {
+    return String(value)
+  })
+}
+
+const recordedCalls = (): DollarCall[] => {
+  return vi.mocked($).mock.calls as unknown as DollarCall[]
+}
+
+const WORKTREE_DIR = '/repos/hulyo-monorepo-worktrees'
+const REPO_NAME = 'hulyo-monorepo'
+
+describe('removeWorktrees', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('removes each leaf worktree and returns the removed branches', async () => {
+    const branches = ['release/1.2.5', 'feature/foo']
+
+    const removed = await removeWorktrees({ branches, worktreeDir: WORKTREE_DIR, repoName: REPO_NAME })
+
+    expect(removed).toEqual(branches)
+
+    const removeCommands = recordedCalls()
+      .map(commandOf)
+      .filter((command) => {
+        return command.startsWith('git worktree remove ')
+      })
+
+    expect(removeCommands).toContain(`git worktree remove ${WORKTREE_DIR}/release/1.2.5`)
+    expect(removeCommands).toContain(`git worktree remove ${WORKTREE_DIR}/feature/foo`)
+  })
+
+  it('never deletes the worktrees container or its group subdirs (regression)', async () => {
+    const branches = ['release/1.2.5', 'release/1.2.6']
+
+    await removeWorktrees({ branches, worktreeDir: WORKTREE_DIR, repoName: REPO_NAME, pruneFolder: true })
+
+    const calls = recordedCalls()
+    const commands = calls.map(commandOf)
+
+    // No destructive directory removal of any kind.
+    expect(
+      commands.some((command) => {
+        return command.includes('rm -rf')
+      }),
+    ).toBe(false)
+    expect(
+      commands.some((command) => {
+        return command.includes('rmdir')
+      }),
+    ).toBe(false)
+
+    // Invariant: no `$` call ever targets the bare parent worktreeDir as an
+    // interpolated argument — guards against any future deletion mechanism.
+    const targetsBareParent = calls.some((call) => {
+      return argsOf(call).includes(WORKTREE_DIR)
+    })
+
+    expect(targetsBareParent).toBe(false)
+  })
+
+  it('runs `git worktree prune` when pruneFolder is set and every branch was removed', async () => {
+    const branches = ['release/1.2.5']
+
+    await removeWorktrees({ branches, worktreeDir: WORKTREE_DIR, repoName: REPO_NAME, pruneFolder: true })
+
+    const prunedCalls = recordedCalls()
+      .map(commandOf)
+      .filter((command) => {
+        return command === 'git worktree prune'
+      })
+
+    expect(prunedCalls).toHaveLength(1)
+  })
+
+  it('does not run `git worktree prune` when pruneFolder is false', async () => {
+    const branches = ['release/1.2.5']
+
+    await removeWorktrees({ branches, worktreeDir: WORKTREE_DIR, repoName: REPO_NAME, pruneFolder: false })
+
+    const pruned = recordedCalls().map(commandOf).includes('git worktree prune')
+
+    expect(pruned).toBe(false)
+  })
+
+  it('skips `git worktree prune` when a branch removal fails (not every branch removed)', async () => {
+    const branches = ['release/1.2.5', 'release/1.2.6']
+
+    // Reject the `git worktree remove` for the second branch so it is not counted
+    // in `removed`, leaving `removed.length !== branches.length`. Cast the whole
+    // impl to `typeof $` since zx's `$` is a multi-overload callable.
+    const failingDollar = (strings: TemplateStringsArray, ...values: unknown[]) => {
+      const command = commandOf([strings, ...values])
+
+      if (command === `git worktree remove ${WORKTREE_DIR}/release/1.2.6`) {
+        return Promise.reject(new Error('uncommitted changes block removal'))
+      }
+
+      return Promise.resolve({ stdout: '', exitCode: 0 })
+    }
+
+    vi.mocked($).mockImplementation(failingDollar as unknown as typeof $)
+
+    const removed = await removeWorktrees({
+      branches,
+      worktreeDir: WORKTREE_DIR,
+      repoName: REPO_NAME,
+      pruneFolder: true,
+    })
+
+    expect(removed).toEqual(['release/1.2.5'])
+
+    const pruned = recordedCalls().map(commandOf).includes('git worktree prune')
+
+    expect(pruned).toBe(false)
+  })
+})

package/src/lib/worktrees/remove-worktrees.ts

@@ -16,9 +16,10 @@ interface RemoveWorktreesArgs {
  * returning the branches that were removed cleanly. Failures are logged but
  * never thrown, so a single bad worktree doesn't poison a batch removal.
  *
- * When `pruneFolder` is true and every branch was removed, also prune the
- * worktree metadata and delete the worktrees folder — used by the
- * `worktrees-remove` "all" path to leave the filesystem clean.
+ * When `pruneFolder` is true and every branch was removed, also run
+ * `git worktree prune` to clear stale worktree metadata. The `<repo>-worktrees`
+ * container directory and its `release/`/`feature/` subfolders are deliberately
+ * left in place so the per-repo worktree scaffold persists even when empty.
  */
 export const removeWorktrees = async (args: RemoveWorktreesArgs): Promise<string[]> => {
   const { branches, worktreeDir, repoName, pruneFolder = false } = args
@@ -53,27 +54,12 @@ export const removeWorktrees = async (args: RemoveWorktreesArgs): Promise<string
     }
   }
 
-  // `git worktree remove` only deletes the leaf worktree, leaving the group
-  // folder (e.g. `release/`, `feature/`) behind. Remove it when it's now empty;
-  // `rmdir` is a no-op when the folder still holds other worktrees.
-  const groupDirs = new Set<string>()
-
-  for (const branch of removed) {
-    if (branch.includes('/')) {
-      groupDirs.add(`${worktreeDir}/${branch.split('/')[0]}`)
-    }
-  }
-
-  for (const groupDir of groupDirs) {
-    await $`rmdir ${groupDir}`.nothrow()
-  }
-
+  // `git worktree remove` deletes only the leaf worktree. We intentionally leave
+  // the `<repo>-worktrees` container and its `release/`/`feature/` group folders
+  // in place so the worktree scaffold survives an empty state (it is recreated
+  // lazily by `worktrees-add` via `mkdir -p` regardless).
   if (pruneFolder && removed.length === branches.length) {
     await $`git worktree prune`
-    await $`rm -rf ${worktreeDir}`
-
-    logger.info(`🗑️ Removed worktree folder: ${worktreeDir}`)
-    logger.info('')
   }
 
   return removed