taskplane 0.1.14 → 0.1.15
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.
- package/bin/taskplane.mjs +0 -4
- package/extensions/taskplane/engine.ts +771 -758
- package/extensions/taskplane/execution.ts +4 -2
- package/extensions/taskplane/git.ts +25 -7
- package/extensions/taskplane/merge.ts +18 -16
- package/extensions/taskplane/persistence.ts +1136 -1121
- package/extensions/taskplane/resume.ts +1096 -1092
- package/extensions/taskplane/types.ts +5 -2
- package/extensions/taskplane/waves.ts +894 -900
- package/extensions/taskplane/worktree.ts +6 -5
- package/package.json +1 -1
- package/templates/config/task-orchestrator.yaml +86 -89
- package/templates/config/task-runner.yaml +95 -99
|
@@ -12,7 +12,6 @@ export interface OrchestratorConfig {
|
|
|
12
12
|
max_lanes: number;
|
|
13
13
|
worktree_location: "sibling" | "subdirectory";
|
|
14
14
|
worktree_prefix: string;
|
|
15
|
-
integration_branch: string;
|
|
16
15
|
batch_id_format: "timestamp" | "sequential";
|
|
17
16
|
spawn_mode: "tmux" | "subprocess";
|
|
18
17
|
tmux_prefix: string;
|
|
@@ -136,7 +135,6 @@ export const DEFAULT_ORCHESTRATOR_CONFIG: OrchestratorConfig = {
|
|
|
136
135
|
max_lanes: 3,
|
|
137
136
|
worktree_location: "subdirectory",
|
|
138
137
|
worktree_prefix: "taskplane-wt",
|
|
139
|
-
integration_branch: "main",
|
|
140
138
|
batch_id_format: "timestamp",
|
|
141
139
|
spawn_mode: "subprocess",
|
|
142
140
|
tmux_prefix: "orch",
|
|
@@ -790,6 +788,8 @@ export interface OrchBatchRuntimeState {
|
|
|
790
788
|
phase: OrchBatchPhase;
|
|
791
789
|
/** Unique batch identifier (timestamp format, e.g., "20260308T214300") */
|
|
792
790
|
batchId: string;
|
|
791
|
+
/** Branch that was active when /orch started — used as base for worktrees and merge target */
|
|
792
|
+
baseBranch: string;
|
|
793
793
|
/** Shared pause signal — set by /orch-pause, read by executeLane/executeWave */
|
|
794
794
|
pauseSignal: { paused: boolean };
|
|
795
795
|
/** All wave results in order (grows as waves complete) */
|
|
@@ -866,6 +866,7 @@ export function freshOrchBatchState(): OrchBatchRuntimeState {
|
|
|
866
866
|
return {
|
|
867
867
|
phase: "idle",
|
|
868
868
|
batchId: "",
|
|
869
|
+
baseBranch: "",
|
|
869
870
|
pauseSignal: { paused: false },
|
|
870
871
|
waveResults: [],
|
|
871
872
|
currentWaveIndex: -1,
|
|
@@ -1208,6 +1209,8 @@ export interface PersistedBatchState {
|
|
|
1208
1209
|
phase: OrchBatchPhase;
|
|
1209
1210
|
/** Unique batch identifier (timestamp format) */
|
|
1210
1211
|
batchId: string;
|
|
1212
|
+
/** Branch that was active when /orch started — used as base for worktrees and merge target */
|
|
1213
|
+
baseBranch: string;
|
|
1211
1214
|
/** Epoch ms when batch started */
|
|
1212
1215
|
startedAt: number;
|
|
1213
1216
|
/** Epoch ms when state was last written */
|