takt 0.35.2 → 0.35.3

package/dist/features/tasks/list/index.js.map

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

package/dist/features/tasks/list/listNonInteractive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"listNonInteractive.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/listNonInteractive.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkBH,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAiCD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,yBAAyB,GACxC,OAAO,CAAC,IAAI,CAAC,CA0Df"}
+{"version":3,"file":"listNonInteractive.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/listNonInteractive.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkBH,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAqBD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,yBAAyB,GACxC,OAAO,CAAC,IAAI,CAAC,CA4Df"}

package/dist/features/tasks/list/listNonInteractive.js

@@ -4,13 +4,12 @@
  * Handles --non-interactive output (text/JSON) and
  * non-interactive branch actions (--action, --branch).
  */
-import { execFileSync } from 'node:child_process';
-import { detectDefaultBranch, TaskRunner, serializeTaskListItemForJson, } from '../../../infra/task/index.js';
+import { TaskRunner, serializeTaskListItemForJson, } from '../../../infra/task/index.js';
 import { info } from '../../../shared/ui/index.js';
-import { tryMergeBranch, mergeBranch, deleteBranch, } from './taskActions.js';
+import { tryMergeBranch, mergeBranch, deleteBranch, showDiffStatForTask, syncBranchWithRoot, } from './taskActions.js';
 import { formatTaskStatusLabel, formatShortDate } from './taskStatusLabel.js';
 function isValidAction(action) {
-    return action === 'diff' || action === 'try' || action === 'merge' || action === 'delete';
+    return action === 'diff' || action === 'sync' || action === 'try' || action === 'merge' || action === 'delete';
 }
 function printNonInteractiveList(tasks, format) {
     const outputFormat = format ?? 'text';
@@ -25,20 +24,10 @@ function printNonInteractiveList(tasks, format) {
         info(`${formatTaskStatusLabel(task)} - ${task.summary ?? task.content} (${formatShortDate(task.createdAt)})`);
     }
 }
-function showDiffStat(projectDir, defaultBranch, branch) {
-    try {
-        const stat = execFileSync('git', ['diff', '--stat', `${defaultBranch}...${branch}`], { cwd: projectDir, encoding: 'utf-8', stdio: 'pipe' });
-        info(stat);
-    }
-    catch {
-        info('Could not generate diff stat');
-    }
-}
 /**
  * Run list-tasks in non-interactive mode.
  */
 export async function listTasksNonInteractive(cwd, nonInteractive) {
-    const defaultBranch = detectDefaultBranch(cwd);
     const runner = new TaskRunner(cwd);
     const tasks = runner.listAllTaskItems();
     if (tasks.length === 0) {
@@ -59,7 +48,7 @@ export async function listTasksNonInteractive(cwd, nonInteractive) {
         process.exit(1);
     }
     if (!isValidAction(nonInteractive.action)) {
-        info('Invalid --action. Use one of: diff, try, merge, delete.');
+        info('Invalid --action. Use one of: diff, sync, try, merge, delete.');
         process.exit(1);
     }
     const task = tasks.find((entry) => entry.kind === 'completed' && entry.branch === nonInteractive.branch);
@@ -69,11 +58,14 @@ export async function listTasksNonInteractive(cwd, nonInteractive) {
     }
     switch (nonInteractive.action) {
         case 'diff':
-            showDiffStat(cwd, defaultBranch, nonInteractive.branch);
+            showDiffStatForTask(cwd, task);
             return;
         case 'try':
             tryMergeBranch(cwd, task);
             return;
+        case 'sync':
+            await syncBranchWithRoot(cwd, task);
+            return;
         case 'merge':
             if (mergeBranch(cwd, task)) {
                 runner.deleteTask(task.name, 'completed');

package/dist/features/tasks/list/listNonInteractive.js.map

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

package/dist/features/tasks/list/taskActionTarget.d.ts

@@ -12,6 +12,7 @@ export declare function resolveTargetInstruction(target: BranchActionTarget): st
 export declare function validateWorktreeTarget(target: BranchActionTarget, actionName: string): target is TaskListItem & {
     worktreePath: string;
 };
+export declare function ensureRootBranchReady(projectDir: string, target: BranchActionTarget, actionName: string): boolean;
 /** Relay push: clone HEAD を root repo 経由で origin へ転送する（checked-out branch を変更しない） */
 export declare function pushWorktreeToOrigin(worktreePath: string, projectDir: string, branch: string): void;
 //# sourceMappingURL=taskActionTarget.d.ts.map

package/dist/features/tasks/list/taskActionTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskActionTarget.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActionTarget.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,qBAAqB,CAAC,CAAC;AAErG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAQtE;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS,CAKxF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAK3E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,MAAM,GACjB,MAAM,IAAI,YAAY,GAAG;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAUnD;AAED,qFAAqF;AACrF,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAGnG"}
+{"version":3,"file":"taskActionTarget.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActionTarget.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE5F,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,qBAAqB,CAAC,CAAC;AAErG,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAQtE;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS,CAKxF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAK3E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,MAAM,GACjB,MAAM,IAAI,YAAY,GAAG;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAUnD;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,kBAAkB,EAC1B,UAAU,EAAE,MAAM,GACjB,OAAO,CAwCT;AAED,qFAAqF;AACrF,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAInG"}

package/dist/features/tasks/list/taskActionTarget.js

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs';
-import { error as logError } from '../../../shared/ui/index.js';
+import { localBranchExists, materializeCloneHeadToRootBranch, relayPushCloneToOrigin } from '../../../infra/task/index.js';
+import { error as logError, info } from '../../../shared/ui/index.js';
 import { createLogger } from '../../../shared/utils/index.js';
-import { relayPushCloneToOrigin } from '../../../infra/task/index.js';
 const log = createLogger('list-tasks');
 export function resolveTargetBranch(target) {
     if ('kind' in target) {
@@ -39,8 +39,49 @@ export function validateWorktreeTarget(target, actionName) {
     }
     return true;
 }
+export function ensureRootBranchReady(projectDir, target, actionName) {
+    const branch = resolveTargetBranch(target);
+    if (localBranchExists(projectDir, branch)) {
+        return true;
+    }
+    const worktreePath = resolveTargetWorktreePath(target);
+    if (!worktreePath || !fs.existsSync(worktreePath)) {
+        logError(`Branch ${branch} is missing in root, and no worktree is available to restore it.`);
+        log.error('Root branch missing and worktree unavailable', {
+            projectDir,
+            branch,
+            actionName,
+            worktreePath,
+        });
+        return false;
+    }
+    try {
+        materializeCloneHeadToRootBranch(worktreePath, projectDir, branch);
+        info(`Restored missing root branch ${branch} from worktree.`);
+        log.info('Restored missing root branch from worktree', {
+            projectDir,
+            branch,
+            actionName,
+            worktreePath,
+        });
+        return true;
+    }
+    catch (err) {
+        const error = err instanceof Error ? err.message : String(err);
+        logError(`Failed to restore missing root branch ${branch}: ${error}`);
+        log.error('Failed to restore missing root branch from worktree', {
+            projectDir,
+            branch,
+            actionName,
+            worktreePath,
+            error,
+        });
+        return false;
+    }
+}
 /** Relay push: clone HEAD を root repo 経由で origin へ転送する（checked-out branch を変更しない） */
 export function pushWorktreeToOrigin(worktreePath, projectDir, branch) {
+    materializeCloneHeadToRootBranch(worktreePath, projectDir, branch);
     relayPushCloneToOrigin(worktreePath, projectDir, branch);
     log.info('Relay pushed to origin', { worktreePath, projectDir, branch });
 }

package/dist/features/tasks/list/taskActionTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskActionTarget.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActionTarget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAMvC,MAAM,UAAU,mBAAmB,CAAC,MAA0B;IAC5D,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,uCAAuC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAA0B;IAClE,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA0B;IACjE,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,OAAO,MAAM,CAAC,mBAAmB,CAAC;AACpC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAA0B,EAC1B,UAAkB;IAElB,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,0BAA0B,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAChE,QAAQ,CAAC,+CAA+C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,oBAAoB,CAAC,YAAoB,EAAE,UAAkB,EAAE,MAAc;IAC3F,sBAAsB,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IACzD,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;AAC3E,CAAC"}
+{"version":3,"file":"taskActionTarget.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActionTarget.ts"],"names":[],"mappings":"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"}

package/dist/features/tasks/list/taskActions.d.ts

@@ -2,7 +2,7 @@
  * Individual actions for task-centric list items.
  */
 export type { ListAction } from './taskActionTarget.js';
-export { showFullDiff, showDiffAndPromptActionForTask, } from './taskDiffActions.js';
+export { showFullDiff, showDiffStatForTask, showDiffAndPromptActionForTask, } from './taskDiffActions.js';
 export { isBranchMerged, tryMergeBranch, mergeBranch, deleteBranch, } from './taskBranchLifecycleActions.js';
 export { instructBranch } from './taskInstructionActions.js';
 export { syncBranchWithRoot } from './taskSyncAction.js';

package/dist/features/tasks/list/taskActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EACL,YAAY,EACZ,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"taskActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/features/tasks/list/taskActions.js

@@ -1,7 +1,7 @@
 /**
  * Individual actions for task-centric list items.
  */
-export { showFullDiff, showDiffAndPromptActionForTask, } from './taskDiffActions.js';
+export { showFullDiff, showDiffStatForTask, showDiffAndPromptActionForTask, } from './taskDiffActions.js';
 export { isBranchMerged, tryMergeBranch, mergeBranch, deleteBranch, } from './taskBranchLifecycleActions.js';
 export { instructBranch } from './taskInstructionActions.js';
 export { syncBranchWithRoot } from './taskSyncAction.js';

package/dist/features/tasks/list/taskActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,YAAY,EACZ,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"taskActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskActions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/features/tasks/list/taskBranchLifecycleActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskBranchLifecycleActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskBranchLifecycleActions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,kBAAkB,EAAkD,MAAM,uBAAuB,CAAC;AAIhH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAgB1E;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAqBtF;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CA8CnF;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAwCpF"}
+{"version":3,"file":"taskBranchLifecycleActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskBranchLifecycleActions.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,uBAAuB,CAAC;AAqB/B,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAgB1E;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAyBtF;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAkDnF;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAwCpF"}

package/dist/features/tasks/list/taskBranchLifecycleActions.js

@@ -5,8 +5,23 @@ import { cleanupOrphanedClone } from '../../../infra/task/index.js';
 import { encodeWorktreePath } from '../../../infra/config/project/sessionStore.js';
 import { info, success, error as logError, warn } from '../../../shared/ui/index.js';
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
-import { resolveTargetBranch, resolveTargetWorktreePath } from './taskActionTarget.js';
+import { ensureRootBranchReady, resolveTargetBranch, resolveTargetWorktreePath, } from './taskActionTarget.js';
 const log = createLogger('list-tasks');
+function getGitCommandErrorDetail(err) {
+    if (typeof err === 'object' && err !== null && 'stderr' in err) {
+        const stderr = err.stderr;
+        if (typeof stderr === 'string' && stderr.trim()) {
+            return stderr.trim();
+        }
+        if (Buffer.isBuffer(stderr)) {
+            const text = stderr.toString('utf-8').trim();
+            if (text) {
+                return text;
+            }
+        }
+    }
+    return getErrorMessage(err);
+}
 export function isBranchMerged(projectDir, branch) {
     const result = spawnSync('git', ['merge-base', '--is-ancestor', branch, 'HEAD'], {
         cwd: projectDir,
@@ -23,6 +38,9 @@ export function isBranchMerged(projectDir, branch) {
     return result.status === 0;
 }
 export function tryMergeBranch(projectDir, target) {
+    if (!ensureRootBranchReady(projectDir, target, 'try merge')) {
+        return false;
+    }
     const branch = resolveTargetBranch(target);
     try {
         execFileSync('git', ['merge', '--squash', branch], {
@@ -36,7 +54,7 @@ export function tryMergeBranch(projectDir, target) {
         return true;
     }
     catch (err) {
-        const msg = getErrorMessage(err);
+        const msg = getGitCommandErrorDetail(err);
         logError(`Squash merge failed: ${msg}`);
         logError('You may need to resolve conflicts manually.');
         log.error('Try-merge (squash) failed', { branch, error: msg });
@@ -44,6 +62,9 @@ export function tryMergeBranch(projectDir, target) {
     }
 }
 export function mergeBranch(projectDir, target) {
+    if (!ensureRootBranchReady(projectDir, target, 'merge')) {
+        return false;
+    }
     const branch = resolveTargetBranch(target);
     const alreadyMerged = isBranchMerged(projectDir, branch);
     try {
@@ -82,7 +103,7 @@ export function mergeBranch(projectDir, target) {
         return true;
     }
     catch (err) {
-        const msg = getErrorMessage(err);
+        const msg = getGitCommandErrorDetail(err);
         logError(`Merge failed: ${msg}`);
         logError('You may need to resolve conflicts manually.');
         log.error('Merge & cleanup failed', { branch, error: msg });

package/dist/features/tasks/list/taskBranchLifecycleActions.js.map

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

package/dist/features/tasks/list/taskDiffActions.d.ts

@@ -1,4 +1,5 @@
 import { type BranchActionTarget, type ListAction } from './taskActionTarget.js';
-export declare function showFullDiff(cwd: string, branch: string): void;
+export declare function showFullDiff(cwd: string, target: BranchActionTarget): void;
+export declare function showDiffStatForTask(cwd: string, target: BranchActionTarget): void;
 export declare function showDiffAndPromptActionForTask(cwd: string, target: BranchActionTarget): Promise<ListAction | null>;
 //# sourceMappingURL=taskDiffActions.d.ts.map

package/dist/features/tasks/list/taskDiffActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskDiffActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskDiffActions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,UAAU,EAAiD,MAAM,uBAAuB,CAAC;AAIhI,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAsB9D;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAsC5B"}
+{"version":3,"file":"taskDiffActions.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskDiffActions.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,UAAU,EAIhB,MAAM,uBAAuB,CAAC;AAI/B,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAyB1E;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAuBjF;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAwB5B"}

package/dist/features/tasks/list/taskDiffActions.js

@@ -4,9 +4,14 @@ import { detectDefaultBranch } from '../../../infra/task/index.js';
 import { selectOption } from '../../../shared/prompt/index.js';
 import { info, warn, header, blankLine } from '../../../shared/ui/index.js';
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
-import { resolveTargetBranch, resolveTargetInstruction } from './taskActionTarget.js';
+import { ensureRootBranchReady, resolveTargetBranch, resolveTargetInstruction, } from './taskActionTarget.js';
 const log = createLogger('list-tasks');
-export function showFullDiff(cwd, branch) {
+export function showFullDiff(cwd, target) {
+    if (!ensureRootBranchReady(cwd, target, 'full diff')) {
+        warn('Could not display diff');
+        return;
+    }
+    const branch = resolveTargetBranch(target);
     const defaultBranch = detectDefaultBranch(cwd);
     try {
         const result = spawnSync('git', ['diff', '--color=always', `${defaultBranch}...${branch}`], {
@@ -27,15 +32,13 @@ export function showFullDiff(cwd, branch) {
         });
     }
 }
-export async function showDiffAndPromptActionForTask(cwd, target) {
+export function showDiffStatForTask(cwd, target) {
+    if (!ensureRootBranchReady(cwd, target, 'diff stat')) {
+        warn('Could not generate diff stat');
+        return;
+    }
     const branch = resolveTargetBranch(target);
-    const instruction = resolveTargetInstruction(target);
     const defaultBranch = detectDefaultBranch(cwd);
-    header(branch);
-    if (instruction) {
-        info(chalk.dim(`  ${instruction}`));
-    }
-    blankLine();
     try {
         const stat = execFileSync('git', ['diff', '--stat', `${defaultBranch}...${branch}`], { cwd, encoding: 'utf-8', stdio: 'pipe' });
         info(stat);
@@ -48,6 +51,16 @@ export async function showDiffAndPromptActionForTask(cwd, target) {
             error: getErrorMessage(err),
         });
     }
+}
+export async function showDiffAndPromptActionForTask(cwd, target) {
+    const branch = resolveTargetBranch(target);
+    const instruction = resolveTargetInstruction(target);
+    header(branch);
+    if (instruction) {
+        info(chalk.dim(`  ${instruction}`));
+    }
+    blankLine();
+    showDiffStatForTask(cwd, target);
     return await selectOption(`Action for ${branch}:`, [
         { label: 'View diff', value: 'diff', description: 'Show full diff in pager' },
         { label: 'Instruct', value: 'instruct', description: 'Craft additional instructions and requeue this task' },

package/dist/features/tasks/list/taskDiffActions.js.map

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

package/dist/features/tasks/list/taskSyncAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taskSyncAction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,uBAAuB,CAAC;AAM/B,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,OAAO,CAAC,CA+ElB"}
+{"version":3,"file":"taskSyncAction.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskSyncAction.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,uBAAuB,CAAC;AAuB/B,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,OAAO,CAAC,CAkFlB"}

package/dist/features/tasks/list/taskSyncAction.js

@@ -3,11 +3,28 @@ import { success, error as logError, StreamDisplay } from '../../../shared/ui/in
 import { createLogger, getErrorMessage } from '../../../shared/utils/index.js';
 import { getProvider } from '../../../infra/providers/index.js';
 import { resolveConfigValues } from '../../../infra/config/index.js';
+import { resolveAssistantProviderModelFromConfig } from '../../../core/config/provider-resolution.js';
 import { loadTemplate } from '../../../shared/prompts/index.js';
 import { getLanguage } from '../../../infra/config/index.js';
+import { resolveAssistantConfigLayers } from '../../interactive/assistantConfig.js';
 import { resolveTargetBranch, resolveTargetInstruction, validateWorktreeTarget, pushWorktreeToOrigin, } from './taskActionTarget.js';
 const log = createLogger('list-tasks');
 const SYNC_REF = 'refs/remotes/root/sync-target';
+function getGitCommandErrorDetail(err) {
+    if (typeof err === 'object' && err !== null && 'stderr' in err) {
+        const stderr = err.stderr;
+        if (typeof stderr === 'string' && stderr.trim()) {
+            return stderr.trim();
+        }
+        if (Buffer.isBuffer(stderr)) {
+            const text = stderr.toString('utf-8').trim();
+            if (text) {
+                return text;
+            }
+        }
+    }
+    return getErrorMessage(err);
+}
 export async function syncBranchWithRoot(projectDir, target) {
     if (!validateWorktreeTarget(target, 'Sync')) {
         return false;
@@ -23,7 +40,7 @@ export async function syncBranchWithRoot(projectDir, target) {
         log.info('Fetched root HEAD into sync-target ref', { worktreePath, projectDir });
     }
     catch (err) {
-        const msg = getErrorMessage(err);
+        const msg = getGitCommandErrorDetail(err);
         logError(`Failed to fetch from root: ${msg}`);
         log.error('git fetch failed', { worktreePath, projectDir, error: msg });
         return false;
@@ -40,7 +57,7 @@ export async function syncBranchWithRoot(projectDir, target) {
         mergeConflict = true;
         log.info('Merge conflict detected, attempting AI resolution', {
             worktreePath,
-            error: getErrorMessage(err),
+            error: getGitCommandErrorDetail(err),
         });
     }
     if (!mergeConflict) {
@@ -55,17 +72,18 @@ export async function syncBranchWithRoot(projectDir, target) {
     const originalInstruction = resolveTargetInstruction(target);
     const systemPrompt = loadTemplate('sync_conflict_resolver_system_prompt', lang);
     const prompt = loadTemplate('sync_conflict_resolver_message', lang, { originalInstruction });
-    const config = resolveConfigValues(projectDir, ['provider', 'model', 'syncConflictResolver']);
-    if (!config.provider) {
+    const config = resolveConfigValues(projectDir, ['syncConflictResolver']);
+    const resolvedProviderModel = resolveAssistantProviderModelFromConfig(resolveAssistantConfigLayers(projectDir));
+    if (!resolvedProviderModel.provider) {
         throw new Error('No provider configured. Set "provider" in ~/.takt/config.yaml');
     }
-    const providerType = config.provider;
+    const providerType = resolvedProviderModel.provider;
     const provider = getProvider(providerType);
     const agent = provider.setup({ name: 'conflict-resolver', systemPrompt });
     const onPermissionRequest = config.syncConflictResolver?.autoApproveTools ? autoApproveBash : undefined;
     const response = await agent.call(prompt, {
         cwd: worktreePath,
-        model: config.model,
+        model: resolvedProviderModel.model,
         permissionMode: 'edit',
         onPermissionRequest,
         onStream: new StreamDisplay('conflict-resolver', false).createHandler(),
@@ -92,8 +110,9 @@ function pushSynced(worktreePath, projectDir, target) {
         pushWorktreeToOrigin(worktreePath, projectDir, branch);
     }
     catch (err) {
-        logError(`Push failed after sync: ${getErrorMessage(err)}`);
-        log.error('pushWorktreeToOrigin failed', { worktreePath, projectDir, branch, error: getErrorMessage(err) });
+        const error = getGitCommandErrorDetail(err);
+        logError(`Push failed after sync: ${error}`);
+        log.error('pushWorktreeToOrigin failed', { worktreePath, projectDir, branch, error });
         return false;
     }
     return true;
@@ -108,8 +127,9 @@ function abortMerge(worktreePath) {
         log.info('git merge --abort completed', { worktreePath });
     }
     catch (err) {
-        logError(`Failed to abort merge: ${getErrorMessage(err)}`);
-        log.error('git merge --abort failed', { worktreePath, error: getErrorMessage(err) });
+        const error = getGitCommandErrorDetail(err);
+        logError(`Failed to abort merge: ${error}`);
+        log.error('git merge --abort failed', { worktreePath, error });
     }
 }
 //# sourceMappingURL=taskSyncAction.js.map

package/dist/features/tasks/list/taskSyncAction.js.map

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

package/dist/infra/codex/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAa1E,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA6DnD;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,gBAAgB;YASV,iBAAiB;IA4B/B,sCAAsC;IAChC,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;IAgQzB,4EAA4E;IACtE,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;CAM1B;AAID,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/infra/codex/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,4BAA4B,CAAC;AAEvF,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAa1E,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA+DnD;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,gBAAgB;YASV,iBAAiB;IA4B/B,sCAAsC;IAChC,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;IAgQzB,4EAA4E;IACtE,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC;CAM1B;AAID,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,CAAC,CAExB"}

package/dist/infra/codex/client.js

@@ -11,8 +11,9 @@ import { createStreamTrackingState, extractThreadId, emitInit, emitResult, emitC
 const log = createLogger('codex-sdk');
 const CODEX_STREAM_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
 const CODEX_STREAM_ABORTED_MESSAGE = 'Codex execution aborted';
-const CODEX_RETRY_MAX_ATTEMPTS = 3;
-const CODEX_RETRY_BASE_DELAY_MS = 250;
+const CODEX_RETRY_MAX_RETRIES = 8;
+const CODEX_RETRY_TOTAL_ATTEMPTS = CODEX_RETRY_MAX_RETRIES + 1;
+const CODEX_RETRY_BASE_DELAY_MS = 1000;
 const CODEX_RETRYABLE_ERROR_PATTERNS = [
     'stream disconnected before completion',
     'transport error',
@@ -22,6 +23,7 @@ const CODEX_RETRYABLE_ERROR_PATTERNS = [
     'etimedout',
     'eai_again',
     'fetch failed',
+    'at capacity',
 ];
 function toNumber(value) {
     return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
@@ -114,7 +116,7 @@ export class CodexClient {
         const fullPrompt = options.systemPrompt
             ? `${options.systemPrompt}\n\n${prompt}`
             : prompt;
-        for (let attempt = 1; attempt <= CODEX_RETRY_MAX_ATTEMPTS; attempt++) {
+        for (let attempt = 1; attempt <= CODEX_RETRY_TOTAL_ATTEMPTS; attempt++) {
             const codexClientOptions = {
                 ...(options.openaiApiKey ? { apiKey: options.openaiApiKey } : {}),
                 ...(options.codexPathOverride ? { codexPathOverride: options.codexPathOverride } : {}),
@@ -260,7 +262,7 @@ export class CodexClient {
                 if (!success) {
                     const message = failureMessage || 'Codex execution failed';
                     const retriable = this.isRetriableError(message, streamAbortController.signal.aborted, abortCause);
-                    if (retriable && attempt < CODEX_RETRY_MAX_ATTEMPTS) {
+                    if (retriable && attempt <= CODEX_RETRY_MAX_RETRIES) {
                         log.info('Retrying Codex call after transient failure', { agentType, attempt, message });
                         threadId = currentThreadId;
                         await this.waitForRetryDelay(attempt, options.abortSignal);
@@ -301,7 +303,7 @@ export class CodexClient {
                     : message;
                 diagRef?.onCompleted(abortCause === 'timeout' ? 'timeout' : streamAbortController.signal.aborted ? 'abort' : 'error', errorMessage);
                 const retriable = this.isRetriableError(errorMessage, streamAbortController.signal.aborted, abortCause);
-                if (retriable && attempt < CODEX_RETRY_MAX_ATTEMPTS) {
+                if (retriable && attempt <= CODEX_RETRY_MAX_RETRIES) {
                     log.info('Retrying Codex call after transient exception', { agentType, attempt, errorMessage });
                     threadId = currentThreadId;
                     await this.waitForRetryDelay(attempt, options.abortSignal);