@iloom/cli 0.10.0 → 0.10.1

package/dist/prompts/swarm-orchestrator-prompt.txt

@@ -8,6 +8,12 @@ You are running with `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`. You have access t
 
 **This is a fully autonomous workflow. Do NOT pause for user input, call AskUserQuestion, or wait for human checkpoints at any point.**
 
+### Orchestrator Discipline: Stay Lean
+
+You are a **coordinator**, not an executor. Your job is to schedule work, track state, and make decisions -- NOT to run heavy operations directly. All git operations (rebasing, merging, committing, pushing, conflict resolution) and any other code-level work MUST be delegated to subagents via the `Task` tool. The only commands you should run directly are lightweight reads: `cat` for metadata files, `git log`/`git status` for state checks, and `il cleanup` for worktree management.
+
+**Why:** Running heavy operations in the orchestrator bloats its context window, risks mid-operation failures that are harder to recover from, and mixes coordination concerns with execution concerns. Subagents are disposable -- if one fails, the orchestrator can reason about the failure and retry or fail gracefully without losing its own state.
+
 ---
 
 ## Loom Recap
@@ -162,42 +168,16 @@ For each child issue, use these parameters:
 - `team_name`: `"swarm-epic-{{EPIC_ISSUE_NUMBER}}"`
 - `name`: `"issue-<child-number>"`
 
-The prompt for each child agent should be:
-
-```
-You are working on issue #<child-number>: "<child-title>"
-
-**Worktree path:** `<child-worktree-path>`
-
-IMPORTANT: You MUST work in this worktree path. cd to it first before doing anything:
-cd <child-worktree-path>
+**CRITICAL: The task prompt MUST contain only the issue number and worktree path. Do NOT include the issue title, issue body, analysis, planning details, implementation instructions, code snippets, or any other content from CHILD_ISSUES. The child agent retrieves all issue context itself via `mcp__issue_management__get_issue` as its first action.**
 
-All file reads, writes, searches, and git operations must happen within this directory. Do NOT work in the epic worktree or any other child's worktree.
+The prompt for each child agent should be exactly:
 
-## Strict Boundaries
-
-- You are ONLY responsible for issue #<child-number>. Do not implement, fix, commit, or merge work for any other issue.
-- NEVER cd into, read from, or modify files in any other worktree path. Your entire scope is `<child-worktree-path>`.
-- Do NOT merge branches, close issues, or perform any orchestration tasks. The orchestrator handles all merging and issue management.
-- Do NOT pick up tasks from the team task list. You have exactly one job.
-
-**Issue body:**
-<child-issue-body>
-
-Implement this issue following your workflow instructions.
-
-## After Completion
-
-When your implementation is done, report back with:
-- Issue number
-- Status (success or failed)
-- Brief summary of what was implemented or what went wrong
-- Number of files changed (if successful)
-
-After sending your report, STOP. Do not look for more work. Do not check on other issues. Do not attempt to help with other worktrees. Wait for a shutdown request and approve it.
+```
+Issue: #<child-number>
+Worktree: <child-worktree-path>
 ```
 
-Note: The child issue body is available directly in the `CHILD_ISSUES` template data above (each entry has a `body` field). Make sure to include it in the Task prompt for each child.
+Nothing else. No title. No body. No instructions. No context. The child's system prompt defines everything it needs to do.
 
 Update each child's tracking status to `in_progress`.
 
@@ -213,35 +193,54 @@ This is the core orchestration loop. After spawning initial agents, monitor for
 
 When a child agent reports back with status `success` (or goes idle after completing its tasks):
 
-#### Step 3.1: Merge the Child's Branch
+#### Step 3.1: Rebase and Merge the Child's Branch
 
-Rebase the child branch onto the epic branch from the child's worktree, then fast-forward merge from the epic worktree. You must run the rebase from the child's worktree because that's where the child branch is checked out — git will refuse to rebase a branch that's checked out in another worktree.
+**Delegate this entire operation to a subagent.** Do NOT run git rebase, merge, or conflict resolution commands directly in the orchestrator.
+
+Spawn a subagent using the `Task` tool:
+- `subagent_type`: `"general-purpose"`
+- Prompt:
 
-```bash
-cd <child-worktree-path>
-git rebase epic/{{EPIC_ISSUE_NUMBER}}
-cd {{EPIC_WORKTREE_PATH}}
-git merge --ff-only <child-branch-name>
 ```
+Rebase and merge child branch `<child-branch-name>` (issue #<child-number>: "<child-title>") into the epic branch.
 
-Where `<child-worktree-path>` and `<child-branch-name>` are from the child's entry in `CHILD_ISSUES`.
+## Instructions
 
-**Important**: Use rebase + fast-forward merge, NOT merge commits. This keeps the epic branch history linear and clean.
+1. Rebase the child branch onto the epic branch FROM THE CHILD'S WORKTREE (git refuses to rebase a branch checked out in another worktree):
+   ```bash
+   cd <child-worktree-path>
+   git rebase epic/{{EPIC_ISSUE_NUMBER}}
+   ```
 
-#### Step 3.2: Handle Rebase Conflicts
+2. If the rebase has conflicts, resolve them:
+   - Understand the intent of both sides
+   - Stage resolved files with `git add`
+   - Run `git rebase --continue`
+   - Repeat for any remaining conflicts
+   - Ensure the code compiles after resolution
 
-If the rebase has conflicts:
+3. After the rebase succeeds, fast-forward merge from the epic worktree:
+   ```bash
+   cd {{EPIC_WORKTREE_PATH}}
+   git merge --ff-only <child-branch-name>
+   ```
+
+4. Report back with:
+   - Status: "success" or "failed"
+   - If conflicts were resolved, briefly describe what was resolved
+   - If failed, explain why (e.g., "Rebase conflict could not be resolved" or specific error)
+
+IMPORTANT: Use rebase + fast-forward merge, NOT merge commits. This keeps the epic branch history linear and clean.
+```
 
-1. **Attempt automatic resolution**: Spawn a subagent to resolve the conflicts:
-   - `subagent_type`: `"general-purpose"`
-   - Prompt: "There are rebase conflicts while rebasing branch `<child-branch-name>` (issue #<child-number>: '<child-title>') onto the epic branch in `{{EPIC_WORKTREE_PATH}}`. Please resolve the conflicts by understanding the intent of both sides, stage the resolved files with `git add`, and run `git rebase --continue`. Ensure the code compiles after resolution."
-2. If the subagent resolves the conflicts: proceed with the fast-forward merge, then Step 3.3
-3. If the subagent fails to resolve:
-   - Abort the rebase: `git rebase --abort`
-   - Mark the child as `failed` with reason: "Rebase conflict could not be resolved"
-   - Skip to Phase 4 failure handling for this child
+**Handle the subagent result:**
+- If the subagent reports `success`: proceed to Step 3.2
+- If the subagent reports `failed`:
+  - Ensure the rebase is aborted (spawn another subagent if needed): `cd <child-worktree-path> && git rebase --abort`
+  - Mark the child as `failed` with reason from the subagent's report
+  - Skip to Phase 4 failure handling for this child
 
-#### Step 3.3: Ensure Completion Comment Exists
+#### Step 3.2: Ensure Completion Comment Exists
 
 Child agents are expected to post a summary comment on their issue when they finish. However, if a child agent completes without posting a comment, the orchestrator must post one on its behalf.
 
@@ -252,7 +251,7 @@ Child agents are expected to post a summary comment on their issue when they fin
    - `body`: A summary including: what was implemented, the branch name, and that it was merged into the epic branch
 3. Log any new comment as an artifact: Call `mcp__recap__add_artifact` with `{ type: "comment", primaryUrl: "<comment-url>", description: "Completion comment for #<child-number>", worktreePath: "<child-worktree-path>" }`
 
-#### Step 3.4: Update State
+#### Step 3.3: Update State
 
 1. Update the child's tracking status to `done`
 2. Update the child's loom state: Call `mcp__recap__set_loom_state` with `{ state: "done", worktreePath: "<child-worktree-path>" }`
@@ -261,22 +260,32 @@ Child agents are expected to post a summary comment on their issue when they fin
 
 {{#if DRAFT_PR_MODE}}
 {{#if AUTO_COMMIT_PUSH}}
-#### Step 3.4.5: Push Epic Branch to Remote (Incremental)
+#### Step 3.3.5: Push Epic Branch to Remote (Incremental)
+
+**Delegate this to a subagent.** After each successful child merge, push the epic branch to remote so the draft PR reflects incremental progress.
 
-After each successful child merge, push the epic branch to remote so the draft PR reflects incremental progress.
+Spawn a subagent using the `Task` tool:
+- `subagent_type`: `"general-purpose"`
+- Prompt:
+
+```
+Push the epic branch to remote from the epic worktree.
 
 ```bash
 cd {{EPIC_WORKTREE_PATH}}
 git push --force-with-lease {{GIT_REMOTE}} HEAD
 ```
 
-**NOTE**: `--force-with-lease` is required because the remote branch may still have the placeholder commit (on first push) or because the history was rewritten by a previous force push.
+NOTE: --force-with-lease is required because the remote branch may still have the placeholder commit (on first push) or because the history was rewritten by a previous force push.
+
+Report back with status: "success" or "failed" and any error output.
+```
 
-**Error handling**: If the push fails, log the error and continue. Do NOT fail the swarm or skip remaining children. The work is committed locally and will be pushed either by a later successful push or by `il finish`.
+**Error handling**: If the subagent reports a push failure, log the error and continue. Do NOT fail the swarm or skip remaining children. The work is committed locally and will be pushed either by a later successful push or by `il finish`.
 
 {{/if}}
 {{/if}}
-#### Step 3.4.6: Clean Up Child Worktree
+#### Step 3.3.6: Clean Up Child Worktree
 
 {{#unless NO_CLEANUP}}
 After the child's state is updated to `done`, clean up its worktree and archive its metadata by running `il cleanup --archive`. Since the child's work is already rebased and merged into the epic branch, we only need to remove the worktree and branch while preserving metadata.
@@ -294,7 +303,7 @@ If the `il cleanup` command fails, log the error but continue with the orchestra
 **Note:** Child loom cleanup is disabled (`--skip-cleanup` flag). Child worktrees will be preserved after the swarm completes.
 {{/if}}
 
-#### Step 3.5: Check for Newly Unblocked Issues
+#### Step 3.4: Check for Newly Unblocked Issues
 
 After a child completes:
 1. Remove the completed child's issue number from all other children's `blockedBy` lists
@@ -357,7 +366,14 @@ Use `TeamDelete` to clean up the team `swarm-epic-{{EPIC_ISSUE_NUMBER}}`.
 
 ### Step 5.3: Final Commit on Epic Branch
 
-If at least one child succeeded, create a final commit on the epic branch that fixes the epic issue. This ensures the epic issue is automatically closed when the PR is merged.
+If at least one child succeeded, **delegate the final commit to a subagent.**
+
+Spawn a subagent using the `Task` tool:
+- `subagent_type`: `"general-purpose"`
+- Prompt:
+
+```
+Create the final commit on the epic branch that closes the epic issue.
 
 ```bash
 cd {{EPIC_WORKTREE_PATH}}
@@ -365,36 +381,47 @@ git add -A
 git commit --allow-empty -m "Fixes {{ISSUE_PREFIX}}{{EPIC_ISSUE_NUMBER}}"
 ```
 
-Note: `--allow-empty` is used because the child branches have already been merged — there may be no additional staged changes, but we still need the commit message trailer to trigger issue closure.
+NOTE: --allow-empty is used because the child branches have already been merged — there may be no additional staged changes, but we still need the commit message to trigger issue closure.
+
+Report back with status: "success" or "failed" and the commit hash if successful.
+```
 
 {{#if DRAFT_PR_MODE}}
 {{#if AUTO_COMMIT_PUSH}}
 ### Step 5.3.5: Push Epic Branch to Remote (Final Commit)
 
-After the final "Fixes" commit, push the epic branch to remote so the draft PR includes the issue-closing trailer.
+After the final "Fixes" commit, push the epic branch to remote so the draft PR includes the issue-closing trailer. **Delegate this to a subagent.**
 
-**Note**: Incremental pushes in Step 3.4.5 should have already pushed merged child work. This final push adds the "Fixes" commit.
+**Note**: Incremental pushes in Step 3.3.5 should have already pushed merged child work. This final push adds the "Fixes" commit.
 
-1. **Check if push is needed:**
-   ```bash
-   cd {{EPIC_WORKTREE_PATH}}
-   git log -1 --format=%s
-   ```
-   - If the latest commit message starts with `[iloom-placeholder]` or `[iloom] Temporary`, no children succeeded. Skip the push.
+First, check if push is needed (this is a lightweight read, OK to do directly):
+```bash
+cd {{EPIC_WORKTREE_PATH}}
+git log -1 --format=%s
+```
+- If the latest commit message starts with `[iloom-placeholder]` or `[iloom] Temporary`, no children succeeded. Skip the push.
 
-2. **Push to remote:**
-   ```bash
-   cd {{EPIC_WORKTREE_PATH}}
-   git push --force-with-lease {{GIT_REMOTE}} HEAD
-   ```
-   **NOTE**: `--force-with-lease` is required because the branch history includes rebased child commits.
+If a push is needed, spawn a subagent using the `Task` tool:
+- `subagent_type`: `"general-purpose"`
+- Prompt:
 
-3. **Handle errors gracefully:**
-   - If push fails: Log the error but do NOT fail the swarm. The work is committed locally and `il finish` will handle the push.
-   - Do NOT retry automatically.
+```
+Push the epic branch to remote (final commit with Fixes trailer).
+
+```bash
+cd {{EPIC_WORKTREE_PATH}}
+git push --force-with-lease {{GIT_REMOTE}} HEAD
+```
+
+NOTE: --force-with-lease is required because the branch history includes rebased child commits.
+
+Report back with status: "success" or "failed" and any error output.
+```
 
-4. **Notify completion:**
-   - Log: "Epic branch pushed to remote. Draft PR #{{DRAFT_PR_NUMBER}} updated with final commit."
+**Handle the subagent result:**
+- If push fails: Log the error but do NOT fail the swarm. The work is committed locally and `il finish` will handle the push.
+- Do NOT retry automatically.
+- If push succeeds: Log "Epic branch pushed to remote. Draft PR #{{DRAFT_PR_NUMBER}} updated with final commit."
 
 {{/if}}
 {{/if}}

package/dist/{rebase-DWIB77KV.js → rebase-6NVLX5V7.js}

@@ -2,23 +2,23 @@
 import {
   BuildRunner,
   MergeManager
-} from "./chunk-LXLMMXXY.js";
+} from "./chunk-5FJWO4IT.js";
 import {
   installDependencies
 } from "./chunk-WWKOVDWC.js";
 import {
   GitWorktreeManager
-} from "./chunk-VGGST52X.js";
+} from "./chunk-I5T677EA.js";
 import "./chunk-MORRVYPT.js";
 import "./chunk-YQ57ORTV.js";
-import "./chunk-ONQYPICO.js";
+import "./chunk-UR5DGNUO.js";
 import {
   getWorktreeRoot,
   isValidGitRepo
-} from "./chunk-MNHZB4Z2.js";
+} from "./chunk-4FGEGQW4.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import "./chunk-KB64WNBZ.js";
 import "./chunk-6MLEBAYZ.js";
 import {
@@ -93,9 +93,10 @@ var RebaseCommand = class {
     }
     const mergeOptions = {
       dryRun: options.dryRun ?? false,
-      force: options.force ?? false
+      force: options.force ?? false,
+      jsonStream: options.jsonStream ?? false
     };
-    await this.mergeManager.rebaseOnMain(worktreePath, mergeOptions);
+    const outcome = await this.mergeManager.rebaseOnMain(worktreePath, mergeOptions);
     if (!options.dryRun) {
       logger.info("Installing dependencies...");
       try {
@@ -109,6 +110,14 @@ var RebaseCommand = class {
       logger.info("[DRY RUN] Would install dependencies");
     }
     await this.runPostRebaseBuild(worktreePath, options);
+    if (options.jsonStream) {
+      return {
+        success: true,
+        conflictsDetected: outcome.conflictsDetected,
+        claudeLaunched: outcome.claudeLaunched,
+        conflictsResolved: outcome.conflictsResolved
+      };
+    }
   }
   /**
    * Run post-rebase build for CLI projects
@@ -139,4 +148,4 @@ export {
   RebaseCommand,
   WorktreeValidationError
 };
-//# sourceMappingURL=rebase-DWIB77KV.js.map
+//# sourceMappingURL=rebase-6NVLX5V7.js.map

package/dist/rebase-6NVLX5V7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/commands/rebase.ts"],"sourcesContent":["import { logger } from '../utils/logger.js'\nimport { MergeManager } from '../lib/MergeManager.js'\nimport { GitWorktreeManager } from '../lib/GitWorktreeManager.js'\nimport { SettingsManager } from '../lib/SettingsManager.js'\nimport { BuildRunner } from '../lib/BuildRunner.js'\nimport { isValidGitRepo, getWorktreeRoot } from '../utils/git.js'\nimport { installDependencies } from '../utils/package-manager.js'\nimport type { MergeOptions, RebaseResult } from '../types/index.js'\n\nexport interface RebaseOptions {\n\tforce?: boolean\n\tdryRun?: boolean\n\tjsonStream?: boolean\n}\n\n/**\n * Error thrown when the rebase command is run from an invalid location\n */\nexport class WorktreeValidationError extends Error {\n\tconstructor(\n\t\tmessage: string,\n\t\tpublic readonly suggestion: string\n\t) {\n\t\tsuper(message)\n\t\tthis.name = 'WorktreeValidationError'\n\t}\n}\n\n/**\n * RebaseCommand: Rebase current branch on main with Claude-assisted conflict resolution\n *\n * This command:\n * 1. Validates the current directory is an iloom-managed worktree\n * 2. Detects the worktree root (supports running from subdirectories)\n * 3. Delegates to MergeManager.rebaseOnMain() which handles:\n *    - Checking main branch exists\n *    - Detecting uncommitted changes (throws if found)\n *    - Checking if already up-to-date\n *    - Executing rebase\n *    - Claude-assisted conflict resolution\n * 4. Reports success\n */\nexport class RebaseCommand {\n\tprivate mergeManager: MergeManager\n\tprivate gitWorktreeManager: GitWorktreeManager\n\tprivate settingsManager: SettingsManager\n\tprivate buildRunner: BuildRunner\n\n\tconstructor(mergeManager?: MergeManager, gitWorktreeManager?: GitWorktreeManager, settingsManager?: SettingsManager, buildRunner?: BuildRunner) {\n\t\tthis.mergeManager = mergeManager ?? new MergeManager()\n\t\tthis.gitWorktreeManager = gitWorktreeManager ?? new GitWorktreeManager()\n\t\tthis.settingsManager = settingsManager ?? new SettingsManager()\n\t\tthis.buildRunner = buildRunner ?? new BuildRunner()\n\t}\n\n\t/**\n\t * Validate that the current directory is within an iloom-managed worktree\n\t * Returns the worktree root path if valid\n\t * @throws WorktreeValidationError if validation fails\n\t */\n\tprivate async validateWorktreeContext(): Promise<string> {\n\t\tconst currentDir = process.cwd()\n\n\t\t// Step 1: Check if we're in a git repository at all\n\t\tconst isGitRepo = await isValidGitRepo(currentDir)\n\t\tif (!isGitRepo) {\n\t\t\tthrow new WorktreeValidationError(\n\t\t\t\t'Not a git repository.',\n\t\t\t\t\"Run 'il rebase' from within an iloom worktree created by 'il start'.\"\n\t\t\t)\n\t\t}\n\n\t\t// Step 2: Get the worktree root (handles subdirectories)\n\t\tconst worktreeRoot = await getWorktreeRoot(currentDir)\n\t\tif (!worktreeRoot) {\n\t\t\tthrow new WorktreeValidationError(\n\t\t\t\t'Could not determine repository root.',\n\t\t\t\t\"Run 'il rebase' from within an iloom worktree created by 'il start'.\"\n\t\t\t)\n\t\t}\n\n\t\t// Step 3: Check if this path is a registered git worktree\n\t\tconst worktrees = await this.gitWorktreeManager.listWorktrees()\n\t\tconst currentWorktree = worktrees.find(wt => wt.path === worktreeRoot)\n\n\t\tif (!currentWorktree) {\n\t\t\tthrow new WorktreeValidationError(\n\t\t\t\t'This directory is not an iloom worktree.',\n\t\t\t\t\"Run 'il rebase' from within a worktree created by 'il start <issue>'. Use 'il list' to see available worktrees.\"\n\t\t\t)\n\t\t}\n\n\t\t// Step 4: Check if this is the main worktree (we shouldn't rebase from main)\n\t\tconst isMain = await this.gitWorktreeManager.isMainWorktree(currentWorktree, this.settingsManager)\n\t\tif (isMain) {\n\t\t\tthrow new WorktreeValidationError(\n\t\t\t\t'Cannot rebase from the main worktree.',\n\t\t\t\t\"Navigate to a feature worktree created by 'il start <issue>' and run 'il rebase' from there.\"\n\t\t\t)\n\t\t}\n\n\t\treturn worktreeRoot\n\t}\n\n\tasync execute(options: RebaseOptions = {}): Promise<RebaseResult | void> {\n\t\t// Set ILOOM=1 so hooks know this is an iloom session\n\t\tprocess.env.ILOOM = '1'\n\n\t\t// Step 1: Validate we're in a valid iloom worktree\n\t\tlet worktreePath: string\n\t\ttry {\n\t\t\tworktreePath = await this.validateWorktreeContext()\n\t\t} catch (error) {\n\t\t\tif (error instanceof WorktreeValidationError) {\n\t\t\t\tlogger.error(error.message)\n\t\t\t\tlogger.info(error.suggestion)\n\t\t\t\tthrow error\n\t\t\t}\n\t\t\tthrow error\n\t\t}\n\n\t\tconst mergeOptions: MergeOptions = {\n\t\t\tdryRun: options.dryRun ?? false,\n\t\t\tforce: options.force ?? false,\n\t\t\tjsonStream: options.jsonStream ?? false,\n\t\t}\n\n\t\t// MergeManager.rebaseOnMain() handles:\n\t\t// - Checking main branch exists\n\t\t// - Detecting uncommitted changes (throws if found)\n\t\t// - Checking if already up-to-date\n\t\t// - Executing rebase\n\t\t// - Claude-assisted conflict resolution\n\t\tconst outcome = await this.mergeManager.rebaseOnMain(worktreePath, mergeOptions)\n\n\t\t// Install dependencies after successful rebase\n\t\tif (!options.dryRun) {\n\t\t\tlogger.info('Installing dependencies...')\n\t\t\ttry {\n\t\t\t\tawait installDependencies(worktreePath, true, true) // frozen=true, quiet=true\n\t\t\t} catch (error) {\n\t\t\t\t// Log warning but don't fail - rebase succeeded, user can fix deps manually\n\t\t\t\tconst message = error instanceof Error ? error.message : 'Unknown error'\n\t\t\t\tlogger.warn(`Dependency installation failed: ${message}`)\n\t\t\t\tlogger.warn('Please run your package manager install command manually')\n\t\t\t}\n\t\t} else {\n\t\t\tlogger.info('[DRY RUN] Would install dependencies')\n\t\t}\n\n\t\t// Run build for CLI projects after successful rebase\n\t\tawait this.runPostRebaseBuild(worktreePath, options)\n\n\t\t// Return result if jsonStream mode\n\t\tif (options.jsonStream) {\n\t\t\treturn {\n\t\t\t\tsuccess: true,\n\t\t\t\tconflictsDetected: outcome.conflictsDetected,\n\t\t\t\tclaudeLaunched: outcome.claudeLaunched,\n\t\t\t\tconflictsResolved: outcome.conflictsResolved,\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Run post-rebase build for CLI projects\n\t * Non-blocking: build failures are logged as warnings but don't fail the rebase\n\t */\n\tprivate async runPostRebaseBuild(worktreePath: string, options: RebaseOptions): Promise<void> {\n\t\tif (options.dryRun) {\n\t\t\tlogger.info('[DRY RUN] Would run post-rebase build for CLI projects')\n\t\t\treturn\n\t\t}\n\n\t\ttry {\n\t\t\tconst buildResult = await this.buildRunner.runBuild(worktreePath, {\n\t\t\t\tdryRun: options.dryRun ?? false,\n\t\t\t})\n\n\t\t\tif (buildResult.skipped) {\n\t\t\t\tlogger.debug(`Build skipped: ${buildResult.reason}`)\n\t\t\t} else {\n\t\t\t\tlogger.success('Post-rebase build completed successfully')\n\t\t\t}\n\t\t} catch (error) {\n\t\t\t// Log warning but don't fail - rebase succeeded, user can fix build manually\n\t\t\tconst message = error instanceof Error ? error.message : 'Unknown error'\n\t\t\tlogger.warn(`Post-rebase build failed: ${message}`)\n\t\t\tlogger.warn('Please run the build command manually')\n\t\t}\n\t}\n}\n"],"mappings":"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","names":[]}

package/dist/{recap-MX63HAKV.js → recap-OMBOKJST.js}

@@ -4,15 +4,15 @@ import {
 } from "./chunk-NXMDEL3F.js";
 import {
   findArchivedRecap
-} from "./chunk-Y4YZTHZE.js";
+} from "./chunk-LUKXJSRI.js";
 import {
   IdentifierParser
-} from "./chunk-WY4QBK43.js";
+} from "./chunk-63QWFWH3.js";
 import {
   GitWorktreeManager
-} from "./chunk-VGGST52X.js";
-import "./chunk-MNHZB4Z2.js";
-import "./chunk-YYAKPQBT.js";
+} from "./chunk-I5T677EA.js";
+import "./chunk-4FGEGQW4.js";
+import "./chunk-7VHJNVLF.js";
 import "./chunk-KB64WNBZ.js";
 import "./chunk-6MLEBAYZ.js";
 import "./chunk-VT4PDUYT.js";
@@ -135,4 +135,4 @@ var RecapCommand = class {
 export {
   RecapCommand
 };
-//# sourceMappingURL=recap-MX63HAKV.js.map
+//# sourceMappingURL=recap-OMBOKJST.js.map

package/dist/{run-O3TFNQFC.js → run-BBXLRIZB.js}

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import {
   DevServerManager
-} from "./chunk-5MWV33NN.js";
-import "./chunk-ZEWU5PZK.js";
+} from "./chunk-CVCTIDDK.js";
+import "./chunk-G5V75JD5.js";
 import {
   getWorkspacePort
-} from "./chunk-3D7WQM7I.js";
+} from "./chunk-LLHXQS3C.js";
 import "./chunk-WWKOVDWC.js";
 import {
   IdentifierParser
-} from "./chunk-WY4QBK43.js";
+} from "./chunk-63QWFWH3.js";
 import {
   GitWorktreeManager
-} from "./chunk-VGGST52X.js";
+} from "./chunk-I5T677EA.js";
 import {
   openBrowser
 } from "./chunk-YETJNRQM.js";
@@ -25,10 +25,10 @@ import {
 } from "./chunk-GYCR2LOU.js";
 import {
   extractIssueNumber
-} from "./chunk-MNHZB4Z2.js";
+} from "./chunk-4FGEGQW4.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import "./chunk-KB64WNBZ.js";
 import "./chunk-6MLEBAYZ.js";
 import {
@@ -238,4 +238,4 @@ Make sure the project is built (run 'il start' first)`
 export {
   RunCommand
 };
-//# sourceMappingURL=run-O3TFNQFC.js.map
+//# sourceMappingURL=run-BBXLRIZB.js.map

package/dist/schema/settings.schema.json

@@ -197,6 +197,15 @@
                         ],
                         "description": "Claude model shorthand: sonnet, opus, or haiku"
                       },
+                      "swarmModel": {
+                        "type": "string",
+                        "enum": [
+                          "sonnet",
+                          "opus",
+                          "haiku"
+                        ],
+                        "description": "Model to use for this agent in swarm mode. Overrides the base model when running inside swarm workers."
+                      },
                       "enabled": {
                         "type": "boolean",
                         "description": "Whether this agent is enabled. Defaults to true."
@@ -233,6 +242,15 @@
                               ],
                               "description": "Claude model shorthand: sonnet, opus, or haiku"
                             },
+                            "swarmModel": {
+                              "type": "string",
+                              "enum": [
+                                "sonnet",
+                                "opus",
+                                "haiku"
+                              ],
+                              "description": "Model to use for this agent in swarm mode. Overrides the base model when running inside swarm workers."
+                            },
                             "enabled": {
                               "type": "boolean",
                               "description": "Whether this agent is enabled. Defaults to true."
@@ -258,7 +276,14 @@
                           },
                           "additionalProperties": false
                         },
-                        "description": "Nested per-agent model overrides for swarm mode. Configure under agents.iloom-swarm-worker.agents.<agent-name>.model to set a different model for phase agents when running inside swarm workers. Fallback chain: swarm-specific agent model > explicit swarm worker model > base agent model. Only meaningful under the iloom-swarm-worker agent entry."
+                        "description": "Nested per-agent settings. Only meaningful under the iloom-swarm-worker agent entry for sub-agent timeout configuration."
+                      },
+                      "subAgentTimeout": {
+                        "type": "number",
+                        "minimum": 1,
+                        "maximum": 120,
+                        "default": 10,
+                        "description": "Timeout in minutes for sub-agent claude -p invocations in swarm mode. Applies to each phase agent (evaluator, analyzer, planner, implementer) when invoked via the Bash tool. Default: 10 minutes. Only meaningful under the iloom-swarm-worker agent entry."
                       }
                     },
                     "additionalProperties": false
@@ -270,7 +295,7 @@
               "type": "null"
             }
           ],
-          "description": "Per-agent configuration overrides. Available agents: iloom-issue-analyzer (analyzes issues), iloom-issue-planner (creates implementation plans), iloom-issue-analyze-and-plan (combined analysis and planning), iloom-issue-complexity-evaluator (evaluates complexity), iloom-issue-enhancer (enhances issue descriptions), iloom-issue-implementer (implements code changes), iloom-code-reviewer (reviews code changes against requirements), iloom-artifact-reviewer (reviews artifacts before posting), iloom-swarm-worker (swarm worker agent, dynamically generated). The iloom-swarm-worker agent supports a nested \"agents\" sub-record for configuring phase agent models specifically in swarm mode."
+          "description": "Per-agent configuration overrides. Available agents: iloom-issue-analyzer (analyzes issues), iloom-issue-planner (creates implementation plans), iloom-issue-analyze-and-plan (combined analysis and planning), iloom-issue-complexity-evaluator (evaluates complexity), iloom-issue-enhancer (enhances issue descriptions), iloom-issue-implementer (implements code changes), iloom-code-reviewer (reviews code changes against requirements), iloom-artifact-reviewer (reviews artifacts before posting), iloom-swarm-worker (swarm worker agent, dynamically generated). Use swarmModel on any agent to override its model in swarm mode."
         },
         "spin": {
           "type": "object",
@@ -284,6 +309,15 @@
               ],
               "default": "opus",
               "description": "Claude model shorthand for spin orchestrator"
+            },
+            "swarmModel": {
+              "type": "string",
+              "enum": [
+                "sonnet",
+                "opus",
+                "haiku"
+              ],
+              "description": "Model for the spin orchestrator when running in swarm mode. Overrides spin.model for swarm workflows."
             }
           },
           "additionalProperties": false,

package/dist/{shell-G6VC2CYR.js → shell-RF7LTND5.js}

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   IdentifierParser
-} from "./chunk-WY4QBK43.js";
+} from "./chunk-63QWFWH3.js";
 import {
   GitWorktreeManager
-} from "./chunk-VGGST52X.js";
+} from "./chunk-I5T677EA.js";
 import {
   extractIssueNumber
-} from "./chunk-MNHZB4Z2.js";
+} from "./chunk-4FGEGQW4.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import {
   MetadataManager
 } from "./chunk-KB64WNBZ.js";
@@ -242,4 +242,4 @@ var ShellCommand = class {
 export {
   ShellCommand
 };
-//# sourceMappingURL=shell-G6VC2CYR.js.map
+//# sourceMappingURL=shell-RF7LTND5.js.map

package/dist/{summary-FWHAX55O.js → summary-WTQZ7XG2.js}

@@ -1,26 +1,26 @@
 #!/usr/bin/env node
 import {
   SessionSummaryService
-} from "./chunk-6EU6TCF6.js";
+} from "./chunk-EVPZFV3K.js";
 import "./chunk-NXMDEL3F.js";
 import {
   PRManager
-} from "./chunk-ZW2LKWWE.js";
-import "./chunk-JO2LZ6EQ.js";
+} from "./chunk-KVHIAWVT.js";
+import "./chunk-SWSJWA2S.js";
 import "./chunk-4232AHNQ.js";
 import {
   GitWorktreeManager
-} from "./chunk-VGGST52X.js";
+} from "./chunk-I5T677EA.js";
 import "./chunk-YETJNRQM.js";
 import "./chunk-FXDYIV3K.js";
-import "./chunk-ONQYPICO.js";
-import "./chunk-4WJNIR5O.js";
+import "./chunk-UR5DGNUO.js";
+import "./chunk-UUEW5KWB.js";
 import {
   extractIssueNumber
-} from "./chunk-MNHZB4Z2.js";
+} from "./chunk-4FGEGQW4.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import {
   MetadataManager
 } from "./chunk-KB64WNBZ.js";
@@ -282,4 +282,4 @@ Please provide an issue number, PR number, or branch name.`
 export {
   SummaryCommand
 };
-//# sourceMappingURL=summary-FWHAX55O.js.map
+//# sourceMappingURL=summary-WTQZ7XG2.js.map

package/dist/{test-F7JNJZYP.js → test-SGO6I5Z7.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   ScriptCommandBase
-} from "./chunk-NRSWLOAZ.js";
+} from "./chunk-WXIM2WS7.js";
 import "./chunk-WWKOVDWC.js";
-import "./chunk-WY4QBK43.js";
-import "./chunk-VGGST52X.js";
+import "./chunk-63QWFWH3.js";
+import "./chunk-I5T677EA.js";
 import "./chunk-YQ57ORTV.js";
-import "./chunk-MNHZB4Z2.js";
-import "./chunk-YYAKPQBT.js";
+import "./chunk-4FGEGQW4.js";
+import "./chunk-7VHJNVLF.js";
 import "./chunk-KB64WNBZ.js";
 import "./chunk-6MLEBAYZ.js";
 import "./chunk-VT4PDUYT.js";
@@ -24,4 +24,4 @@ var TestCommand = class extends ScriptCommandBase {
 export {
   TestCommand
 };
-//# sourceMappingURL=test-F7JNJZYP.js.map
+//# sourceMappingURL=test-SGO6I5Z7.js.map

package/dist/{test-git-BTAOIUE2.js → test-git-XM4TM65W.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   findMainWorktreePath
-} from "./chunk-MNHZB4Z2.js";
+} from "./chunk-4FGEGQW4.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import "./chunk-KB64WNBZ.js";
 import "./chunk-6MLEBAYZ.js";
 import {
@@ -51,4 +51,4 @@ var TestGitCommand = class {
 export {
   TestGitCommand
 };
-//# sourceMappingURL=test-git-BTAOIUE2.js.map
+//# sourceMappingURL=test-git-XM4TM65W.js.map

package/dist/{test-jira-CHYNV33F.js → test-jira-LDTOYFSD.js}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   IssueManagementProviderFactory
-} from "./chunk-JO2LZ6EQ.js";
+} from "./chunk-SWSJWA2S.js";
 import "./chunk-4232AHNQ.js";
 import {
   SettingsManager
-} from "./chunk-YYAKPQBT.js";
+} from "./chunk-7VHJNVLF.js";
 import "./chunk-HEXKPKCK.js";
 import "./chunk-VG45TUYK.js";
 import "./chunk-6MLEBAYZ.js";
@@ -93,4 +93,4 @@ var TestJiraCommand = class {
 export {
   TestJiraCommand
 };
-//# sourceMappingURL=test-jira-CHYNV33F.js.map
+//# sourceMappingURL=test-jira-LDTOYFSD.js.map