@idea1/cli 1.7.7 → 1.8.1

package/dist/commands/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAOhE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,aAAa,EA6BnD,CAAC;AAEF;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlG;AAED,eAAO,MAAM,YAAY,EAAE,OAmC1B,CAAC"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAQhE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,aAAa,EAwCnD,CAAC;AAEF;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlG;AAED,eAAO,MAAM,YAAY,EAAE,OA8B1B,CAAC"}

package/dist/commands/start.js

@@ -1,8 +1,9 @@
 import { logger } from '../lib/logger.js';
 import { isProjectItemUrl, validateProjectItemUrl } from '../lib/project-item-url.js';
-import * as claude from '../services/claude.js';
-import { branchCreationOptions } from '../services/branch-setup.js';
-import { ensureManaged, resolveContext } from '../services/workflow-engine.js';
+import * as platform from '../services/platform.js';
+import { WorkflowStates } from '../workflow/data/workflow-states.js';
+import { branchCreationOptions } from '../workflow/engine/branch-setup.js';
+import { advanceAsNeededTo, requireLiveContext, resolveTransition } from '../workflow/engine/workflow-engine.js';
 /**
  * Options every command that can put an item under workflow management shares:
  * which item (or a new one to create) and where the repository is.
@@ -28,6 +29,16 @@ export const projectItemTargetOptions = [
         dependsOn: (resolved) => !resolved['url'],
         validate: (value) => value.trim() ? undefined : 'A title is required to create a project item'
     },
+    {
+        // The Project the new item belongs to. Only asked when creating an item; the menu is the
+        // team's live Projects, so the item is never dropped into a default Project.
+        longName: 'project',
+        shortName: 'P',
+        description: 'Project to create the item in',
+        dependsOn: (resolved) => !resolved['url'],
+        choices: 'idea1-projects',
+        validate: (value) => value.trim() ? undefined : 'A project is required to create a project item'
+    },
     {
         longName: 'source-path',
         shortName: 'p',
@@ -41,7 +52,7 @@ export const projectItemTargetOptions = [
  * created from the title.
  */
 export async function resolveOrCreateProjectItem(resolved) {
-    const projectItemUrl = resolved['url'] || await claude.createProjectItem(resolved['title'].trim());
+    const projectItemUrl = resolved['url'] || await platform.createProjectItem(resolved['title'].trim(), resolved['project'].trim());
     if (!isProjectItemUrl(projectItemUrl)) {
         logger.warning('URL does not appear to be an idea1.ai project item URL');
     }
@@ -50,7 +61,7 @@ export async function resolveOrCreateProjectItem(resolved) {
 export const startCommand = {
     name: 'start',
     aliases: ['s'],
-    description: 'Put a project item under workflow management: create its branch and metadata (no code changes, no Claude)',
+    description: 'Put a project item under workflow management: create its branch and record it as the item\'s (no code changes, no Claude)',
     options: [
         ...projectItemTargetOptions,
         ...branchCreationOptions
@@ -61,18 +72,13 @@ export const startCommand = {
             process.chdir(sourcePath);
         }
         const projectItemUrl = await resolveOrCreateProjectItem(resolved);
-        const context = await resolveContext({ projectItemUrl, options: resolved });
-        if (context.branchName) {
-            // Already managed: make sure the branch carries its metadata file, and report.
-            await ensureManaged(context, { deferItemStatusWrite: true });
-            logger.info(`${projectItemUrl} is already under workflow management on ${context.branchName} (state: ${context.currentState ?? 'unknown'})`);
-            logger.hint('Use `idea1 next --url <url>` to advance to the next workflow step.');
-            return;
-        }
+        const transition = await resolveTransition({ projectItemUrl, options: resolved });
         logger.section('Start Workflow');
-        await ensureManaged(context, { deferItemStatusWrite: false });
+        // Entering the first state is what starts an item; an item that already has a
+        // state keeps it and, when it has no branch yet, gains one here.
+        await advanceAsNeededTo(transition, WorkflowStates.BuildSpecInProgress);
         logger.newline();
-        logger.success(`${projectItemUrl} is under workflow management on ${context.branchName} (state: ${context.currentState})`);
+        logger.success(`${projectItemUrl} is under workflow management on ${requireLiveContext(transition).branchName} (state: ${transition.currentState})`);
         logger.newline();
         logger.hint(`Advance one step:            idea1 next --url ${projectItemUrl}`);
         logger.hint(`Jump to agent implementation: idea1 start-agent-implementation --url ${projectItemUrl}`);

package/dist/commands/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}

package/dist/commands/update-branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-branch.d.ts","sourceRoot":"","sources":["../../src/commands/update-branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAmB,MAAM,mBAAmB,CAAC;AAsDlE,eAAO,MAAM,mBAAmB,EAAE,OA8MjC,CAAC"}
+{"version":3,"file":"update-branch.d.ts","sourceRoot":"","sources":["../../src/commands/update-branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAsDjD,eAAO,MAAM,mBAAmB,EAAE,OA2IjC,CAAC"}

package/dist/commands/update-branch.js

@@ -1,25 +1,24 @@
-import { exec, execOrThrow } from '../lib/shell.js';
 import { logger } from '../lib/logger.js';
-import * as git from '../services/git.js';
 import { promptConfirm } from '../lib/prompt.js';
+import * as git from '../services/git.js';
+import { getProjectItemSummaryForBranch } from '../workflow/engine/workflow-engine.js';
 /**
- * Walk the stack from startBranch upward, following getStackBranch() links.
+ * Walk the stack from startBranch upward, following each branch's recorded stack branch.
  * Returns a root-first ordered list of branches (excluding the root source).
  * Filters out branches that no longer exist and protects against cycles.
  */
-async function walkStack(startBranch) {
+async function walkStack(startBranch, firstParent) {
     const stack = [startBranch];
     const visited = new Set([startBranch]);
-    let current = startBranch;
+    let parent = firstParent;
     while (true) {
-        const parent = await git.getStackBranch(current);
         if (!parent || visited.has(parent))
             break;
         visited.add(parent);
         if (await git.branchExists(parent)) {
             stack.push(parent);
         }
-        current = parent;
+        parent = (await getProjectItemSummaryForBranch(parent))?.workflowContext?.stackBranch ?? null;
     }
     // Reverse so the oldest ancestor is first, current branch is last
     stack.reverse();
@@ -43,20 +42,21 @@ export const updateBranchCommand = {
     description: 'Update current branch from its source branch (base, integration, or stacked)',
     options: [],
     async execute() {
-        // Phase 1 — Gather metadata
+        // Phase 1 — Read the branch's workflow context
         await git.ensureBranchUpToDate();
         const currentBranch = await git.getCurrentBranch();
-        const workflowType = await git.getDevWorkflowType();
-        const stackBranch = await git.getStackBranch();
-        const integrationBranch = await git.getIntegrationBranch();
-        const baseBranch = await git.getBaseBranch();
-        if (!workflowType && !baseBranch) {
-            throw new Error('This branch is not under workflow management. No workflow type or base branch found in git config.');
+        const context = (await getProjectItemSummaryForBranch(currentBranch))?.workflowContext ?? null;
+        if (!context) {
+            throw new Error('This branch is not under workflow management.');
         }
+        const workflowType = context.devWorkflowType;
+        const stackBranch = context.stackBranch;
+        const integrationBranch = context.integrationBranch;
+        const baseBranch = context.baseBranch;
         // Phase 2 — Build merge plan
         const mergeSteps = [];
         if (stackBranch) {
-            const stack = await walkStack(currentBranch);
+            const stack = await walkStack(currentBranch, stackBranch);
             // Resolve the root source (what the oldest ancestor merges from)
             const rootSource = resolveRootSource(workflowType, integrationBranch, baseBranch);
             if (!rootSource) {
@@ -84,7 +84,7 @@ export const updateBranchCommand = {
             logger.info(`Current branch: ${currentBranch}`);
             logger.info(`Updating from: ${step.source}`);
             await git.fetchAndPullBranch(step.source);
-            await git.mergeBranch(step.source);
+            await git.mergeBranch(step.source, currentBranch);
             logger.success(`Branch ${currentBranch} updated from ${step.source}`);
             return;
         }
@@ -117,6 +117,8 @@ export const updateBranchCommand = {
             const conflict = conflictSteps.has(i) ? '  (potential conflicts detected)' : '';
             logger.info(`  ${i + 1}. ${step.source} -> ${step.target}${conflict}`);
         }
+        logger.info('Each step is a merge commit. A step with conflicts stops the update with its merge in progress:');
+        logger.info('resolve the conflicts, commit the merge, push, and run update-branch again to finish the rest.');
         logger.newline();
         const conflictWarning = conflictSteps.size > 0
             ? ' (conflicts predicted in some steps)'
@@ -127,75 +129,26 @@ export const updateBranchCommand = {
             return;
         }
         // Phase 6 — Execute merges sequentially
-        const originalBranch = currentBranch;
         for (let i = 0; i < mergeSteps.length; i++) {
             const step = mergeSteps[i];
             logger.newline();
             logger.step(`Step ${i + 1}/${mergeSteps.length}: ${step.source} -> ${step.target}`);
             // Fetch source branch to ensure it's current
             await git.fetchAndPullBranch(step.source);
-            // Check if target branch is in a secondary worktree
+            // A target checked out in a secondary worktree is merged there; otherwise check it out here
             const targetWorktreePath = await git.getWorktreePathForBranch(step.target);
             if (targetWorktreePath) {
-                // Target is in another worktree — operate there
                 logger.step(`Branch ${step.target} is in a worktree at ${targetWorktreePath}, merging there...`);
-                await execOrThrow('git', ['pull', 'origin', step.target], { cwd: targetWorktreePath });
-                // Attempt merge in worktree
-                const mergeResult = await exec('git', ['merge', '--no-ff', step.source, '--no-edit'], { cwd: targetWorktreePath });
-                if (mergeResult.exitCode !== 0) {
-                    await exec('git', ['merge', '--abort'], { cwd: targetWorktreePath });
-                    logger.newline();
-                    logger.error(`Merge conflict at step ${i + 1}: ${step.source} -> ${step.target}`);
-                    logger.newline();
-                    const stayToResolve = await promptConfirm(`Re-apply merge in worktree at ${targetWorktreePath} so you can resolve conflicts?`, { default: true });
-                    if (stayToResolve) {
-                        logger.step(`Re-running merge so you can resolve conflicts...`);
-                        await exec('git', ['merge', '--no-ff', step.source, '--no-edit'], { cwd: targetWorktreePath });
-                        logger.info(`Resolve the conflicts in ${targetWorktreePath}, then commit and push ${step.target} before re-running update.`);
-                    }
-                    else {
-                        logger.info('Update aborted. Resolve the upstream conflicts and try again.');
-                    }
-                    return;
-                }
-                logger.success(`Merged ${step.source} into ${step.target}`);
-                // Push intermediate branches
-                if (step.target !== originalBranch) {
-                    await execOrThrow('git', ['push', '--set-upstream', 'origin', step.target], { cwd: targetWorktreePath });
-                }
+                await git.pullBranch(step.target, targetWorktreePath);
+            }
+            else if (await git.getCurrentBranch() !== step.target) {
+                await git.checkoutBranch(step.target);
+                await git.fetchAndPullBranch(step.target);
             }
-            else {
-                // Normal path — checkout target if not already on it
-                const activeBranch = await git.getCurrentBranch();
-                if (activeBranch !== step.target) {
-                    await git.checkoutBranch(step.target);
-                    await git.fetchAndPullBranch(step.target);
-                }
-                // Attempt merge
-                const mergeResult = await exec('git', ['merge', '--no-ff', step.source, '--no-edit']);
-                if (mergeResult.exitCode !== 0) {
-                    await git.abortMerge();
-                    logger.newline();
-                    logger.error(`Merge conflict at step ${i + 1}: ${step.source} -> ${step.target}`);
-                    logger.newline();
-                    const stayToResolve = await promptConfirm(`Stay on ${step.target} to resolve conflicts manually?`, { default: true });
-                    if (stayToResolve) {
-                        logger.step(`Re-running merge so you can resolve conflicts...`);
-                        await exec('git', ['merge', '--no-ff', step.source, '--no-edit']);
-                        logger.info(`Resolve the conflicts, then commit and push ${step.target} before re-running update.`);
-                    }
-                    else {
-                        logger.step(`Returning to ${originalBranch}...`);
-                        await git.checkoutBranch(originalBranch);
-                        logger.info('Update aborted. Resolve the upstream conflicts and try again.');
-                    }
-                    return;
-                }
-                logger.success(`Merged ${step.source} into ${step.target}`);
-                // Push intermediate branches (not the final/current branch)
-                if (step.target !== originalBranch) {
-                    await git.pushToRemote(step.target);
-                }
+            await git.mergeBranch(step.source, step.target, targetWorktreePath ?? undefined);
+            // Push intermediate branches (not the final/current branch)
+            if (step.target !== currentBranch) {
+                await git.pushToRemote(step.target, targetWorktreePath ?? undefined);
             }
         }
         logger.newline();

package/dist/commands/update-branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-branch.js","sourceRoot":"","sources":["../../src/commands/update-branch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-branch.js","sourceRoot":"","sources":["../../src/commands/update-branch.ts"],"names":[],"mappings":"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"}

package/dist/interactive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"AAonBA;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEzE"}
+{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"AAmoBA;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsEzE"}

package/dist/interactive.js

@@ -5,10 +5,8 @@ import { getAllCommands, getCommand } from './commands/index.js';
 import { logger } from './lib/logger.js';
 import { exec } from './lib/shell.js';
 import { VERSION } from './version.js';
-import * as workflow from './services/workflow.js';
-import * as git from './services/git.js';
-import { WorkflowStates } from './lib/workflow-states.js';
-import { syncBranchStateFromRemote } from './services/workflow-engine.js';
+import { getProjectItemSummaryForCurrentBranch } from './workflow/engine/workflow-engine.js';
+import { WorkflowStates, normalizeWorkflowState } from './workflow/data/workflow-states.js';
 /**
  * Get color for workflow state
  */
@@ -33,22 +31,6 @@ function getStateColor(state) {
             return chalk.white;
     }
 }
-/**
- * Adopt any workflow state changes made elsewhere (the web client, another
- * clone) into this checkout once, when interactive mode starts.
- */
-async function syncCurrentBranchFromRemote() {
-    try {
-        const branch = await git.getCurrentBranch();
-        if (branch === 'HEAD' || !await git.getProjectItemUrl(branch)) {
-            return;
-        }
-        await syncBranchStateFromRemote(branch);
-    }
-    catch {
-        // Not in a repository, or offline — the header shows local state
-    }
-}
 /**
  * Display the CLI header
  */
@@ -66,8 +48,15 @@ async function displayHeader(repoRoot) {
             repoName = result.stdout.trim().split('/').pop() ?? '';
         }
     }
-    // Get workflow status — skip PR info here since the header doesn't display it
-    const status = await workflow.getWorkflowStatus({ includePrInfo: false });
+    // The header shows the branch's item and state
+    const { branch, item } = await getProjectItemSummaryForCurrentBranch();
+    const context = item?.workflowContext ?? null;
+    const status = {
+        branch,
+        baseBranch: context?.baseBranch ?? null,
+        workflowState: context ? normalizeWorkflowState(context.workflowStatus) : null,
+        projectItemUrl: item?.url ?? null
+    };
     const headerText = `Idea1 CLI v${VERSION}`;
     const locationText = repoName ? `${cwd} (${repoName})` : cwd;
     // Build status lines
@@ -185,12 +174,22 @@ function filterMenuItems(items, term) {
     return results;
 }
 /**
- * Render a menu item (styled)
+ * Clip plain (unstyled) text to a column width, ending with an ellipsis when clipped
  */
-function renderMenuItem(item, isHighlighted) {
-    const parts = item.displayName.match(/^(\/\S+)(\s*\([^)]*\))?(.*)$/);
+function clipToWidth(text, width) {
+    if (text.length <= width) {
+        return text;
+    }
+    return text.slice(0, Math.max(width - 1, 0)) + '…';
+}
+/**
+ * Render a menu item (styled), clipped to maxWidth columns
+ */
+function renderMenuItem(item, isHighlighted, maxWidth) {
+    const displayName = clipToWidth(item.displayName, maxWidth);
+    const parts = displayName.match(/^(\/\S+)(\s*\([^)]*\))?(.*)$/);
     if (!parts) {
-        return isHighlighted ? chalk.cyan(item.displayName) : chalk.white(item.displayName);
+        return isHighlighted ? chalk.cyan(displayName) : chalk.white(displayName);
     }
     const [, command, aliases = '', rest] = parts;
     if (isHighlighted) {
@@ -202,9 +201,17 @@ const MAX_MENU_ITEMS = 5;
 // Timeout for double-escape detection (milliseconds)
 const DOUBLE_ESCAPE_TIMEOUT = 500;
 // Help text for command search menu (includes tab completion)
-const COMMAND_HELP_TEXT = chalk.dim('↑↓ navigate · tab complete · enter select · esc×2 clear · ctrl+c exit');
+const COMMAND_HELP_TEXT = '↑↓ navigate · tab complete · enter select · esc×2 clear · ctrl+c exit';
 // Help text shown after first escape press in main menu
-const ESCAPE_HINT_TEXT = chalk.yellow('Press Esc again to clear input');
+const ESCAPE_HINT_TEXT = 'Press Esc again to clear input';
+/**
+ * Widest line the prompt draws below the input. Lines stay one column short of the terminal
+ * width so they never wrap: a wrapped line takes an extra row, which scrolls the screen at the
+ * bottom of the terminal and leaves the saved cursor position one row off from the prompt.
+ */
+function getMaxLineWidth() {
+    return process.stdout.columns - 1;
+}
 function createEscapeHandler(callbacks, timeout = DOUBLE_ESCAPE_TIMEOUT) {
     let lastEscapeTime = 0;
     let hintTimer;
@@ -317,7 +324,7 @@ function createInteractivePrompt() {
             if (menuOpen)
                 return;
             process.stdout.write('\n\x1b[2K'); // Move down, clear line
-            process.stdout.write(ESCAPE_HINT_TEXT);
+            process.stdout.write(chalk.yellow(clipToWidth(ESCAPE_HINT_TEXT, getMaxLineWidth())));
             process.stdout.write('\x1b[1A\r'); // Move back up to prompt line start
             // Re-position cursor at end of input
             process.stdout.write('\x1b[' + (currentInput.length + 2) + 'C'); // +2 for "> "
@@ -337,6 +344,7 @@ function createInteractivePrompt() {
             process.stdout.write('\x1b7');
             const hasScrolling = filteredItems.length > MAX_MENU_ITEMS;
             const visibleCount = Math.min(filteredItems.length, MAX_MENU_ITEMS);
+            const maxLineWidth = getMaxLineWidth();
             // Render each menu slot (always MAX_MENU_ITEMS lines)
             for (let i = 0; i < MAX_MENU_ITEMS; i++) {
                 process.stdout.write('\n\x1b[2K'); // Move down, clear line
@@ -349,18 +357,24 @@ function createInteractivePrompt() {
                     let suffix = '';
                     if (hasScrolling) {
                         if (i === 0 && scrollOffset > 0) {
-                            suffix = chalk.dim('  ↑');
+                            suffix = '  ↑';
                         }
                         else if (i === visibleCount - 1 && scrollOffset + visibleCount < filteredItems.length) {
-                            suffix = chalk.dim('  ↓');
+                            suffix = '  ↓';
                         }
                     }
-                    process.stdout.write(prefix + renderMenuItem(item, isHighlighted) + suffix);
+                    const itemWidth = maxLineWidth - 2 - suffix.length; // 2 for the prefix
+                    process.stdout.write(prefix + renderMenuItem(item, isHighlighted, itemWidth) + chalk.dim(suffix));
                 }
             }
             // Render help line
             process.stdout.write('\n\x1b[2K'); // Move down, clear line
-            process.stdout.write(escapeHandler.isShowingHint() ? ESCAPE_HINT_TEXT : COMMAND_HELP_TEXT);
+            if (escapeHandler.isShowingHint()) {
+                process.stdout.write(chalk.yellow(clipToWidth(ESCAPE_HINT_TEXT, maxLineWidth)));
+            }
+            else {
+                process.stdout.write(chalk.dim(clipToWidth(COMMAND_HELP_TEXT, maxLineWidth)));
+            }
             // Restore cursor position
             process.stdout.write('\x1b8');
         };
@@ -521,7 +535,6 @@ function createInteractivePrompt() {
  * Run the interactive REPL
  */
 export async function runInteractiveMode(repoRoot) {
-    await syncCurrentBranchFromRemote();
     await displayHeader(repoRoot);
     displayCommands();
     // eslint-disable-next-line no-constant-condition

package/dist/interactive.js.map

@@ -1 +1 @@
-{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../src/interactive.ts"],"names":[],"mappings":"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"}

package/dist/lib/claude-options.d.ts

@@ -13,20 +13,21 @@ export declare const MODEL_CHOICES: {
 }[];
 /**
  * The options that configure a Claude implementation session. Shared by every
- * command that can launch one, so they all ask the same questions the same way.
- * `promptWhenDefaultExists` controls whether the defaults are confirmed
- * interactively (true when starting an implementation, false when joining).
+ * command that can launch one, so they all ask the same questions the same way;
+ * the defaults are confirmed interactively.
  */
-export declare function claudeSessionOptions(promptWhenDefaultExists: boolean): CommandOption[];
+export declare const claudeSessionOptions: CommandOption[];
 /**
  * How Claude is invoked once the working environment is ready.
  */
 export declare const claudeEntryPointOption: CommandOption;
 /**
- * The prompt Claude is launched with. By default it is the implementation
- * prompt for the project item; answering "No" to "Use default prompt?" asks
- * for the prompt to send instead. Supplying `--entry-point-prompt` directly
- * skips the question, so the prompt can be overridden non-interactively.
+ * The prompt Claude is launched with. By default it is the repository's Agent
+ * Implementation prompt (or the built-in one); answering "No" to "Use default
+ * prompt?" asks for the prompt to send instead. Supplying `--entry-point-prompt`
+ * directly skips the question, so the prompt can be overridden non-interactively.
+ * Either way the prompt is a Handlebars template rendered against the item's
+ * branch context.
  */
 export declare const claudeEntryPointPromptOptions: CommandOption[];
 /**
@@ -37,7 +38,7 @@ export declare function resolveClaudeSessionOptions(resolved: Record<string, str
     model: ClaudeModel;
     effort: ClaudeEffortLevel;
     claudeEntryPointMode: ClaudeEntryPointMode;
-    /** The prompt to launch Claude with, or undefined to use the default implementation prompt. */
-    entryPointPrompt: string | undefined;
+    /** The prompt template to launch Claude with, or null to use the repository's or the built-in one. */
+    entryPointPrompt: string | null;
 };
 //# sourceMappingURL=claude-options.d.ts.map

package/dist/lib/claude-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-options.d.ts","sourceRoot":"","sources":["../../src/lib/claude-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEnI,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,EAAmF,CAAC;AAC7I,eAAO,MAAM,uBAAuB,EAAE,oBAAoB,EAAiC,CAAC;AAC5F,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,EAA8C,CAAC;AAClG,eAAO,MAAM,YAAY,EAAE,WAAW,EAAyC,CAAC;AAChF,eAAO,MAAM,+BAA+B,UAAgB,CAAC;AAE7D,eAAO,MAAM,uBAAuB,EAAE,oBAA6B,CAAC;AACpE,eAAO,MAAM,aAAa,EAAE,WAAoB,CAAC;AACjD,eAAO,MAAM,cAAc,EAAE,iBAA0B,CAAC;AAGxD,eAAO,MAAM,aAAa;;;GAKzB,CAAC;AAiBF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,uBAAuB,EAAE,OAAO,GAAG,aAAa,EAAE,CA8BtF;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAQpC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,EAAE,aAAa,EAqBxD,CAAC;AAEF;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAC7E,cAAc,EAAE,oBAAoB,CAAC;IACrC,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,+FAA+F;IAC/F,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAUA"}
+{"version":3,"file":"claude-options.d.ts","sourceRoot":"","sources":["../../src/lib/claude-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,WAAW,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEnI,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,EAAmF,CAAC;AAC7I,eAAO,MAAM,uBAAuB,EAAE,oBAAoB,EAAiC,CAAC;AAC5F,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,EAA8C,CAAC;AAClG,eAAO,MAAM,YAAY,EAAE,WAAW,EAAyC,CAAC;AAChF,eAAO,MAAM,+BAA+B,UAAgB,CAAC;AAE7D,eAAO,MAAM,uBAAuB,EAAE,oBAA6B,CAAC;AACpE,eAAO,MAAM,aAAa,EAAE,WAAoB,CAAC;AACjD,eAAO,MAAM,cAAc,EAAE,iBAA0B,CAAC;AAGxD,eAAO,MAAM,aAAa;;;GAKzB,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,aAAa,EA4B/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAQpC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,EAAE,aAAa,EAqBxD,CAAC;AAEF;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAC7E,cAAc,EAAE,oBAAoB,CAAC;IACrC,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,sGAAsG;IACtG,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAUA"}