npm - takt - Versions diffs - 0.35.1 → 0.35.3 - Mend

takt 0.35.1 → 0.35.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (146) hide show

package/dist/features/tasks/execute/runMeta.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare class RunMetaManager {
     private readonly metaAbs;
     private finalized;
     constructor(runPaths: RunPaths, task: string, pieceName: string);
+    updateStep(stepName: string, iteration: number): void;
     finalize(status: 'completed' | 'aborted', iterations?: number): void;
     get isFinalized(): boolean;
 }

package/dist/features/tasks/execute/runMeta.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runMeta.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;~~AAGH~~,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;~~AAgBrE~~,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAiB/D,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpE,IAAI,WAAW,IAAI,OAAO,CAEzB;CACF"}
1	+ {"version":3,"file":"runMeta.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,SAAS,CAAS;gBAEd,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAiB/D,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAMrD,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAUpE,IAAI,WAAW,IAAI,OAAO,CAEzB;CACF"}

package/dist/features/tasks/execute/runMeta.js CHANGED Viewed

@@ -25,6 +25,11 @@ export class RunMetaManager {
         ensureDir(runPaths.runRootAbs);
         writeFileAtomic(this.metaAbs, JSON.stringify(this.runMeta, null, 2));
     }
+    updateStep(stepName, iteration) {
+        this.runMeta.currentStep = stepName;
+        this.runMeta.currentIteration = iteration;
+        writeFileAtomic(this.metaAbs, JSON.stringify(this.runMeta, null, 2));
+    }
     finalize(status, iterations) {
         writeFileAtomic(this.metaAbs, JSON.stringify({
             ...this.runMeta,

package/dist/features/tasks/execute/runMeta.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runMeta.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;~~AAiB5E~~,MAAM,OAAO,cAAc;IACR,OAAO,CAAU;IACjB,OAAO,CAAS;IACzB,SAAS,GAAG,KAAK,CAAC;IAE1B,YAAY,QAAkB,EAAE,IAAY,EAAE,SAAiB;QAC7D,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI;YACJ,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,OAAO,EAAE,QAAQ,CAAC,UAAU;YAC5B,eAAe,EAAE,QAAQ,CAAC,UAAU;YACpC,gBAAgB,EAAE,QAAQ,CAAC,UAAU;YACrC,aAAa,EAAE,QAAQ,CAAC,OAAO;YAC/B,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QACF,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/B,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,MAA+B,EAAE,UAAmB;QAC3D,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YAC3C,GAAG,IAAI,CAAC,OAAO;YACf,MAAM;YACN,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACjC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF"}
1	+ {"version":3,"file":"runMeta.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/runMeta.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAI5E,MAAM,OAAO,cAAc;IACR,OAAO,CAAU;IACjB,OAAO,CAAS;IACzB,SAAS,GAAG,KAAK,CAAC;IAE1B,YAAY,QAAkB,EAAE,IAAY,EAAE,SAAiB;QAC7D,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI;YACJ,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,OAAO,EAAE,QAAQ,CAAC,UAAU;YAC5B,eAAe,EAAE,QAAQ,CAAC,UAAU;YACpC,gBAAgB,EAAE,QAAQ,CAAC,UAAU;YACrC,aAAa,EAAE,QAAQ,CAAC,OAAO;YAC/B,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QACF,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/B,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,UAAU,CAAC,QAAgB,EAAE,SAAiB;QAC5C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAC1C,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,QAAQ,CAAC,MAA+B,EAAE,UAAmB;QAC3D,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YAC3C,GAAG,IAAI,CAAC,OAAO;YACf,MAAM;YACN,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACjC,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF"}

package/dist/features/tasks/execute/taskExecution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"taskExecution.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAwB,MAAM,YAAY,CAAC;AAMjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;AAIzD,KAAK,4BAA4B,GAAG;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAoEF;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,eAAe,CAAC,EAAE,4BAA4B,GAC7C,OAAO,CAAC,OAAO,CAAC,~~CAuIlB~~"}
1	+ {"version":3,"file":"taskExecution.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskExecution.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAwB,MAAM,YAAY,CAAC;AAMjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,CAAC;AAIzD,KAAK,4BAA4B,GAAG;IAClC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAoEF;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAG/E;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,MAAM,EACX,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,eAAe,CAAC,EAAE,4BAA4B,GAC7C,OAAO,CAAC,OAAO,CAAC,CA+IlB"}

package/dist/features/tasks/execute/taskExecution.js CHANGED Viewed

@@ -74,6 +74,7 @@ export async function executeTask(options) {
  */
 export async function executeAndCompleteTask(task, taskRunner, cwd, taskExecutionOptions, parallelOptions) {
     const startedAt = new Date().toISOString();
+    let taskForPersistence = task;
     const taskAbortController = new AbortController();
     const externalAbortSignal = parallelOptions?.abortSignal;
     const taskAbortSignal = externalAbortSignal ? taskAbortController.signal : undefined;
@@ -90,6 +91,12 @@ export async function executeAndCompleteTask(task, taskRunner, cwd, taskExecutio
     }
     try {
         const { execCwd, execPiece, isWorktree, taskPrompt, reportDirName, branch, worktreePath, baseBranch, startMovement, retryNote, autoPr, draftPr, shouldPublishBranchToOrigin, issueNumber, maxMovementsOverride, initialIterationOverride, } = await resolveTaskExecution(task, cwd, taskAbortSignal);
+        const executionTask = taskRunner.updateRunningTaskExecution(task.name, {
+            runSlug: reportDirName,
+            ...(worktreePath ? { worktreePath } : {}),
+            ...(branch ? { branch } : {}),
+        });
+        taskForPersistence = executionTask;
         const projectRootCwd = cwd;
         const taskRunResult = await executeTaskWithResult({
             task: taskPrompt ?? task.content,
@@ -108,7 +115,7 @@ export async function executeAndCompleteTask(task, taskRunner, cwd, taskExecutio
             initialIterationOverride,
         });
         if (taskRunResult.exceeded && taskRunResult.exceededInfo) {
-            persistExceededTaskResult(taskRunner, task, taskRunResult.exceededInfo, {
+            persistExceededTaskResult(taskRunner, executionTask, taskRunResult.exceededInfo, {
                 worktreePath,
                 branch,
             });
@@ -143,20 +150,20 @@ export async function executeAndCompleteTask(task, taskRunner, cwd, taskExecutio
         }
         if (postExecutionTaskError !== undefined) {
             const taskResult = buildBooleanTaskResult({
-                task,
+                task: executionTask,
                 taskSuccess: false,
                 startedAt,
                 completedAt,
                 successResponse: 'Task completed successfully',
                 failureResponse: postExecutionTaskError,
-                branch,
                 worktreePath,
+                branch,
             });
             persistTaskResult(taskRunner, taskResult);
             return false;
         }
         const taskResult = buildTaskResult({
-            task,
+            task: executionTask,
             runResult: taskRunResult,
             startedAt,
             completedAt,
@@ -173,7 +180,7 @@ export async function executeAndCompleteTask(task, taskRunner, cwd, taskExecutio
     }
     catch (err) {
         const completedAt = new Date().toISOString();
-        persistTaskError(taskRunner, task, startedAt, completedAt, err);
+        persistTaskError(taskRunner, taskForPersistence, startedAt, completedAt, err);
         return false;
     }
     finally {

package/dist/features/tasks/execute/taskExecution.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"taskExecution.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskExecution.ts"],"names":[],"mappings":"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~~IAAI~~,EAAE,aAAa,CAAC,YAAY,EAAE;~~gBACtE~~,YAAY;gBACZ,MAAM;aACP,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC;QAC1C,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE7C,IAAI,KAAyB,CAAC;QAC9B,IAAI,aAAiC,CAAC;QACtC,IAAI,sBAA0C,CAAC;QAC/C,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC;gBACzC,OAAO;gBACP,UAAU,EAAE,cAAc;gBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM;gBACN,UAAU;gBACV,cAAc,EAAE,MAAM;gBACtB,2BAA2B;gBAC3B,OAAO;gBACP,eAAe,EAAE,SAAS;gBAC1B,MAAM;aACP,CAAC,CAAC;YACH,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;YACzB,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACxB,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC;YACrC,CAAC;YACD,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;gBAC1B,sBAAsB,GAAG,UAAU,CAAC,SAAS,CAAC;YAChD,CAAC;QACH,CAAC;QAED,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,UAAU,GAAG,sBAAsB,CAAC;gBACxC,IAAI;~~gBACJ~~,WAAW,EAAE,KAAK;gBAClB,SAAS;gBACT,WAAW;gBACX,eAAe,EAAE,6BAA6B;gBAC9C,eAAe,EAAE,sBAAsB;gBACvC,~~MAAM~~;~~gBACN~~,~~YAAY~~;~~aACb~~,CAAC,CAAC;YACH,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GAAG,eAAe,CAAC;YACjC,IAAI;~~YACJ~~,SAAS,EAAE,aAAa;YACxB,SAAS;YACT,WAAW;YACX,MAAM;YACN,YAAY;YACZ,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,yBAAyB,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAE1C,OAAO,aAAa,CAAC,OAAO,CAAC;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC7C,gBAAgB,CAAC,UAAU,EAAE,~~IAAI~~,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;~~QAChE~~,OAAO,KAAK,CAAC;IACf,CAAC;YAAS,CAAC;QACT,IAAI,mBAAmB,EAAE,CAAC;YACxB,mBAAmB,CAAC,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"taskExecution.js","sourceRoot":"","sources":["../../../../src/features/tasks/execute/taskExecution.ts"],"names":[],"mappings":"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"}

package/dist/features/tasks/list/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;~~AAahE~~,OAAO,EAA2B,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGlG,YAAY,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EACL,KAAK,UAAU,EACf,cAAc,EACd,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,eAAe,GAChB,MAAM,mBAAmB,CAAC;~~AAqF3B~~,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,oBAAoB,EAC9B,cAAc,CAAC,EAAE,yBAAyB,GACzC,OAAO,CAAC,IAAI,CAAC,~~CAyJf~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/tasks/list/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAchE,OAAO,EAA2B,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGlG,YAAY,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EACL,KAAK,UAAU,EACf,cAAc,EACd,YAAY,EACZ,cAAc,EACd,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAmG3B,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,oBAAoB,EAC9B,cAAc,CAAC,EAAE,yBAAyB,GACzC,OAAO,CAAC,IAAI,CAAC,CAqJf"}

package/dist/features/tasks/list/index.js CHANGED Viewed

@@ -3,6 +3,7 @@ import { selectOption } from '../../../shared/prompt/index.js';
 import { info, header, blankLine } from '../../../shared/ui/index.js';
 import { showFullDiff, showDiffAndPromptActionForTask, tryMergeBranch, mergeBranch, instructBranch, syncBranchWithRoot, pullFromRemote, } from './taskActions.js';
 import { deleteTaskByKind, deleteAllTasks } from './taskDeleteActions.js';
+import { forceFailRunningTask } from './taskForceFailActions.js';
 import { retryFailedTask } from './taskRetryActions.js';
 import { listTasksNonInteractive } from './listNonInteractive.js';
 import { formatTaskStatusLabel, formatShortDate } from './taskStatusLabel.js';
@@ -32,6 +33,15 @@ async function showPendingTaskAndPromptAction(task) {
     blankLine();
     return await selectOption(`Action for ${task.name}:`, [{ label: 'Delete', value: 'delete', description: 'Remove this task permanently' }]);
 }
+async function showRunningTaskAndPromptAction(task) {
+    header(formatTaskStatusLabel(task));
+    info(`  Created: ${task.createdAt}`);
+    if (task.content) {
+        info(`  ${task.content}`);
+    }
+    blankLine();
+    return await selectOption(`Action for ${task.name}:`, [{ label: 'Mark as failed', value: 'force_fail', description: 'Mark stuck running task as failed' }]);
+}
 async function showFailedTaskAndPromptAction(task) {
     header(formatTaskStatusLabel(task));
     info(`  Created: ${task.createdAt}`);
@@ -113,14 +123,10 @@ export async function listTasks(cwd, options, nonInteractive) {
             const task = tasks[idx];
             if (!task)
                 continue;
-            header(formatTaskStatusLabel(task));
-            info(`  Created: ${task.createdAt}`);
-            if (task.content) {
-                info(`  ${task.content}`);
+            const taskAction = await showRunningTaskAndPromptAction(task);
+            if (taskAction === 'force_fail') {
+                await forceFailRunningTask(task, cwd);
             }
-            blankLine();
-            info('Running task is read-only.');
-            blankLine();
         }
         else if (type === 'completed') {
             const task = tasks[idx];
@@ -135,7 +141,7 @@ export async function listTasks(cwd, options, nonInteractive) {
                 continue;
             switch (taskAction) {
                 case 'diff':
-                    showFullDiff(cwd, task.branch);
+                    showFullDiff(cwd, task);
                     break;
                 case 'instruct':
                     await instructBranch(cwd, task);
@@ -196,7 +202,7 @@ export async function listTasks(cwd, options, nonInteractive) {
                 continue;
             switch (taskAction) {
                 case 'diff':
-                    showFullDiff(cwd, task.branch);
+                    showFullDiff(cwd, task);
                     break;
                 case 'instruct':
                     await instructBranch(cwd, task);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/index.ts"],"names":[],"mappings":"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~~CAAC~~,~~qBAAqB~~,~~CAAC~~,~~IAAI~~,CAAC,~~CAAC,CAAC;YACpC,~~IAAI,CAAC,~~cAAc,IAAI,~~CAAC~~,SAAS,EAAE,CAAC,CAAC~~;~~YACrC~~,IAAI,~~IAAI~~,~~CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,~~KAAK,~~IAAI~~,~~CAAC,OAAO,~~EAAE,CAAC~~,CAAC~~;~~YAC5B~~,~~CAAC;YACD~~,~~SAAS~~,~~EAAE,~~CAAC~~;YACZ~~,IAAI,~~CAAC~~,~~4BAA4B~~,CAAC,CAAC;~~YACnC~~,~~SAAS,EAAE,~~CAAC;~~QACd~~,CAAC;aAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,yCAAyC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,gCAAgC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACrE,IAAI,UAAU,KAAK,IAAI;gBAAE,SAAS;YAElC,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,MAAM;oBACT,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,~~MAAM,~~CAAC~~,CAAC~~;~~oBAC/B~~,MAAM;gBACR,KAAK,UAAU;oBACb,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAChC,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACpC,MAAM;gBACR,KAAK,MAAM;oBACT,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,KAAK,KAAK;oBACR,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;oBAC5C,CAAC;oBACD,MAAM;gBACR,KAAK,QAAQ;oBACX,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;oBAC7B,MAAM;YACV,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,MAAM,UAAU,GAAG,MAAM,6BAA6B,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBAC3B,MAAM,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACnC,CAAC;iBAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACnC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,MAAM,UAAU,GAAG,MAAM,+BAA+B,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;iBAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACnC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,yCAAyC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3D,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,+BAA+B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpE,IAAI,UAAU,KAAK,IAAI;gBAAE,SAAS;YAElC,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,MAAM;oBACT,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,~~MAAM,~~CAAC~~,CAAC~~;~~oBAC/B~~,MAAM;gBACR,KAAK,UAAU;oBACb,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAChC,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACpC,MAAM;gBACR,KAAK,MAAM;oBACT,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,KAAK,KAAK;oBACR,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;oBAC5C,CAAC;oBACD,MAAM;gBACR,KAAK,QAAQ;oBACX,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;oBAC7B,MAAM;YACV,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
1	+ {"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 CHANGED Viewed

	@@ -1 +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~~"}
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;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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"listNonInteractive.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/listNonInteractive.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,~~EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,~~EACL,~~mBAAmB,EACnB,~~UAAU,EACV,4BAA4B,GAE7B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAEL,cAAc,EACd,WAAW,EACX,YAAY,~~GACb~~,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAU9E,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,QAAQ,CAAC;~~AAC5F~~,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAqB,EAAE,MAAe;IACrE,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC;IACtC,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAC5B,4CAA4C;QAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACzB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,4BAA4B,CAAC;SAC/C,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACb,OAAO;IACT,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAChH,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,UAAkB,EAAE,aAAqB,EAAE,MAAc;IAC7E,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,CACvB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,MAAM,MAAM,EAAE,CAAC,EACzD,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CACtD,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,CAAC,8BAA8B,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAW,EACX,cAAyC;IAEzC,MAAM,~~aAAa,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC/C,~~MAAM,~~MAAM,~~GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAExC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,cAAc,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3B,uBAAuB,CAAC,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IAED,mDAAmD;IACnD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,8CAA8C,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,~~yDAAyD,~~CAAC,CAAC;~~QAChE~~,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC;IACzG,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,CAAC,qBAAqB,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ,cAAc,CAAC,MAAM,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,~~YAAY~~,CAAC,GAAG,EAAE,~~aAAa~~,~~EAAE~~,cAAc,CAAC,~~MAAM~~,CAAC,CAAC;~~YACxD~~,OAAO;QACT,KAAK,~~KAAK~~;~~YACR~~,~~cAAc~~,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;~~YAC1B~~,OAAO;QACT,KAAK,OAAO;YACV,IAAI,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO;QACT,KAAK,QAAQ;YACX,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,gDAAgD,CAAC,CAAC;gBACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC5B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO;IACX,CAAC;AACH,CAAC"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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"}
1	+ {"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 CHANGED Viewed

	@@ -1 +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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"taskBranchLifecycleActions.js","sourceRoot":"","sources":["../../../../src/features/tasks/list/taskBranchLifecycleActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,~~EAA2B~~,mBAAmB,~~EAAE~~,yBAAyB,~~EAAE~~,MAAM,uBAAuB,CAAC;~~AAEhH~~,MAAM,GAAG,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEvC,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,MAAc;IAC/D,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;QAC/E,GAAG,EAAE,UAAU;QACf,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,MAAM;KACd,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE;YAC/C,MAAM;YACN,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC;SACrC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,MAA0B;IAC3E,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE3C,IAAI,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE;YACjD,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,OAAO,CAAC,iBAAiB,MAAM,kCAAkC,CAAC,CAAC;QACnE,IAAI,CAAC,2FAA2F,CAAC,CAAC;QAClG,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,~~eAAe~~,CAAC,GAAG,CAAC,CAAC;~~QACjC~~,QAAQ,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;QACxC,QAAQ,CAAC,6CAA6C,CAAC,CAAC;QACxD,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,UAAkB,EAAE,MAA0B;IACxE,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAEzD,IAAI,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,MAAM,qCAAqC,CAAC,CAAC;YACrD,GAAG,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;gBAClD,GAAG,EAAE,UAAU;gBACf,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,MAAM;gBACb,GAAG,EAAE;oBACH,GAAG,OAAO,CAAC,GAAG;oBACd,kBAAkB,EAAE,IAAI;iBACzB;aACF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE;gBAC5C,GAAG,EAAE,UAAU;gBACf,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,2BAA2B,MAAM,+BAA+B,CAAC,CAAC;YACvE,GAAG,CAAC,KAAK,CAAC,gCAAgC,EAAE;gBAC1C,MAAM;gBACN,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAEzC,OAAO,CAAC,uBAAuB,MAAM,EAAE,CAAC,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,~~eAAe~~,CAAC,GAAG,CAAC,CAAC;~~QACjC~~,QAAQ,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC;QACjC,QAAQ,CAAC,6CAA6C,CAAC,CAAC;QACxD,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,UAAkB,EAAE,MAA0B;IACzE,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAEvD,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7B,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvF,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;YACrD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,WAAW,OAAO,CAAC,CAAC;YAC1F,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5B,UAAU,CAAC,WAAW,CAAC,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,OAAO,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE;YAC5C,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAEzC,OAAO,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACjC,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;QAClC,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
1	+ {"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"}