@iloom/cli 0.4.1 → 0.5.1

package/dist/index.d.ts

@@ -381,14 +381,14 @@ declare const IloomSettingsSchema: z.ZodObject<{
         provider?: "github" | "linear" | undefined;
     }>>;
     mergeBehavior: z.ZodOptional<z.ZodObject<{
-        mode: z.ZodDefault<z.ZodEnum<["local", "github-pr"]>>;
+        mode: z.ZodDefault<z.ZodEnum<["local", "github-pr", "github-draft-pr"]>>;
         remote: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        mode: "local" | "github-pr";
+        mode: "local" | "github-pr" | "github-draft-pr";
         remote?: string | undefined;
     }, {
         remote?: string | undefined;
-        mode?: "local" | "github-pr" | undefined;
+        mode?: "local" | "github-pr" | "github-draft-pr" | undefined;
     }>>;
     ide: z.ZodOptional<z.ZodObject<{
         type: z.ZodDefault<z.ZodEnum<["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf", "antigravity"]>>;
@@ -407,8 +407,10 @@ declare const IloomSettingsSchema: z.ZodObject<{
         vscode?: boolean | undefined;
         terminal?: boolean | undefined;
     }>>;
+    attribution: z.ZodDefault<z.ZodEnum<["off", "upstreamOnly", "on"]>>;
 }, "strip", z.ZodTypeAny, {
     sourceEnvOnStart: boolean;
+    attribution: "off" | "upstreamOnly" | "on";
     mainBranch?: string | undefined;
     worktreePrefix?: string | undefined;
     protectedBranches?: string[] | undefined;
@@ -476,7 +478,7 @@ declare const IloomSettingsSchema: z.ZodObject<{
         } | undefined;
     } | undefined;
     mergeBehavior?: {
-        mode: "local" | "github-pr";
+        mode: "local" | "github-pr" | "github-draft-pr";
         remote?: string | undefined;
     } | undefined;
     ide?: {
@@ -556,7 +558,7 @@ declare const IloomSettingsSchema: z.ZodObject<{
     } | undefined;
     mergeBehavior?: {
         remote?: string | undefined;
-        mode?: "local" | "github-pr" | undefined;
+        mode?: "local" | "github-pr" | "github-draft-pr" | undefined;
     } | undefined;
     ide?: {
         type?: "vscode" | "cursor" | "webstorm" | "sublime" | "intellij" | "windsurf" | "antigravity" | undefined;
@@ -565,6 +567,7 @@ declare const IloomSettingsSchema: z.ZodObject<{
         vscode?: boolean | undefined;
         terminal?: boolean | undefined;
     } | undefined;
+    attribution?: "off" | "upstreamOnly" | "on" | undefined;
 }>;
 /**
  * TypeScript type for iloom settings derived from Zod schema
@@ -1223,7 +1226,7 @@ interface FinishResult {
     /** Whether this was a dry-run operation */
     dryRun?: boolean;
     operations: Array<{
-        type: 'validation' | 'commit' | 'rebase' | 'merge' | 'cleanup' | 'pr-creation' | 'build';
+        type: 'validation' | 'commit' | 'rebase' | 'merge' | 'cleanup' | 'pr-creation' | 'pr-ready' | 'build';
         message: string;
         success: boolean;
         error?: string;
@@ -1540,6 +1543,9 @@ interface TemplateVariables {
     BRANCH_NAME?: string;
     LOOM_TYPE?: string;
     COMPACT_SUMMARIES?: string;
+    DRAFT_PR_NUMBER?: number;
+    DRAFT_PR_MODE?: boolean;
+    STANDARD_ISSUE_MODE?: boolean;
 }
 declare class PromptTemplateManager {
     private templateDir;
@@ -1638,6 +1644,9 @@ interface WriteMetadataInput {
     colorHex: string;
     sessionId: string;
     projectPath: string;
+    issueUrls: Record<string, string>;
+    prUrls: Record<string, string>;
+    draftPrNumber?: number;
     parentLoom?: {
         type: 'issue' | 'pr' | 'branch';
         identifier: string | number;
@@ -1661,6 +1670,9 @@ interface LoomMetadata {
     colorHex: string | null;
     sessionId: string | null;
     projectPath: string | null;
+    issueUrls: Record<string, string>;
+    prUrls: Record<string, string>;
+    draftPrNumber: number | null;
     parentLoom: {
         type: 'issue' | 'pr' | 'branch';
         identifier: string | number;
@@ -1701,6 +1713,12 @@ declare class MetadataManager {
      * Get the full path to the metadata file for a worktree
      */
     private getFilePath;
+    /**
+     * Get the full path to the metadata file for a worktree (public API)
+     * Used by other services that need to reference the metadata file location
+     * (e.g., MCP servers that need to read loom context)
+     */
+    getMetadataFilePath(worktreePath: string): string;
     /**
      * Write metadata for a worktree (spec section 3.1)
      *
@@ -1972,6 +1990,39 @@ declare function getMergeTargetBranch(worktreePath?: string, options?: {
     settingsManager?: SettingsManager;
     metadataManager?: MetadataManager;
 }): Promise<string>;
+/**
+ * Placeholder commit prefix used by github-draft-pr mode.
+ * Created during il start to enable draft PR creation (GitHub requires at least one commit ahead of base).
+ * Removed during il finish before the final push to maintain clean commit history.
+ */
+declare const PLACEHOLDER_COMMIT_PREFIX = "[iloom-temp]";
+/**
+ * Check if HEAD commit is a placeholder commit
+ * @param cwd - Working directory (defaults to process.cwd())
+ * @returns true if HEAD is a placeholder commit
+ */
+declare function isPlaceholderCommit(cwd?: string): Promise<boolean>;
+/**
+ * Find placeholder commit SHA in history using git log --grep
+ * @param worktreePath - Working directory
+ * @returns SHA of placeholder commit if found, null otherwise
+ */
+declare function findPlaceholderCommitSha(worktreePath: string): Promise<string | null>;
+/**
+ * Remove placeholder commit when it's HEAD
+ * Uses soft reset to preserve any staged changes
+ * @param worktreePath - Working directory
+ * @returns true if placeholder was removed
+ */
+declare function removePlaceholderCommitFromHead(worktreePath: string): Promise<boolean>;
+/**
+ * Remove placeholder commit from history using rebase
+ * Used when user has made commits on top of placeholder
+ * @param worktreePath - Working directory
+ * @param placeholderSha - SHA of the placeholder commit to remove
+ * @throws Error if rebase fails
+ */
+declare function removePlaceholderCommitFromHistory(worktreePath: string, placeholderSha: string): Promise<void>;
 
 interface LoggerOptions {
     prefix?: string;
@@ -2148,4 +2199,4 @@ declare class TableFormatter {
     static previewFormatting(headers: string[], options?: TableFormatterOptions): string;
 }
 
-export { type AddIssueOptions, type AddIssueResult, type BatchCleanupResult, type BranchCleanupTarget, type BranchDeleteOptions, type BranchGenerationOptions, type BranchNameStrategy, type Capability, type ClaudeContext, ClaudeContextManager, type CleanupOptions, type CleanupResult, type ColorData, type CommitOptions, type Config, type CreateLoomInput, type DatabaseDeletionResult, DatabaseManager, type DatabaseProvider, type EnhanceOptions, type EnhanceResult, type EnvFileOptions, type EnvOperationResult, type EnvVariable, EnvironmentManager, type FeedbackOptions, type FinishOptions, type FinishResult, GitHubService, type GitStatus, type GitWorktree, GitWorktreeManager, type InstallationMethod, type Issue, type IssueTracker, IssueTrackerFactory, type IssueTrackerInputDetection, type IssueTrackerProviderType, type LaunchMode, LinearMarkupConverter, type ListOptions, type Logger, type LoggerOptions, type Loom, type LoomSummary, type MergeOptions, type MergeResult, type MockOptions, type OneShotMode, type OperationResult, type PRWorktreePattern, type Platform, type PortAssignmentOptions, type ProcessInfo, type ProjectCapability, type PullRequest, type RemoteBranchStatus, type ResourceCleanupOptions, type RgbColor, type SafetyCheck, type StartOptions, type StartResult, type SummaryResult, TableFormatter, type TableFormatterOptions, type TableGenerationOptions, type UpdateCheckCache, type UpdateCheckResult, UserAbortedCommitError, type ValidationOptions, type ValidationResult, type ValidationStepResult, type Workspace, type WorkspaceInput, WorkspaceManager, type WorkspaceSummary, type Worktree, type WorktreeCleanupOptions, type WorktreeCreateOptions, type WorktreeListOptions, type WorktreeOperationResult, type WorktreeStatus, type WorktreeValidation, branchExists, checkRemoteBranchStatus, createLogger, createStderrLogger, ensureRepositoryHasCommits, executeGitCommand, extractIssueNumber, extractPRNumber, findAllBranchesForIssue, findMainWorktreePath, findMainWorktreePathWithSettings, findWorktreeForBranch, generateWorktreePath, getCurrentBranch, getDefaultBranch, getMergeTargetBranch, getRepoRoot, getWorktreeRoot, hasUncommittedChanges, isBranchMergedIntoMain, isEmptyRepository, isFileGitignored, isFileTrackedByGit, isPRBranch, isRemoteBranchUpToDate, isValidGitRepo, isWorktreePath, logger, parseWorktreeList, pushBranchToRemote };
+export { type AddIssueOptions, type AddIssueResult, type BatchCleanupResult, type BranchCleanupTarget, type BranchDeleteOptions, type BranchGenerationOptions, type BranchNameStrategy, type Capability, type ClaudeContext, ClaudeContextManager, type CleanupOptions, type CleanupResult, type ColorData, type CommitOptions, type Config, type CreateLoomInput, type DatabaseDeletionResult, DatabaseManager, type DatabaseProvider, type EnhanceOptions, type EnhanceResult, type EnvFileOptions, type EnvOperationResult, type EnvVariable, EnvironmentManager, type FeedbackOptions, type FinishOptions, type FinishResult, GitHubService, type GitStatus, type GitWorktree, GitWorktreeManager, type InstallationMethod, type Issue, type IssueTracker, IssueTrackerFactory, type IssueTrackerInputDetection, type IssueTrackerProviderType, type LaunchMode, LinearMarkupConverter, type ListOptions, type Logger, type LoggerOptions, type Loom, type LoomSummary, type MergeOptions, type MergeResult, type MockOptions, type OneShotMode, type OperationResult, PLACEHOLDER_COMMIT_PREFIX, type PRWorktreePattern, type Platform, type PortAssignmentOptions, type ProcessInfo, type ProjectCapability, type PullRequest, type RemoteBranchStatus, type ResourceCleanupOptions, type RgbColor, type SafetyCheck, type StartOptions, type StartResult, type SummaryResult, TableFormatter, type TableFormatterOptions, type TableGenerationOptions, type UpdateCheckCache, type UpdateCheckResult, UserAbortedCommitError, type ValidationOptions, type ValidationResult, type ValidationStepResult, type Workspace, type WorkspaceInput, WorkspaceManager, type WorkspaceSummary, type Worktree, type WorktreeCleanupOptions, type WorktreeCreateOptions, type WorktreeListOptions, type WorktreeOperationResult, type WorktreeStatus, type WorktreeValidation, branchExists, checkRemoteBranchStatus, createLogger, createStderrLogger, ensureRepositoryHasCommits, executeGitCommand, extractIssueNumber, extractPRNumber, findAllBranchesForIssue, findMainWorktreePath, findMainWorktreePathWithSettings, findPlaceholderCommitSha, findWorktreeForBranch, generateWorktreePath, getCurrentBranch, getDefaultBranch, getMergeTargetBranch, getRepoRoot, getWorktreeRoot, hasUncommittedChanges, isBranchMergedIntoMain, isEmptyRepository, isFileGitignored, isFileTrackedByGit, isPRBranch, isPlaceholderCommit, isRemoteBranchUpToDate, isValidGitRepo, isWorktreePath, logger, parseWorktreeList, pushBranchToRemote, removePlaceholderCommitFromHead, removePlaceholderCommitFromHistory };

package/dist/index.js

@@ -330,9 +330,9 @@ var init_SettingsManager = __esm({
         }).optional()
       }).optional().describe("Issue management configuration"),
       mergeBehavior: z.object({
-        mode: z.enum(["local", "github-pr"]).default("local"),
+        mode: z.enum(["local", "github-pr", "github-draft-pr"]).default("local"),
         remote: z.string().optional()
-      }).optional().describe("Merge behavior configuration: local (merge locally) or github-pr (create PR)"),
+      }).optional().describe("Merge behavior configuration: local (merge locally), github-pr (create PR), or github-draft-pr (create draft PR at start, mark ready on finish)"),
       ide: z.object({
         type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf", "antigravity"]).default("vscode").describe(
           "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor), antigravity (Antigravity IDE)."
@@ -345,7 +345,10 @@ var init_SettingsManager = __esm({
         vscode: z.boolean().default(false).describe(
           "Apply VSCode/Cursor title bar colors based on branch name. Note: This modifies .vscode/settings.json which may be in source control. Default is false for safety; enable via init or explicitly if .vscode is gitignored."
         )
-      }).optional().describe("Color synchronization settings for workspace identification")
+      }).optional().describe("Color synchronization settings for workspace identification"),
+      attribution: z.enum(["off", "upstreamOnly", "on"]).default("upstreamOnly").describe(
+        'Controls when iloom attribution appears in session summaries. "off" - never show attribution. "upstreamOnly" - only show for contributions to external repositories (e.g., open source). "on" - always show attribution.'
+      )
     });
     IloomSettingsSchemaNoDefaults = z.object({
       mainBranch: z.string().min(1, "Settings 'mainBranch' cannot be empty").optional().describe("Name of the main/primary branch for the repository"),
@@ -398,9 +401,9 @@ var init_SettingsManager = __esm({
         }).optional()
       }).optional().describe("Issue management configuration"),
       mergeBehavior: z.object({
-        mode: z.enum(["local", "github-pr"]).optional(),
+        mode: z.enum(["local", "github-pr", "github-draft-pr"]).optional(),
         remote: z.string().optional()
-      }).optional().describe("Merge behavior configuration: local (merge locally) or github-pr (create PR)"),
+      }).optional().describe("Merge behavior configuration: local (merge locally), github-pr (create PR), or github-draft-pr (create draft PR at start, mark ready on finish)"),
       ide: z.object({
         type: z.enum(["vscode", "cursor", "webstorm", "sublime", "intellij", "windsurf", "antigravity"]).optional().describe(
           "IDE to launch when starting a loom. Options: vscode (Visual Studio Code), cursor (Cursor AI editor), webstorm (JetBrains WebStorm), sublime (Sublime Text), intellij (JetBrains IntelliJ IDEA), windsurf (Windsurf editor), antigravity (Antigravity IDE)."
@@ -413,7 +416,10 @@ var init_SettingsManager = __esm({
         vscode: z.boolean().optional().describe(
           "Apply VSCode/Cursor title bar colors based on branch name. Note: This modifies .vscode/settings.json which may be in source control."
         )
-      }).optional().describe("Color synchronization settings for workspace identification")
+      }).optional().describe("Color synchronization settings for workspace identification"),
+      attribution: z.enum(["off", "upstreamOnly", "on"]).optional().describe(
+        'Controls when iloom attribution appears in session summaries. "off" - never show attribution. "upstreamOnly" - only show for contributions to external repositories (e.g., open source). "on" - always show attribution.'
+      )
     });
     SettingsManager = class {
       /**
@@ -870,6 +876,14 @@ var MetadataManager = class {
     const filename = this.slugifyPath(worktreePath);
     return path2.join(this.loomsDir, filename);
   }
+  /**
+   * Get the full path to the metadata file for a worktree (public API)
+   * Used by other services that need to reference the metadata file location
+   * (e.g., MCP servers that need to read loom context)
+   */
+  getMetadataFilePath(worktreePath) {
+    return this.getFilePath(worktreePath);
+  }
   /**
    * Write metadata for a worktree (spec section 3.1)
    *
@@ -892,6 +906,9 @@ var MetadataManager = class {
         colorHex: input.colorHex,
         sessionId: input.sessionId,
         projectPath: input.projectPath,
+        issueUrls: input.issueUrls,
+        prUrls: input.prUrls,
+        ...input.draftPrNumber && { draftPrNumber: input.draftPrNumber },
         ...input.parentLoom && { parentLoom: input.parentLoom }
       };
       const filePath = this.getFilePath(worktreePath);
@@ -932,6 +949,9 @@ var MetadataManager = class {
         colorHex: data.colorHex ?? null,
         sessionId: data.sessionId ?? null,
         projectPath: data.projectPath ?? null,
+        issueUrls: data.issueUrls ?? {},
+        prUrls: data.prUrls ?? {},
+        draftPrNumber: data.draftPrNumber ?? null,
         parentLoom: data.parentLoom ?? null
       };
     } catch (error) {
@@ -979,6 +999,9 @@ var MetadataManager = class {
             colorHex: data.colorHex ?? null,
             sessionId: data.sessionId ?? null,
             projectPath: data.projectPath ?? null,
+            issueUrls: data.issueUrls ?? {},
+            prUrls: data.prUrls ?? {},
+            draftPrNumber: data.draftPrNumber ?? null,
             parentLoom: data.parentLoom ?? null
           });
         } catch (error) {
@@ -1458,6 +1481,8 @@ async function pushBranchToRemote(branchName, worktreePath, options) {
       throw new Error(
         `Failed to push changes to origin/${branchName}
 
+   Git error: ${errorMessage}
+
    Possible causes:
    \u2022 Remote branch was deleted
    \u2022 Push was rejected (non-fast-forward)
@@ -1471,6 +1496,8 @@ async function pushBranchToRemote(branchName, worktreePath, options) {
       throw new Error(
         `Failed to push changes to origin/${branchName}: Network connectivity issues
 
+   Git error: ${errorMessage}
+
    Check your internet connection and try again.`
       );
     }
@@ -1478,6 +1505,8 @@ async function pushBranchToRemote(branchName, worktreePath, options) {
       throw new Error(
         `Failed to push changes: Remote 'origin' not found
 
+   Git error: ${errorMessage}
+
    Configure remote: git remote add origin <url>`
       );
     }
@@ -1623,6 +1652,54 @@ async function getMergeTargetBranch(worktreePath = process.cwd(), options) {
   logger.debug(`Using configured main branch as merge target: ${mainBranch}`);
   return mainBranch;
 }
+var PLACEHOLDER_COMMIT_PREFIX = "[iloom-temp]";
+async function isPlaceholderCommit(cwd = process.cwd()) {
+  try {
+    const subject = await executeGitCommand(["log", "-1", "--format=%s", "HEAD"], { cwd });
+    return subject.trim().startsWith(PLACEHOLDER_COMMIT_PREFIX);
+  } catch {
+    return false;
+  }
+}
+async function findPlaceholderCommitSha(worktreePath) {
+  try {
+    const log = await executeGitCommand(
+      ["log", "--format=%H", "--fixed-strings", "--grep", PLACEHOLDER_COMMIT_PREFIX, "-n", "1"],
+      { cwd: worktreePath }
+    );
+    const sha = log.trim();
+    if (sha.length === 0) {
+      return null;
+    }
+    const subject = await executeGitCommand(
+      ["log", "-1", "--format=%s", sha],
+      { cwd: worktreePath }
+    );
+    if (!subject.trim().startsWith(PLACEHOLDER_COMMIT_PREFIX)) {
+      return null;
+    }
+    return sha;
+  } catch {
+    return null;
+  }
+}
+async function removePlaceholderCommitFromHead(worktreePath) {
+  if (!await isPlaceholderCommit(worktreePath)) {
+    return false;
+  }
+  await executeGitCommand(["reset", "--soft", "HEAD~1"], { cwd: worktreePath });
+  return true;
+}
+async function removePlaceholderCommitFromHistory(worktreePath, placeholderSha) {
+  const parentSha = await executeGitCommand(
+    ["rev-parse", `${placeholderSha}^`],
+    { cwd: worktreePath }
+  );
+  await executeGitCommand(
+    ["rebase", "--onto", parentSha.trim(), placeholderSha],
+    { cwd: worktreePath }
+  );
+}
 
 // src/lib/GitWorktreeManager.ts
 var GitWorktreeManager = class {
@@ -2662,6 +2739,9 @@ var LinearService = class {
     this.supportsPullRequests = false;
     this.config = config ?? {};
     this.prompter = (options == null ? void 0 : options.prompter) ?? promptConfirmation;
+    if (this.config.apiToken) {
+      process.env.LINEAR_API_TOKEN = this.config.apiToken;
+    }
   }
   /**
    * Detect if input matches Linear identifier format (TEAM-NUMBER)
@@ -2831,6 +2911,9 @@ var IssueTrackerFactory = class {
         if (linearSettings == null ? void 0 : linearSettings.branchFormat) {
           linearConfig.branchFormat = linearSettings.branchFormat;
         }
+        if (linearSettings == null ? void 0 : linearSettings.apiToken) {
+          linearConfig.apiToken = linearSettings.apiToken;
+        }
         getLogger().debug(`IssueTrackerFactory: Creating LinearService with config:`, JSON.stringify(linearConfig, null, 2));
         return new LinearService(linearConfig);
       }
@@ -3948,6 +4031,9 @@ var PromptTemplateManager = class {
     if (variables.COMPACT_SUMMARIES !== void 0) {
       result = result.replace(/COMPACT_SUMMARIES/g, variables.COMPACT_SUMMARIES);
     }
+    if (variables.DRAFT_PR_NUMBER !== void 0) {
+      result = result.replace(/DRAFT_PR_NUMBER/g, String(variables.DRAFT_PR_NUMBER));
+    }
     return result;
   }
   /**
@@ -4018,6 +4104,18 @@ var PromptTemplateManager = class {
     } else {
       result = result.replace(compactSummariesRegex, "");
     }
+    const draftPrModeRegex = /\{\{#IF DRAFT_PR_MODE\}\}(.*?)\{\{\/IF DRAFT_PR_MODE\}\}/gs;
+    if (variables.DRAFT_PR_MODE === true) {
+      result = result.replace(draftPrModeRegex, "$1");
+    } else {
+      result = result.replace(draftPrModeRegex, "");
+    }
+    const standardIssueModeRegex = /\{\{#IF STANDARD_ISSUE_MODE\}\}(.*?)\{\{\/IF STANDARD_ISSUE_MODE\}\}/gs;
+    if (variables.STANDARD_ISSUE_MODE === true) {
+      result = result.replace(standardIssueModeRegex, "$1");
+    } else {
+      result = result.replace(standardIssueModeRegex, "");
+    }
     return result;
   }
   /**
@@ -4510,6 +4608,7 @@ export {
   GitWorktreeManager,
   IssueTrackerFactory,
   LinearMarkupConverter,
+  PLACEHOLDER_COMMIT_PREFIX,
   TableFormatter,
   UserAbortedCommitError,
   WorkspaceManager,
@@ -4524,6 +4623,7 @@ export {
   findAllBranchesForIssue,
   findMainWorktreePath,
   findMainWorktreePathWithSettings,
+  findPlaceholderCommitSha,
   findWorktreeForBranch,
   generateWorktreePath,
   getCurrentBranch,
@@ -4537,11 +4637,14 @@ export {
   isFileGitignored,
   isFileTrackedByGit,
   isPRBranch,
+  isPlaceholderCommit,
   isRemoteBranchUpToDate,
   isValidGitRepo,
   isWorktreePath,
   logger,
   parseWorktreeList,
-  pushBranchToRemote
+  pushBranchToRemote,
+  removePlaceholderCommitFromHead,
+  removePlaceholderCommitFromHistory
 };
 //# sourceMappingURL=index.js.map