@iloom/cli 0.3.2 → 0.3.4

package/dist/cli.js

@@ -4,8 +4,9 @@ import {
   DatabaseManager,
   EnvironmentManager,
   LoomManager,
+  MetadataManager,
   ResourceCleanup
-} from "./chunk-KG343GSG.js";
+} from "./chunk-2IJEMXOB.js";
 import {
   IdentifierParser
 } from "./chunk-OXAM2WVC.js";
@@ -13,33 +14,37 @@ import {
   ProcessManager
 } from "./chunk-VU3QMIP2.js";
 import {
+  InitCommand,
   ShellCompletion
-} from "./chunk-PRE7KTM4.js";
+} from "./chunk-UAN4A3YU.js";
 import {
   getConfiguredRepoFromSettings,
   getEffectivePRTargetRemote,
   hasMultipleRemotes,
   parseGitRemotes
 } from "./chunk-PA6Q6AWM.js";
+import "./chunk-OSCLCMDG.js";
 import {
-  IssueEnhancementService
-} from "./chunk-GOG3ZB7O.js";
+  IssueEnhancementService,
+  capitalizeFirstLetter
+} from "./chunk-IFB4Z76W.js";
 import {
   openBrowser
 } from "./chunk-YETJNRQM.js";
 import {
   MergeManager
-} from "./chunk-FOV7RRQ2.js";
+} from "./chunk-2MAIX45J.js";
 import {
+  FirstRunManager,
   IssueTrackerFactory,
   generateIssueManagementMcpConfig
-} from "./chunk-FXMLNKLT.js";
+} from "./chunk-DLHA5VQ3.js";
 import {
   AgentManager
 } from "./chunk-OC4H6HJD.js";
 import {
   GitWorktreeManager
-} from "./chunk-OAP6SASD.js";
+} from "./chunk-2CXREBLZ.js";
 import {
   detectPackageManager,
   installDependencies,
@@ -47,12 +52,12 @@ import {
 } from "./chunk-ZT3YZB4K.js";
 import {
   ClaudeContextManager
-} from "./chunk-C7ASXK6J.js";
-import "./chunk-A2P7NZTB.js";
-import "./chunk-WEN5C5DM.js";
+} from "./chunk-AKUJXDNW.js";
+import "./chunk-PGPI5LR4.js";
+import "./chunk-RIEO2WML.js";
 import {
   DefaultBranchNamingService
-} from "./chunk-UERERX6M.js";
+} from "./chunk-SUOXY5WJ.js";
 import {
   ProjectCapabilityDetector
 } from "./chunk-EBISESAP.js";
@@ -65,31 +70,33 @@ import {
 } from "./chunk-GYCR2LOU.js";
 import {
   createNeonProviderFromSettings
-} from "./chunk-GVICXJHW.js";
+} from "./chunk-5VK4NRSF.js";
 import {
   executeGitCommand,
   extractIssueNumber,
   findMainWorktreePathWithSettings,
+  getRepoRoot,
   pushBranchToRemote
-} from "./chunk-5NTD4MCZ.js";
+} from "./chunk-5Q3NDNNV.js";
 import {
   SettingsManager
-} from "./chunk-UCZ24SUE.js";
+} from "./chunk-CDZERT7Z.js";
 import {
   GitHubService
-} from "./chunk-F4ENT6AC.js";
+} from "./chunk-M7JJCX53.js";
 import {
   executeGhCommand
 } from "./chunk-3RUPPQRG.js";
 import {
+  promptCommitAction,
   promptConfirmation,
   waitForKeypress
-} from "./chunk-JKXJ7BGL.js";
-import "./chunk-ZZZWQGTS.js";
+} from "./chunk-CE26YH2U.js";
+import "./chunk-CFFQ2Z7A.js";
 import {
   detectClaudeCli,
   launchClaude
-} from "./chunk-ZLIHIUDQ.js";
+} from "./chunk-OYF4VIFI.js";
 import "./chunk-RW54ZMBM.js";
 import {
   loadEnvIntoProcess
@@ -108,8 +115,25 @@ import path2 from "path";
 import { existsSync } from "fs";
 import { readFile } from "fs/promises";
 import path from "path";
+async function getProjectRoot() {
+  const repoRoot = await getRepoRoot();
+  if (repoRoot) {
+    logger.debug(`getProjectRoot: Using git repo root: ${repoRoot}`);
+    return repoRoot;
+  }
+  const cwd = process.cwd();
+  logger.debug(`getProjectRoot: Not in git repo, using cwd: ${cwd}`);
+  return cwd;
+}
 async function needsFirstRunSetup() {
-  const iloomDir = path.join(process.cwd(), ".iloom");
+  const projectRoot = await getProjectRoot();
+  const firstRunManager = new FirstRunManager();
+  const { isConfigured } = await firstRunManager.fixupLegacyProject(projectRoot);
+  if (isConfigured) {
+    logger.debug("needsFirstRunSetup: Project is tracked as configured globally");
+    return false;
+  }
+  const iloomDir = path.join(projectRoot, ".iloom");
   if (!existsSync(iloomDir)) {
     return true;
   }
@@ -134,13 +158,17 @@ async function launchFirstRunSetup() {
   logger.info(
     "iloom will now launch an interactive configuration session with Claude."
   );
-  const { waitForKeypress: waitForKeypress2 } = await import("./prompt-7INJ7YRU.js");
+  const { waitForKeypress: waitForKeypress2 } = await import("./prompt-QALMYTVC.js");
   await waitForKeypress2("Press any key to start configuration...");
-  const { InitCommand } = await import("./init-7IIM35LQ.js");
   const initCommand = new InitCommand();
   await initCommand.execute(
     "Help me configure iloom settings for this project. This is my first time using iloom here. Note: Your iloom command will execute once we are done with configuration changes."
   );
+  const projectRoot = await getProjectRoot();
+  logger.debug(`Marking project as configured at root: ${projectRoot}`);
+  const firstRunManager = new FirstRunManager();
+  await firstRunManager.markProjectAsConfigured(projectRoot);
+  logger.debug(`Project marked as configured at root: ${projectRoot}`);
   logger.info("Configuration complete! Continuing with your original command...");
 }
 
@@ -222,7 +250,7 @@ var StartCommand = class {
       const parsed = await this.parseInput(input.identifier, repo);
       await this.validateInput(parsed, repo);
       if (parentLoom) {
-        const { isInteractiveEnvironment, promptConfirmation: promptConfirmation2 } = await import("./prompt-7INJ7YRU.js");
+        const { isInteractiveEnvironment, promptConfirmation: promptConfirmation2 } = await import("./prompt-QALMYTVC.js");
         const parentDisplay = parentLoom.type === "issue" ? `issue #${parentLoom.identifier}` : parentLoom.type === "pr" ? `PR #${parentLoom.identifier}` : `branch ${parentLoom.identifier}`;
         if (input.options.childLoom === true) {
           logger.info(`Creating as child loom of ${parentDisplay} (--child-loom flag)`);
@@ -251,19 +279,20 @@ var StartCommand = class {
       }
       if (parsed.type === "description") {
         logger.info("Creating GitHub issue from description...");
-        const body = input.options.body ?? "";
+        const title = capitalizeFirstLetter(parsed.originalInput);
+        const body = input.options.body ? capitalizeFirstLetter(input.options.body) : "";
         const result = await this.issueTracker.createIssue(
-          parsed.originalInput,
-          // Use description as title
+          title,
+          // Use capitalized description as title
           body
-          // Use provided body or empty
+          // Use capitalized body or empty
         );
         logger.success(`Created issue #${result.number}: ${result.url}`);
         parsed.type = "issue";
         parsed.number = result.number;
       }
       if (input.options.oneShot === "bypassPermissions") {
-        const { promptConfirmation: promptConfirmation2 } = await import("./prompt-7INJ7YRU.js");
+        const { promptConfirmation: promptConfirmation2 } = await import("./prompt-QALMYTVC.js");
         const confirmed = await promptConfirmation2(
           "\u26A0\uFE0F  WARNING: bypassPermissions mode will allow Claude to execute all tool calls without confirmation. This can be dangerous. Do you want to proceed?"
         );
@@ -327,6 +356,7 @@ var StartCommand = class {
    * Parse input to determine type and extract relevant data
    */
   async parseInput(identifier, repo) {
+    const hasLeadingSpace = identifier.startsWith(" ");
     const trimmedIdentifier = identifier.trim();
     if (!trimmedIdentifier) {
       throw new Error("Missing required argument: identifier");
@@ -335,7 +365,7 @@ var StartCommand = class {
     if (trimmedIdentifier.length > 25 && spaceCount > 2) {
       return {
         type: "description",
-        originalInput: trimmedIdentifier
+        originalInput: hasLeadingSpace ? " " + trimmedIdentifier : trimmedIdentifier
       };
     }
     const prPattern = /^pr[/-](\d+)$/i;
@@ -524,13 +554,17 @@ var AddIssueCommand = class {
   /**
    * Execute the add-issue command workflow:
    * 1. Validate description format
-   * 2. Enhance description with Claude Code
+   * 2. Skip enhancement if body provided, otherwise enhance description with Claude Code
    * 3. Create GitHub issue
    * 4. Wait for keypress and open browser for review
    * 5. Return issue number
    */
   async execute(input) {
-    const { description } = input;
+    const description = capitalizeFirstLetter(input.description);
+    const body = input.options.body ? capitalizeFirstLetter(input.options.body) : void 0;
+    if (process.env.FORCE_FIRST_TIME_SETUP === "true" || await needsFirstRunSetup()) {
+      await launchFirstRunSetup();
+    }
     const settings = await this.settingsManager.loadSettings();
     let repo;
     if (this.enhancementService.issueTracker.providerName === "github" && await hasMultipleRemotes()) {
@@ -540,10 +574,10 @@ var AddIssueCommand = class {
     if (!description || !this.enhancementService.validateDescription(description)) {
       throw new Error("Description is required and must be more than 30 characters with at least 3 words");
     }
-    const enhancedDescription = await this.enhancementService.enhanceDescription(description);
+    const issueBody = body ?? await this.enhancementService.enhanceDescription(description);
     const result = await this.enhancementService.createEnhancedIssue(
       description,
-      enhancedDescription,
+      issueBody,
       repo
     );
     await this.enhancementService.waitForReviewAndOpen(result.number);
@@ -570,6 +604,9 @@ var EnhanceCommand = class {
   async execute(input) {
     const { issueNumber, options } = input;
     const { author } = options;
+    if (process.env.FORCE_FIRST_TIME_SETUP === "true" || await needsFirstRunSetup()) {
+      await launchFirstRunSetup();
+    }
     const settings = await this.settingsManager.loadSettings();
     let repo;
     if (this.issueTracker.providerName === "github" && await hasMultipleRemotes()) {
@@ -1031,6 +1068,14 @@ Run '${runCommand}' to see detailed errors.`
   }
 };
 
+// src/types/index.ts
+var UserAbortedCommitError = class extends Error {
+  constructor(message = "User aborted the commit") {
+    super(message);
+    this.name = "UserAbortedCommitError";
+  }
+};
+
 // src/lib/CommitManager.ts
 var CommitManager = class {
   /**
@@ -1089,19 +1134,34 @@ var CommitManager = class {
         }
         await executeGitCommand(commitArgs, { cwd: worktreePath });
       } else {
-        logger.info("Opening git editor for commit message review...");
-        const commitArgs = ["commit", "-e", "-m", message];
-        if (options.skipVerify) {
-          commitArgs.push("--no-verify");
+        const action = await promptCommitAction(message);
+        if (action === "abort") {
+          throw new UserAbortedCommitError();
+        }
+        if (action === "accept") {
+          const commitArgs = ["commit", "-m", message];
+          if (options.skipVerify) {
+            commitArgs.push("--no-verify");
+          }
+          await executeGitCommand(commitArgs, { cwd: worktreePath });
+        } else {
+          logger.info("Opening git editor for commit message review...");
+          const commitArgs = ["commit", "-e", "-m", message];
+          if (options.skipVerify) {
+            commitArgs.push("--no-verify");
+          }
+          await executeGitCommand(commitArgs, {
+            cwd: worktreePath,
+            stdio: "inherit",
+            timeout: 3e5
+            // 5 minutes for interactive editing
+          });
         }
-        await executeGitCommand(commitArgs, {
-          cwd: worktreePath,
-          stdio: "inherit",
-          timeout: 3e5
-          // 5 minutes for interactive editing
-        });
       }
     } catch (error) {
+      if (error instanceof UserAbortedCommitError) {
+        throw error;
+      }
       if (error instanceof Error && error.message.includes("nothing to commit")) {
         logger.info("No changes to commit");
         return;
@@ -1721,7 +1781,7 @@ var FinishCommand = class {
     const neonProvider = createNeonProviderFromSettings(settings);
     const databaseManager = new DatabaseManager(neonProvider, environmentManager, databaseUrlEnvVarName);
     const cliIsolationManager = new CLIIsolationManager();
-    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-JYO746H7.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-A77VI6AI.js");
     this.loomManager ??= new LoomManager(
       this.gitWorktreeManager,
       this.issueTracker,
@@ -2075,8 +2135,16 @@ var FinishCommand = class {
         if (parsed.type === "issue" && parsed.number) {
           commitOptions.issueNumber = parsed.number;
         }
-        await this.commitManager.commitChanges(worktree.path, commitOptions);
-        logger.success("Changes committed successfully");
+        try {
+          await this.commitManager.commitChanges(worktree.path, commitOptions);
+          logger.success("Changes committed successfully");
+        } catch (error) {
+          if (error instanceof UserAbortedCommitError) {
+            logger.info("Commit aborted by user");
+            return;
+          }
+          throw error;
+        }
       }
     } else {
       logger.debug("No uncommitted changes found");
@@ -2145,12 +2213,20 @@ var FinishCommand = class {
           logger.info("Committing uncommitted changes...");
           const settings = await this.settingsManager.loadSettings(worktree.path);
           const skipVerify = ((_b = (_a = settings.workflows) == null ? void 0 : _a.pr) == null ? void 0 : _b.noVerify) ?? false;
-          await this.commitManager.commitChanges(worktree.path, {
-            dryRun: false,
-            skipVerify
-            // Do NOT pass issueNumber for PRs - no "Fixes #" trailer needed
-          });
-          logger.success("Changes committed");
+          try {
+            await this.commitManager.commitChanges(worktree.path, {
+              dryRun: false,
+              skipVerify
+              // Do NOT pass issueNumber for PRs - no "Fixes #" trailer needed
+            });
+            logger.success("Changes committed");
+          } catch (error) {
+            if (error instanceof UserAbortedCommitError) {
+              logger.info("Commit aborted by user");
+              return;
+            }
+            throw error;
+          }
         }
       } else {
         logger.debug("No uncommitted changes found");
@@ -2502,28 +2578,39 @@ function extractIssueNumbers(branch) {
   }
   return [issueNumber];
 }
-function formatLoomForJson(worktree, mainWorktreePath) {
-  const loomType = determineLoomType(worktree);
-  let issueNumbers = [];
-  let prNumbers = [];
-  if (loomType === "pr") {
-    prNumbers = extractPRNumbers(worktree.path);
-  } else if (loomType === "issue") {
-    issueNumbers = extractIssueNumbers(worktree.branch);
+function formatLoomForJson(worktree, mainWorktreePath, metadata) {
+  const loomType = (metadata == null ? void 0 : metadata.issueType) ?? determineLoomType(worktree);
+  let issueNumbers;
+  let prNumbers;
+  if (metadata) {
+    issueNumbers = metadata.issue_numbers;
+    prNumbers = metadata.pr_numbers;
+  } else {
+    issueNumbers = [];
+    prNumbers = [];
+    if (loomType === "pr") {
+      prNumbers = extractPRNumbers(worktree.path);
+    } else if (loomType === "issue") {
+      issueNumbers = extractIssueNumbers(worktree.branch);
+    }
   }
   const isMainWorktree = mainWorktreePath ? worktree.path === mainWorktreePath : false;
   return {
     name: worktree.branch || worktree.path,
     worktreePath: worktree.bare ? null : worktree.path,
-    branch: worktree.branch || null,
+    branch: ((metadata == null ? void 0 : metadata.branchName) ?? worktree.branch) || null,
     type: loomType,
     issue_numbers: issueNumbers,
     pr_numbers: prNumbers,
-    isMainWorktree
+    isMainWorktree,
+    description: (metadata == null ? void 0 : metadata.description) ?? null,
+    created_at: (metadata == null ? void 0 : metadata.created_at) ?? null,
+    issueTracker: (metadata == null ? void 0 : metadata.issueTracker) ?? null,
+    colorHex: (metadata == null ? void 0 : metadata.colorHex) ?? null
   };
 }
-function formatLoomsForJson(worktrees, mainWorktreePath) {
-  return worktrees.map((wt) => formatLoomForJson(wt, mainWorktreePath));
+function formatLoomsForJson(worktrees, mainWorktreePath, metadata) {
+  return worktrees.map((wt) => formatLoomForJson(wt, mainWorktreePath, metadata == null ? void 0 : metadata.get(wt.path)));
 }
 
 // src/cli.ts
@@ -2551,7 +2638,7 @@ program.name("iloom").description(packageJson.description).version(packageJson.v
   } catch {
   }
   try {
-    const { SettingsMigrationManager } = await import("./SettingsMigrationManager-AGIIIPDQ.js");
+    const { SettingsMigrationManager } = await import("./SettingsMigrationManager-TJ7UWZG5.js");
     const migrationManager = new SettingsMigrationManager();
     await migrationManager.migrateSettingsIfNeeded();
   } catch (error) {
@@ -2641,18 +2728,18 @@ async function autoLaunchInitForMultipleRemotes() {
   logger.info("iloom will now launch an interactive configuration session with Claude");
   logger.info("to help you select which remote to use for GitHub operations.");
   logger.info("");
-  const { waitForKeypress: waitForKeypress2 } = await import("./prompt-7INJ7YRU.js");
+  const { waitForKeypress: waitForKeypress2 } = await import("./prompt-QALMYTVC.js");
   await waitForKeypress2("Press any key to start configuration...");
   logger.info("");
   try {
-    const { InitCommand } = await import("./init-7IIM35LQ.js");
-    const initCommand = new InitCommand();
+    const { InitCommand: InitCommand2 } = await import("./init-4FHTAM3F.js");
+    const initCommand = new InitCommand2();
     const customInitialMessage = "Help me configure which git remote iloom should use for GitHub operations. I have multiple remotes and need to select the correct one.";
     await initCommand.execute(customInitialMessage);
     logger.info("");
     logger.info("Configuration complete! Continuing with your original command...");
     logger.info("");
-    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-MTVX57WR.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-I2LRCW2A.js");
     const settingsManager = new SettingsManager2();
     const settings = await settingsManager.loadSettings();
     const { hasMultipleRemotes: hasMultipleRemotes2 } = await import("./remote-VUNCQZ6J.js");
@@ -2677,7 +2764,7 @@ program.command("start").alias("new").alias("create").alias("up").description("C
   try {
     let finalIdentifier = identifier;
     if (!finalIdentifier) {
-      const { promptInput } = await import("./prompt-7INJ7YRU.js");
+      const { promptInput } = await import("./prompt-QALMYTVC.js");
       finalIdentifier = await promptInput("Enter issue number, PR number (pr/123), or branch name");
       if (!(finalIdentifier == null ? void 0 : finalIdentifier.trim())) {
         logger.error("Identifier is required");
@@ -2694,7 +2781,7 @@ program.command("start").alias("new").alias("create").alias("up").description("C
     process.exit(1);
   }
 });
-program.command("add-issue").alias("a").description("Create and enhance GitHub issue without starting workspace").argument("<description>", "Natural language description of the issue (>50 chars, >2 spaces)").action(async (description) => {
+program.command("add-issue").alias("a").description("Create and enhance GitHub issue without starting workspace").argument("<description>", "Natural language description of the issue (>50 chars, >2 spaces)").option("--body <text>", "Body text for issue (skips AI enhancement)").action(async (description, options) => {
   try {
     const settingsManager = new SettingsManager();
     const settings = await settingsManager.loadSettings();
@@ -2703,7 +2790,7 @@ program.command("add-issue").alias("a").description("Create and enhance GitHub i
     const command = new AddIssueCommand(enhancementService, settingsManager);
     const issueNumber = await command.execute({
       description,
-      options: {}
+      options: options.body ? { body: options.body } : {}
     });
     logger.success(`Issue #${issueNumber} created successfully`);
     process.exit(0);
@@ -2714,7 +2801,7 @@ program.command("add-issue").alias("a").description("Create and enhance GitHub i
 });
 program.command("feedback").alias("f").description("Submit feedback/bug report to iloom-cli repository").argument("<description>", "Natural language description of feedback (>50 chars, >2 spaces)").option("--body <text>", "Body text for feedback (added after diagnostics)").action(async (description, options) => {
   try {
-    const { FeedbackCommand } = await import("./feedback-752MGDPG.js");
+    const { FeedbackCommand } = await import("./feedback-XTUCKJNT.js");
     const command = new FeedbackCommand();
     const feedbackOptions = {};
     if (options.body !== void 0) {
@@ -2765,7 +2852,7 @@ program.command("finish").alias("dn").description("Merge work and cleanup worksp
 });
 program.command("rebase").description("Rebase current branch on main with Claude-assisted conflict resolution").option("-f, --force", "Skip confirmation prompts").option("-n, --dry-run", "Preview actions without executing").action(async (options) => {
   try {
-    const { RebaseCommand } = await import("./rebase-Q7WXK566.js");
+    const { RebaseCommand } = await import("./rebase-VJ2VKR6R.js");
     const command = new RebaseCommand();
     await command.execute(options);
   } catch (error) {
@@ -2777,7 +2864,7 @@ program.command("spin").alias("ignite").description("Launch Claude with auto-det
   new Option("--one-shot <mode>", "One-shot automation mode").choices(["default", "noReview", "bypassPermissions"]).default("default")
 ).action(async (options) => {
   try {
-    const { IgniteCommand } = await import("./ignite-OAMDUN27.js");
+    const { IgniteCommand } = await import("./ignite-T74RYXCA.js");
     const command = new IgniteCommand();
     await command.execute(options.oneShot ?? "default");
   } catch (error) {
@@ -2788,7 +2875,7 @@ program.command("spin").alias("ignite").description("Launch Claude with auto-det
 program.command("open").description("Open workspace in browser or run CLI tool").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").allowUnknownOption().action(async (identifier, _options, command) => {
   try {
     const args = (command == null ? void 0 : command.args) ? command.args.slice(identifier ? 1 : 0) : [];
-    const { OpenCommand } = await import("./open-FCHKQ77R.js");
+    const { OpenCommand } = await import("./open-UMXANW5S.js");
     const cmd = new OpenCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -2800,7 +2887,7 @@ program.command("open").description("Open workspace in browser or run CLI tool")
 program.command("run").description("Run CLI tool or open workspace in browser").argument("[identifier]", "Issue number, PR number, or branch name (auto-detected if omitted)").allowUnknownOption().action(async (identifier, _options, command) => {
   try {
     const args = (command == null ? void 0 : command.args) ? command.args.slice(identifier ? 1 : 0) : [];
-    const { RunCommand } = await import("./run-SJPM6YRI.js");
+    const { RunCommand } = await import("./run-MJYY4PUT.js");
     const cmd = new RunCommand();
     const input = identifier ? { identifier, args } : { args };
     await cmd.execute(input);
@@ -2811,7 +2898,7 @@ program.command("run").description("Run CLI tool or open workspace in browser").
 });
 program.command("cleanup").alias("remove").alias("clean").description("Remove workspaces").argument("[identifier]", "Branch name or issue number to cleanup (auto-detected)").option("-l, --list", "List all worktrees").option("-a, --all", "Remove all worktrees (interactive confirmation)").option("-i, --issue <number>", "Cleanup by issue number", parseInt).option("-f, --force", "Skip confirmations and force removal").option("--dry-run", "Show what would be done without doing it").action(async (identifier, options) => {
   try {
-    const { CleanupCommand } = await import("./cleanup-6WYUD5SN.js");
+    const { CleanupCommand } = await import("./cleanup-H4VXU3C3.js");
     const command = new CleanupCommand();
     const input = {
       options: options ?? {}
@@ -2828,10 +2915,16 @@ program.command("cleanup").alias("remove").alias("clean").description("Remove wo
 program.command("list").description("Show active workspaces").option("--json", "Output as JSON").action(async (options) => {
   try {
     const manager = new GitWorktreeManager();
+    const metadataManager = new MetadataManager();
     const worktrees = await manager.listWorktrees({ porcelain: true });
+    const metadata = /* @__PURE__ */ new Map();
+    for (const worktree of worktrees) {
+      const loomMetadata = await metadataManager.readMetadata(worktree.path);
+      metadata.set(worktree.path, loomMetadata);
+    }
     if (options.json) {
       const mainWorktreePath = await findMainWorktreePathWithSettings();
-      console.log(JSON.stringify(formatLoomsForJson(worktrees, mainWorktreePath), null, 2));
+      console.log(JSON.stringify(formatLoomsForJson(worktrees, mainWorktreePath, metadata), null, 2));
       return;
     }
     if (worktrees.length === 0) {
@@ -2841,7 +2934,11 @@ program.command("list").description("Show active workspaces").option("--json", "
     logger.info("Active workspaces:");
     for (const worktree of worktrees) {
       const formatted = manager.formatWorktree(worktree);
+      const loomMetadata = metadata.get(worktree.path);
       logger.info(`  ${formatted.title}`);
+      if (loomMetadata == null ? void 0 : loomMetadata.description) {
+        logger.info(`    Description: ${loomMetadata.description}`);
+      }
       logger.info(`    Path: ${formatted.path}`);
       logger.info(`    Commit: ${formatted.commit}`);
     }
@@ -2860,8 +2957,8 @@ program.command("list").description("Show active workspaces").option("--json", "
 });
 program.command("init").alias("config").description("Initialize iloom configuration and setup shell autocomplete").argument("[prompt]", 'Custom initial message to send to Claude (defaults to "Help me configure iloom settings.")').action(async (prompt) => {
   try {
-    const { InitCommand } = await import("./init-7IIM35LQ.js");
-    const command = new InitCommand();
+    const { InitCommand: InitCommand2 } = await import("./init-4FHTAM3F.js");
+    const command = new InitCommand2();
     const trimmedPrompt = prompt == null ? void 0 : prompt.trim();
     const customPrompt = trimmedPrompt && trimmedPrompt.length > 0 ? trimmedPrompt : void 0;
     await command.execute(customPrompt);
@@ -2872,7 +2969,7 @@ program.command("init").alias("config").description("Initialize iloom configurat
 });
 program.command("contribute").description("Set up local development environment for contributing to iloom").action(async () => {
   try {
-    const { ContributeCommand } = await import("./contribute-7YJHZTO7.js");
+    const { ContributeCommand } = await import("./contribute-Y7IQV5QY.js");
     const command = new ContributeCommand();
     await command.execute();
   } catch (error) {
@@ -2892,8 +2989,8 @@ program.command("update").description("Update iloom-cli to the latest version").
 });
 program.command("test-github").description("Test GitHub integration (Issue #3)").argument("<identifier>", "Issue number or PR number").option("--no-claude", "Skip Claude for branch name generation").action(async (identifier, options) => {
   try {
-    const { GitHubService: GitHubService2 } = await import("./GitHubService-UAMH7DMF.js");
-    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-JYO746H7.js");
+    const { GitHubService: GitHubService2 } = await import("./GitHubService-FZHHBOFG.js");
+    const { DefaultBranchNamingService: DefaultBranchNamingService2 } = await import("./BranchNamingService-A77VI6AI.js");
     logger.info("Testing GitHub Integration\n");
     const service = new GitHubService2();
     const branchNaming = new DefaultBranchNamingService2({ useClaude: options.claude !== false });
@@ -2951,10 +3048,10 @@ program.command("test-github").description("Test GitHub integration (Issue #3)")
 });
 program.command("test-claude").description("Test Claude integration (Issue #10)").option("--detect", "Test Claude CLI detection").option("--version", "Get Claude CLI version").option("--branch <title>", "Test branch name generation with given title").option("--issue <number>", "Issue number for branch generation", "123").option("--launch <prompt>", "Launch Claude with a prompt (headless)").option("--interactive", "Launch Claude interactively (requires --launch)").option("--template <name>", "Test template loading").action(async (options) => {
   try {
-    const { detectClaudeCli: detectClaudeCli2, getClaudeVersion, generateBranchName, launchClaude: launchClaude2 } = await import("./claude-KIZYXTSG.js");
-    const { PromptTemplateManager } = await import("./PromptTemplateManager-A52RUAMS.js");
-    const { ClaudeService } = await import("./ClaudeService-Z4KA7QOW.js");
-    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-5WPRJIIW.js");
+    const { detectClaudeCli: detectClaudeCli2, getClaudeVersion, generateBranchName, launchClaude: launchClaude2 } = await import("./claude-W52VKI6L.js");
+    const { PromptTemplateManager } = await import("./PromptTemplateManager-6HH3PVXV.js");
+    const { ClaudeService } = await import("./ClaudeService-DLYLJUPA.js");
+    const { ClaudeContextManager: ClaudeContextManager2 } = await import("./ClaudeContextManager-BN7RE5ZQ.js");
     logger.info("Testing Claude Integration\n");
     if (options.detect) {
       logger.info("Detecting Claude CLI...");
@@ -3102,7 +3199,7 @@ program.command("test-webserver").description("Test if a web server is running o
 });
 program.command("test-git").description("Test Git integration - findMainWorktreePath() function (reads .iloom/settings.json)").action(async () => {
   try {
-    const { TestGitCommand } = await import("./test-git-DEUE656D.js");
+    const { TestGitCommand } = await import("./test-git-IT5EWQ5C.js");
     const command = new TestGitCommand();
     await command.execute();
   } catch (error) {
@@ -3128,7 +3225,7 @@ program.command("test-tabs").description("Test iTerm2 dual tab functionality - o
 });
 program.command("test-prefix").description("Test worktree prefix configuration - preview worktree paths (reads .iloom/settings.json)").action(async () => {
   try {
-    const { TestPrefixCommand } = await import("./test-prefix-Y6Z6ZHSF.js");
+    const { TestPrefixCommand } = await import("./test-prefix-NPWDPUUH.js");
     const command = new TestPrefixCommand();
     await command.execute();
   } catch (error) {
@@ -3142,8 +3239,8 @@ program.command("test-prefix").description("Test worktree prefix configuration -
 program.command("test-neon").description("Test Neon integration and debug configuration").action(async () => {
   var _a;
   try {
-    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-MTVX57WR.js");
-    const { createNeonProviderFromSettings: createNeonProviderFromSettings2 } = await import("./neon-helpers-5HBYO2VP.js");
+    const { SettingsManager: SettingsManager2 } = await import("./SettingsManager-I2LRCW2A.js");
+    const { createNeonProviderFromSettings: createNeonProviderFromSettings2 } = await import("./neon-helpers-77PBPGJ5.js");
     logger.info("Testing Neon Integration\n");
     logger.info("1. Settings Configuration:");
     const settingsManager = new SettingsManager2();