@idea1/cli 1.5.2 → 1.7.0

package/dist/services/workflow-handlers/approve-pr.js

@@ -0,0 +1,161 @@
+import { logger } from '../../lib/logger.js';
+import { promptConfirm } from '../../lib/prompt.js';
+import { WorkflowStates } from '../../lib/workflow-states.js';
+import * as git from '../git.js';
+import * as github from '../github.js';
+import { removeCurrentWorktree, resolveBaseBranch } from '../worktree.js';
+import { requireBranch } from '../workflow-engine.js';
+/**
+ * Entering "Approved and Merged": approve the PR when the user is a requested
+ * reviewer, drop the branch's metadata file so it does not leak into the target
+ * branch, and merge. Afterwards the branch and any worktree are cleaned up.
+ */
+export const approvePrHandler = {
+    state: WorkflowStates.ApprovedAndMerged,
+    options: [
+        {
+            longName: 'comment',
+            shortName: 'c',
+            description: 'Custom approval comment',
+            defaultValue: '',
+            promptWhenDefaultExists: false
+        }
+    ],
+    async prepare(context) {
+        const branchName = requireBranch(context);
+        const comment = context.options['comment'] || 'Approved via idea1 CLI workflow';
+        if (context.workingPath) {
+            await git.ensureBranchUpToDate();
+        }
+        const prInfo = await github.getPrInfo(branchName);
+        if (!prInfo) {
+            throw new Error('No PR found for this branch. Nothing to approve.');
+        }
+        logger.info(`PR #${prInfo.number} found`);
+        // Re-entering this state after the item was moved back: the merge already happened.
+        if (prInfo.state.toUpperCase() === 'MERGED') {
+            logger.dim(`PR #${prInfo.number} is already merged; skipping approval and merge.`);
+            context.branchRetired = true;
+            return;
+        }
+        await approveIfRequestedReviewer(branchName, comment);
+        // Remove the branch metadata file before merging so it does not leak into the target branch
+        if (context.workingPath) {
+            await git.removeBranchMetadataAndPush(branchName);
+        }
+        else {
+            await git.removeBranchMetadataDetached(branchName);
+        }
+        const confirmMerge = await promptConfirm(`Merge PR #${prInfo.number} (${branchName} -> ${context.baseBranch})?`, { default: true });
+        if (!confirmMerge) {
+            throw new Error('Merge cancelled by user');
+        }
+        await mergeWithProtectionFallback(branchName);
+        context.branchRetired = true;
+    },
+    async complete(context) {
+        const branchName = requireBranch(context);
+        await git.fetchLatest();
+        if (!context.workingPath) {
+            await github.deleteRemoteBranch(branchName);
+            printCompletion(context.baseBranch, context.projectItemUrl);
+            return;
+        }
+        const isWorktree = await git.isInsideWorktree();
+        const mainRepoRoot = await git.getMainRepoRoot();
+        // Inside a worktree the base branch cannot be checked out in place, so the
+        // worktree is removed regardless of removeWorktreeAtState.
+        if (isWorktree) {
+            const worktreePath = await removeCurrentWorktree(mainRepoRoot);
+            await deleteBranchQuietly(branchName);
+            printCompletion(context.baseBranch, context.projectItemUrl);
+            logger.hint(`Worktree removed: ${worktreePath}`);
+            logger.hint(`Change to a different folder (e.g. ${mainRepoRoot}) to continue.`);
+            return;
+        }
+        // Switch to the base branch (it may be checked out in another worktree)
+        const baseWorktreePath = await git.getWorktreePathForBranch(context.baseBranch);
+        if (baseWorktreePath) {
+            logger.step(`Base branch ${context.baseBranch} is in a worktree at ${baseWorktreePath}, pulling there...`);
+            await git.updateBranchToLatest(context.baseBranch);
+            const settingsBaseBranch = await resolveBaseBranch();
+            await git.checkoutAndPullBranch(settingsBaseBranch);
+        }
+        else {
+            await git.checkoutAndPullBranch(context.baseBranch);
+        }
+        await deleteBranchQuietly(branchName);
+        printCompletion(context.baseBranch, context.projectItemUrl);
+        if (baseWorktreePath) {
+            logger.hint(`Base branch is in worktree at: ${baseWorktreePath}`);
+        }
+    }
+};
+async function approveIfRequestedReviewer(branchName, comment) {
+    const approvalStatus = await github.getUserApprovalStatus(branchName);
+    if (!approvalStatus) {
+        logger.dim('Could not determine approval status, skipping approval');
+        return;
+    }
+    if (approvalStatus.hasAlreadyApproved) {
+        logger.dim('You have already approved this PR');
+        return;
+    }
+    if (!approvalStatus.isRequestedReviewer) {
+        logger.dim('You are not a requested reviewer on this PR');
+        return;
+    }
+    const approved = await github.approvePr(branchName, comment);
+    if (!approved) {
+        logger.warning('Failed to approve PR, continuing with merge...');
+    }
+}
+/**
+ * Merge the PR; when branch protections block it, offer an admin override.
+ * `gh pr merge` emits a variety of messages depending on the rule that blocked
+ * the merge, and suggests `--admin` when admin privileges can resolve it.
+ */
+async function mergeWithProtectionFallback(branchName) {
+    const mergeResult = await github.mergePr(branchName);
+    if (mergeResult.success) {
+        return;
+    }
+    const errorText = mergeResult.error?.toLowerCase() ?? '';
+    const isBranchProtectionError = errorText.includes('branch protection') ||
+        errorText.includes('required status check') ||
+        errorText.includes('required review') ||
+        errorText.includes('pull request review is required') ||
+        errorText.includes('base branch policy') ||
+        errorText.includes('policy prohibits the merge') ||
+        errorText.includes('--admin');
+    if (!isBranchProtectionError) {
+        throw new Error(`Failed to merge PR: ${mergeResult.error}`);
+    }
+    logger.warning('Merge failed due to branch protections');
+    logger.dim(mergeResult.error ?? '');
+    const override = await promptConfirm('Would you like to override branch protections with admin privileges?', { default: false });
+    if (!override) {
+        throw new Error('Merge cancelled by user');
+    }
+    const adminMergeResult = await github.mergePrWithAdminOverride(branchName);
+    if (!adminMergeResult.success) {
+        throw new Error(`Failed to merge PR with admin override: ${adminMergeResult.error}`);
+    }
+}
+async function deleteBranchQuietly(branchName) {
+    try {
+        await git.deleteBranch(branchName, true);
+    }
+    catch {
+        // The remote branch may already have been deleted automatically after the merge
+        logger.dim(`Note: Branch ${branchName} may have been automatically deleted after merge`);
+    }
+}
+function printCompletion(baseBranch, projectItemUrl) {
+    logger.newline();
+    logger.success('Workflow complete!');
+    logger.newline();
+    logger.hint(`PR merged into ${baseBranch}`);
+    logger.hint(`Project item: ${projectItemUrl}`);
+}
+//# sourceMappingURL=approve-pr.js.map

package/dist/services/workflow-handlers/approve-pr.js.map

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

package/dist/services/workflow-handlers/dev-implementation.d.ts

@@ -0,0 +1,8 @@
+import type { WorkflowStateHandler } from '../../types/index.js';
+/**
+ * Entering "Dev Implementation": the agent's work is committed and pushed and a
+ * PR exists, so a developer can test, clean up and finish the work. Afterwards
+ * the worktree is removed when `removeWorktreeAtState` says so.
+ */
+export declare const devImplementationHandler: WorkflowStateHandler;
+//# sourceMappingURL=dev-implementation.d.ts.map

package/dist/services/workflow-handlers/dev-implementation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-implementation.d.ts","sourceRoot":"","sources":["../../../src/services/workflow-handlers/dev-implementation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAQjE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,oBA0BtC,CAAC"}

package/dist/services/workflow-handlers/dev-implementation.js

@@ -0,0 +1,34 @@
+import { logger } from '../../lib/logger.js';
+import { WorkflowStates } from '../../lib/workflow-states.js';
+import * as git from '../git.js';
+import * as github from '../github.js';
+import { removeWorktreeForWorkflowState } from '../worktree.js';
+import { requireBranch, requireWorkingPath } from '../workflow-engine.js';
+/**
+ * Entering "Dev Implementation": the agent's work is committed and pushed and a
+ * PR exists, so a developer can test, clean up and finish the work. Afterwards
+ * the worktree is removed when `removeWorktreeAtState` says so.
+ */
+export const devImplementationHandler = {
+    state: WorkflowStates.DevImplementation,
+    async prepare(context) {
+        const branchName = requireBranch(context);
+        requireWorkingPath(context, 'commit and push the implementation');
+        if (await git.hasUncommittedChanges()) {
+            await git.commitAllChanges(`Agent Implementation of ${context.projectItemUrl} on ${branchName}`);
+        }
+        await git.pushToRemote(branchName);
+        const prInfo = await github.createPrIfNeeded(branchName, context.baseBranch, context.projectItemUrl);
+        if (prInfo) {
+            logger.hint(`PR: ${prInfo.url}`);
+        }
+    },
+    async complete(context) {
+        const branchName = requireBranch(context);
+        await removeWorktreeForWorkflowState(WorkflowStates.DevImplementation, branchName, context.projectItemUrl, { checkoutBranchInMainRepo: false });
+        logger.newline();
+        logger.success('Transitioned to Dev Implementation');
+        logger.hint('When ready for review, run: idea1 ready-for-approval [--assignee <username>] [--reviewers <user1,user2>]');
+    }
+};
+//# sourceMappingURL=dev-implementation.js.map

package/dist/services/workflow-handlers/dev-implementation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-implementation.js","sourceRoot":"","sources":["../../../src/services/workflow-handlers/dev-implementation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE1E;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAyB;IAC5D,KAAK,EAAE,cAAc,CAAC,iBAAiB;IAEvC,KAAK,CAAC,OAAO,CAAC,OAAO;QACnB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,kBAAkB,CAAC,OAAO,EAAE,oCAAoC,CAAC,CAAC;QAElE,IAAI,MAAM,GAAG,CAAC,qBAAqB,EAAE,EAAE,CAAC;YACtC,MAAM,GAAG,CAAC,gBAAgB,CAAC,2BAA2B,OAAO,CAAC,cAAc,OAAO,UAAU,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QACrG,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,8BAA8B,CAAC,cAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,0GAA0G,CAAC,CAAC;IAC1H,CAAC;CACF,CAAC"}

package/dist/services/workflow-handlers/index.d.ts

@@ -0,0 +1,18 @@
+import type { CommandOption, WorkflowState, WorkflowStateHandler } from '../../types/index.js';
+/**
+ * Side effects attached to entering a workflow state. States without an entry
+ * are status-only: entering them records the state and nothing else.
+ */
+export declare const HANDLERS_BY_STATE: ReadonlyMap<WorkflowState, WorkflowStateHandler>;
+/**
+ * The handler for a state, for commands dedicated to one transition.
+ */
+export declare function getHandler(state: WorkflowState): WorkflowStateHandler;
+/**
+ * Every handler option, for commands that can reach any state (e.g. `next`).
+ * The options are declared so they parse on the command line, but marked
+ * inapplicable so the resolver never prompts for them up front — the engine
+ * prompts for the ones the actual transition needs.
+ */
+export declare function deferredHandlerOptions(): CommandOption[];
+//# sourceMappingURL=index.d.ts.map

package/dist/services/workflow-handlers/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/workflow-handlers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAM/F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,aAAa,EAAE,oBAAoB,CAG9E,CAAC;AAEF;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,aAAa,GAAG,oBAAoB,CAMrE;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,aAAa,EAAE,CAQxD"}

package/dist/services/workflow-handlers/index.js

@@ -0,0 +1,36 @@
+import { agentImplementationHandler } from './agent-implementation.js';
+import { devImplementationHandler } from './dev-implementation.js';
+import { readyForApprovalHandler } from './ready-for-approval.js';
+import { approvePrHandler } from './approve-pr.js';
+/**
+ * Side effects attached to entering a workflow state. States without an entry
+ * are status-only: entering them records the state and nothing else.
+ */
+export const HANDLERS_BY_STATE = new Map([agentImplementationHandler, devImplementationHandler, readyForApprovalHandler, approvePrHandler]
+    .map(handler => [handler.state, handler]));
+/**
+ * The handler for a state, for commands dedicated to one transition.
+ */
+export function getHandler(state) {
+    const handler = HANDLERS_BY_STATE.get(state);
+    if (!handler) {
+        throw new Error(`No workflow handler is registered for "${state}"`);
+    }
+    return handler;
+}
+/**
+ * Every handler option, for commands that can reach any state (e.g. `next`).
+ * The options are declared so they parse on the command line, but marked
+ * inapplicable so the resolver never prompts for them up front — the engine
+ * prompts for the ones the actual transition needs.
+ */
+export function deferredHandlerOptions() {
+    const options = [];
+    for (const handler of HANDLERS_BY_STATE.values()) {
+        for (const option of handler.options ?? []) {
+            options.push({ ...option, dependsOn: () => false });
+        }
+    }
+    return options;
+}
+//# sourceMappingURL=index.js.map

package/dist/services/workflow-handlers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/workflow-handlers/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAqD,IAAI,GAAG,CACxF,CAAC,0BAA0B,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,gBAAgB,CAAC;KAC9F,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAC5C,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,KAAoB;IAC7C,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,0CAA0C,KAAK,GAAG,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB;IACpC,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,EAAE,CAAC;QACjD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/services/workflow-handlers/ready-for-approval.d.ts

@@ -0,0 +1,8 @@
+import type { WorkflowStateHandler } from '../../types/index.js';
+/**
+ * Entering "Needs Approval for Release": the PR is complete and gets its
+ * reviewers and assignee. Afterwards the worktree is removed when
+ * `removeWorktreeAtState` says so (this state is the default).
+ */
+export declare const readyForApprovalHandler: WorkflowStateHandler;
+//# sourceMappingURL=ready-for-approval.d.ts.map

package/dist/services/workflow-handlers/ready-for-approval.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ready-for-approval.d.ts","sourceRoot":"","sources":["../../../src/services/workflow-handlers/ready-for-approval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAQjE;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,oBAsDrC,CAAC"}

package/dist/services/workflow-handlers/ready-for-approval.js

@@ -0,0 +1,60 @@
+import { logger } from '../../lib/logger.js';
+import { WorkflowStates } from '../../lib/workflow-states.js';
+import * as git from '../git.js';
+import * as github from '../github.js';
+import { removeWorktreeForWorkflowState } from '../worktree.js';
+import { requireBranch } from '../workflow-engine.js';
+/**
+ * Entering "Needs Approval for Release": the PR is complete and gets its
+ * reviewers and assignee. Afterwards the worktree is removed when
+ * `removeWorktreeAtState` says so (this state is the default).
+ */
+export const readyForApprovalHandler = {
+    state: WorkflowStates.NeedsApprovalForRelease,
+    options: [
+        {
+            longName: 'assignee',
+            shortName: 'a',
+            description: 'Who to assign the PR to',
+            choices: 'github-members',
+            allowNone: true
+        },
+        {
+            longName: 'reviewers',
+            shortName: 'r',
+            description: 'Who to request a review from (select any number)',
+            choices: 'github-members',
+            multiSelect: true
+        }
+    ],
+    async prepare(context) {
+        const branchName = requireBranch(context);
+        const assignee = context.options['assignee'] ?? '';
+        const reviewers = (context.options['reviewers'] ?? '')
+            .split(',')
+            .map(name => name.trim())
+            .filter(name => name.length > 0);
+        if (context.workingPath) {
+            await git.ensureBranchUpToDate();
+        }
+        const prInfo = await github.checkPrExists(branchName, context.baseBranch);
+        if (!prInfo) {
+            throw new Error('No PR exists for this branch. Move the item to Dev Implementation first (idea1 next), which creates the PR.');
+        }
+        logger.info(`PR #${prInfo.number} found`);
+        await github.assignReviewers(branchName, reviewers);
+        await github.assignAssignee(branchName, assignee);
+        if (reviewers.length === 0 && !assignee) {
+            logger.dim('No reviewers requested and no assignee set.');
+        }
+        logger.hint(`PR: ${prInfo.url}`);
+    },
+    async complete(context) {
+        const branchName = requireBranch(context);
+        await removeWorktreeForWorkflowState(WorkflowStates.NeedsApprovalForRelease, branchName, context.projectItemUrl, { checkoutBranchInMainRepo: false });
+        logger.newline();
+        logger.success('PR is ready for approval');
+        logger.hint('When approved, run: idea1 approve-pr');
+    }
+};
+//# sourceMappingURL=ready-for-approval.js.map

package/dist/services/workflow-handlers/ready-for-approval.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ready-for-approval.js","sourceRoot":"","sources":["../../../src/services/workflow-handlers/ready-for-approval.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAyB;IAC3D,KAAK,EAAE,cAAc,CAAC,uBAAuB;IAC7C,OAAO,EAAE;QACP;YACE,QAAQ,EAAE,UAAU;YACpB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,yBAAyB;YACtC,OAAO,EAAE,gBAAgB;YACzB,SAAS,EAAE,IAAI;SAChB;QACD;YACE,QAAQ,EAAE,WAAW;YACrB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,kDAAkD;YAC/D,OAAO,EAAE,gBAAgB;YACzB,WAAW,EAAE,IAAI;SAClB;KACF;IAED,KAAK,CAAC,OAAO,CAAC,OAAO;QACnB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;aACnD,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6GAA6G,CAAC,CAAC;QACjI,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,CAAC;QAE1C,MAAM,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,8BAA8B,CAAC,cAAc,CAAC,uBAAuB,EAAE,UAAU,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtJ,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;CACF,CAAC"}

package/dist/services/workflow.d.ts

@@ -1,24 +1,4 @@
-import type { WorkflowState, WorkflowTransition, PrInfo } from '../types/index.js';
-/**
- * Whether a workflow state is the target state or a later one in the sequence
- */
-export declare function isStateAtOrAfter(state: WorkflowState, targetState: WorkflowState): boolean;
-/**
- * Validate if a transition is valid from the current workflow state
- */
-export declare function validateTransition(transition: WorkflowTransition): Promise<{
-    valid: boolean;
-    currentState: WorkflowState | null;
-    error?: string;
-}>;
-/**
- * Get the next available transition from the current workflow state
- */
-export declare function getNextTransition(): Promise<WorkflowTransition | null>;
-/**
- * Ensure all workflow preconditions are met before proceeding
- */
-export declare function ensureWorkflowPreconditions(): Promise<void>;
+import type { WorkflowState, PrInfo } from '../types/index.js';
 /**
  * Get comprehensive workflow status for the current branch
  */

package/dist/services/workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/services/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAqBnF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,GAAG,OAAO,CAE1F;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,aAAa,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BjF;AAED;;GAEG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAU5E;AAED;;GAEG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAUjE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACtF,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC,CAgCD"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/services/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAK/D;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACtF,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC,CAgCD"}

package/dist/services/workflow.js

@@ -1,72 +1,6 @@
 import * as git from './git.js';
 import * as github from './github.js';
-import { WORKFLOW_STATE_ORDER, normalizeWorkflowState } from '../lib/workflow-states.js';
-/**
- * Valid workflow state transitions
- */
-const VALID_TRANSITIONS = {
-    'Build Spec in Progress': [],
-    'Refinement - Build Spec': [],
-    'Refinement - Implementation': [],
-    'Ready for Agent Implementation': [],
-    'Agent Implementation': ['start-dev-implementation'],
-    'Dev Implementation': ['ready-for-approval'],
-    'Needs Approval for Release': ['approve-pr'],
-    'Approved and Merged': [],
-    'Released': []
-};
-/**
- * Whether a workflow state is the target state or a later one in the sequence
- */
-export function isStateAtOrAfter(state, targetState) {
-    return WORKFLOW_STATE_ORDER.indexOf(state) >= WORKFLOW_STATE_ORDER.indexOf(targetState);
-}
-/**
- * Validate if a transition is valid from the current workflow state
- */
-export async function validateTransition(transition) {
-    const currentState = normalizeWorkflowState(await git.getWorkflowState());
-    if (!currentState) {
-        return {
-            valid: false,
-            currentState: null,
-            error: 'No workflow state found. This branch may not be under workflow management.'
-        };
-    }
-    const validTransitions = VALID_TRANSITIONS[currentState];
-    if (!validTransitions || !validTransitions.includes(transition)) {
-        const availableTransitions = validTransitions && validTransitions.length > 0
-            ? `Available transitions: ${validTransitions.join(', ')}`
-            : 'No transitions available from this state.';
-        return {
-            valid: false,
-            currentState,
-            error: `Cannot perform '${transition}' from state '${currentState}'. ${availableTransitions}`
-        };
-    }
-    return { valid: true, currentState };
-}
-/**
- * Get the next available transition from the current workflow state
- */
-export async function getNextTransition() {
-    const currentState = normalizeWorkflowState(await git.getWorkflowState());
-    if (!currentState) {
-        return null;
-    }
-    const validTransitions = VALID_TRANSITIONS[currentState];
-    return validTransitions && validTransitions.length > 0 ? validTransitions[0] : null;
-}
-/**
- * Ensure all workflow preconditions are met before proceeding
- */
-export async function ensureWorkflowPreconditions() {
-    const projectItemUrl = await git.getProjectItemUrl();
-    if (!projectItemUrl) {
-        throw new Error('This branch is not under workflow management. Start with: idea1 start-project-item <url>');
-    }
-    await git.ensureBranchUpToDate();
-}
+import { normalizeWorkflowState } from '../lib/workflow-states.js';
 /**
  * Get comprehensive workflow status for the current branch
  */

package/dist/services/workflow.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/services/workflow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../src/services/workflow.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAqC;IAO3E,MAAM,CAAC,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,mBAAmB,CAAC,GAC/E,MAAM,OAAO,CAAC,UAAU,CAAC;QACvB,GAAG,CAAC,gBAAgB,EAAE;QACtB,GAAG,CAAC,aAAa,EAAE;QACnB,GAAG,CAAC,iBAAiB,EAAE;QACvB,GAAG,CAAC,gBAAgB,EAAE;KACvB,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACvG,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,KAAK,WAAW;QAC9D,CAAC,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,KAAK,CAAC;QACnD,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,OAAO,EAAE,aAAa,KAAK,KAAK,IAAI,MAAM,EAAE,CAAC;QAC/C,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,oCAAoC;QACtC,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QACN,UAAU;QACV,cAAc;QACd,aAAa;QACb,MAAM;KACP,CAAC;AACJ,CAAC"}

package/dist/services/worktree.d.ts

@@ -1,4 +1,4 @@
-import type { ClaudePermissionMode, ClaudeEntryPointMode, ClaudeEffortLevel, IsolationMode, WorkflowState } from '../types/index.js';
+import type { ClaudePermissionMode, ClaudeEntryPointMode, ClaudeEffortLevel, ClaudeModel, IsolationMode, WorkflowState } from '../types/index.js';
 /**
  * Run the setup-worktree hook if defined in .idea1/settings.json
  */
@@ -20,19 +20,11 @@ export declare function removeWorktreeForWorkflowState(state: WorkflowState, bra
     checkoutBranchInMainRepo: boolean;
 }): Promise<void>;
 /**
- * Resolve the branch prefix using config hierarchy:
- * 1. CLI argument (if provided)
- * 2. User-level XDG config
- * 3. Repo-level .idea1/settings.json
- * 4. Hardcoded default
+ * Resolve the prefix new branches are created under
  */
 export declare function resolveBranchPrefix(cliPrefix?: string): Promise<string>;
 /**
- * Resolve the base branch using config hierarchy:
- * 1. CLI argument (if provided)
- * 2. User-level XDG config
- * 3. Repo-level .idea1/settings.json
- * 4. Hardcoded default
+ * Resolve the branch new branches are cut from and their pull requests target
  */
 export declare function resolveBaseBranch(cliBaseBranch?: string): Promise<string>;
 /**
@@ -60,48 +52,46 @@ export declare function listExistingIntegrationBranches(): Promise<string[]>;
  * Extract the integration name from a full integration branch name
  */
 export declare function extractIntegrationName(fullBranchName: string): Promise<string>;
-/**
- * Prepare repository for worktree creation with a pre-computed full branch name.
- * The sourceBranch is the branch to base the new branch off of (may differ from baseBranch for PRs).
- */
-export declare function prepareBranchForWorktreeWithFullName(fullBranchName: string, shortBranchName: string, sourceBranchName: string, baseBranchName: string): Promise<string>;
 /**
  * Ensure an integration branch exists, creating it from baseBranch if needed
  */
 export declare function ensureIntegrationBranch(integrationBranchName: string, baseBranchName: string): Promise<void>;
 /**
- * Options shared by every branch-environment setup path.
+ * Options shared by every path that launches a Claude session on a branch.
  */
 export interface BranchSetupOptions {
     projectItemUrl?: string;
     permissionMode?: ClaudePermissionMode;
+    model?: ClaudeModel;
     effort?: ClaudeEffortLevel;
     claudeEntryPointMode?: ClaudeEntryPointMode;
 }
-/**
- * Set up the working environment for a freshly-prepared branch, in whichever
- * location the user chose: an isolated worktree or the main repository.
- * Returns the directory the branch is checked out in.
- */
-export declare function setupBranchEnvironment(isolationMode: IsolationMode, fullBranchName: string, shortBranchName: string, baseBranchName: string, options?: BranchSetupOptions): Promise<string>;
 /**
  * Setup worktree isolation - creates worktree, runs hooks, optionally launches Claude
  */
 export declare function setupWorktreeIsolation(fullBranchName: string, shortBranchName: string, baseBranchName: string, options?: BranchSetupOptions): Promise<string>;
 /**
- * Setup the branch in the main repository instead of a worktree: check it out
- * in place, record its metadata, and finalize. The branch must already exist
- * (prepared by the caller), mirroring setupWorktreeIsolation.
+ * Ensure a branch has a local working environment: reuse the checkout that
+ * already holds it, or create one — an isolated worktree, or the branch checked
+ * out in the main repository (creating a local tracking branch when it exists
+ * only on origin). The repo-specific setup hook runs for newly created
+ * worktrees only; the main repository is already set up for development.
+ * Returns the directory the branch is checked out in.
+ */
+export declare function ensureBranchEnvironment(isolationMode: IsolationMode, branchName: string): Promise<{
+    workingPath: string;
+    created: boolean;
+}>;
+/**
+ * Invoke Claude on a branch's working directory per the entry-point mode, then
+ * print the directory path and next-step hint. This is the only place the CLI
+ * starts a Claude session that writes code.
  */
-export declare function setupMainRepoIsolation(fullBranchName: string, baseBranchName: string, options?: BranchSetupOptions): Promise<string>;
+export declare function launchClaudeForBranch(workingPath: string, options?: BranchSetupOptions): Promise<void>;
 /**
- * Finalize a branch working environment: run the repo-specific setup hook (for
- * worktrees only — the main repository is already set up), invoke Claude per
- * the entry-point mode, and print the directory path and next-step hint.
- * Shared by every setup path: new branches (worktree or main repo) and
- * join-project-item (existing branches).
+ * Tell the user where the branch is checked out and how to move the workflow on.
  */
-export declare function finalizeBranchSetup(workingPath: string, isolationMode: IsolationMode, options?: BranchSetupOptions): Promise<void>;
+export declare function printWorkingDirectoryHints(workingPath: string): void;
 /**
  * Prepare repository for worktree creation - validates, fetches, and creates branch
  */

package/dist/services/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/services/worktree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/services/worktree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,WAAW,EAAmB,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAanK;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB1E;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAejF;AAED;;;;;;;GAOG;AACH,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE;IAAE,wBAAwB,EAAE,OAAO,CAAA;CAAE,GAC7C,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAoCD;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO7E;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO/E;AAED;;;;;GAKG;AACH,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,MAAM,CAAC,CAOtE;AAkCD;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMzF;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAAC,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOtH;AAED;;GAEG;AACH,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAazE;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBpF;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,qBAAqB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAclH;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,oBAAoB,CAAC;IACtC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAgBpD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAYhH;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAMpE;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAuBjB"}