@staff0rd/assist 0.1182.2 → 0.1182.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.
- package/dist/.build-files +47 -45
- package/dist/{addPhase-PMIJDJ3T.js → addPhase-ML6FWTON.js} +1 -1
- package/dist/{askCheck-LJDGEXJ3.js → askCheck-GLHIKMMQ.js} +5 -5
- package/dist/built-version +1 -1
- package/dist/{chunk-PX5NZMZE.js → chunk-2DCW5B2A.js} +1 -1
- package/dist/{chunk-RQ6VJKY7.js → chunk-3LI4RTLC.js} +1 -1
- package/dist/chunk-67DONCGH.js +42 -0
- package/dist/{chunk-74MTQGFQ.js → chunk-A3DGNRVR.js} +1 -1
- package/dist/chunk-D6WBUFXT.js +23 -0
- package/dist/{chunk-JEUWRSP4.js → chunk-DBUVWSSW.js} +4 -4
- package/dist/{chunk-3YB3V3D2.js → chunk-EFUMKM5Y.js} +1 -1
- package/dist/{chunk-P5WTDOX6.js → chunk-ILA3UXIH.js} +2 -2
- package/dist/{chunk-N2SLCM35.js → chunk-JKQSNQTI.js} +1 -1
- package/dist/{chunk-RJERQDBE.js → chunk-JR5FW3KV.js} +4 -4
- package/dist/{chunk-XMQ3HCIH.js → chunk-KXEMYRFH.js} +1 -1
- package/dist/{chunk-ESJG46YM.js → chunk-N636AHMZ.js} +6 -6
- package/dist/{chunk-XQNV6F74.js → chunk-OT5TJO2U.js} +1 -1
- package/dist/{chunk-BQRWKDLW.js → chunk-QYXQ5VO4.js} +1 -1
- package/dist/{chunk-XYYJ4EDQ.js → chunk-RCJLKJOU.js} +2 -2
- package/dist/{chunk-EBS5KT26.js → chunk-RJE2QI4J.js} +1 -1
- package/dist/{chunk-BRHQ2AY2.js → chunk-SLPDXJ2U.js} +1 -1
- package/dist/{chunk-KWPM2HNG.js → chunk-SYEGSQJ6.js} +2 -2
- package/dist/{chunk-MPHPF3VF.js → chunk-TRQ4XZIM.js} +1 -1
- package/dist/{chunk-BQET6EXK.js → chunk-UA5GGKHC.js} +2 -2
- package/dist/{chunk-MLERFQMF.js → chunk-UYX3OYGX.js} +1 -1
- package/dist/{chunk-OGOH3VWW.js → chunk-ZNA6WQDJ.js} +2 -2
- package/dist/commands/sessions/web/bundle.js +1 -1
- package/dist/{doctorNodes-4LFHDZLW.js → doctorNodes-2AFVVCP2.js} +3 -3
- package/dist/{done-YFKFZK2S.js → done-PVBSD5M7.js} +2 -2
- package/dist/index.js +32 -32
- package/dist/{landPhase-GHSECSHW.js → landPhase-BUBC2RDB.js} +13 -8
- package/dist/{launchMode-4A6U3LTB.js → launchMode-RQMYD63A.js} +11 -11
- package/dist/{list-IYTEKSBT.js → list-42L65DJI.js} +3 -3
- package/dist/{next-4R4VQJMS.js → next-A5AGQDUW.js} +10 -10
- package/dist/{phaseDone-W2BGSGHG.js → phaseDone-KDP7TIEJ.js} +14 -9
- package/dist/{propose-RXJXCUTN.js → propose-SBMKA5FH.js} +2 -2
- package/dist/{refine-F3AJECLF.js → refine-7EAIJP3O.js} +12 -12
- package/dist/{restartNode-IZKUSPRN.js → restartNode-RGILBLGV.js} +5 -5
- package/dist/{rewindPhase-UL5XEEXE.js → rewindPhase-IW72WBK7.js} +6 -6
- package/dist/{run-O3YG35JS.js → run-IUWU62TH.js} +8 -8
- package/dist/{run-424NNNIR.js → run-T2TDEFKS.js} +8 -8
- package/dist/{runDaemon-U73XMTYQ.js → runDaemon-Z3POMX7L.js} +6 -6
- package/dist/{runParallelPhase-WDKD5O5U.js → runParallelPhase-UGFJUAQF.js} +30 -5
- package/dist/{runRefine-6UTTU6UY.js → runRefine-LDKPIVLX.js} +12 -12
- package/dist/{search-BGDVCDVG.js → search-D2RBEQID.js} +3 -3
- package/dist/{show-HLQOAXQE.js → show-XAAXGMGZ.js} +1 -1
- package/dist/{signExtension-C3CMR6IV.js → signExtension-62TMWKKA.js} +1 -1
- package/dist/{updateNode-J2JWLP2V.js → updateNode-XXDYT3WI.js} +5 -5
- package/dist/{updatePlan-PEZI7BK5.js → updatePlan-RRVIY7OW.js} +2 -2
- package/dist/{web-NOU4CGHW.js → web-AC3GFZAP.js} +11 -11
- package/dist/{web-5O2QODIK.js → web-XHJC52P6.js} +11 -11
- package/package.json +1 -1
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import {
|
|
2
|
+
landingTarget
|
|
3
|
+
} from "./chunk-67DONCGH.js";
|
|
4
|
+
import "./chunk-D6WBUFXT.js";
|
|
1
5
|
import {
|
|
2
6
|
isAncestor,
|
|
3
7
|
phaseGit
|
|
@@ -62,25 +66,26 @@ function landPhase() {
|
|
|
62
66
|
);
|
|
63
67
|
if (phaseGit(["status", "--porcelain"]).out)
|
|
64
68
|
return landingFailed("Commit your work before landing it.");
|
|
69
|
+
const target = landingTarget(tree);
|
|
65
70
|
for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
|
|
66
|
-
const
|
|
67
|
-
if (isAncestor("HEAD",
|
|
68
|
-
console.log(chalk4.green(
|
|
71
|
+
const tip = target.tip();
|
|
72
|
+
if (isAncestor("HEAD", tip)) {
|
|
73
|
+
console.log(chalk4.green(`Already landed on ${target.label}.`));
|
|
69
74
|
return;
|
|
70
75
|
}
|
|
71
|
-
if (!isAncestor(
|
|
72
|
-
if (!rebaseOnto(
|
|
76
|
+
if (!isAncestor(tip, "HEAD")) {
|
|
77
|
+
if (!rebaseOnto(tip) || !verifyAfterRebase()) return;
|
|
73
78
|
}
|
|
74
79
|
const head = phaseGit(["rev-parse", "HEAD"]).out;
|
|
75
|
-
if (
|
|
80
|
+
if (target.publish(head)) {
|
|
76
81
|
console.log(
|
|
77
|
-
chalk4.green(`Landed ${head.slice(0, 8)} on
|
|
82
|
+
chalk4.green(`Landed ${head.slice(0, 8)} on ${target.label}.`)
|
|
78
83
|
);
|
|
79
84
|
return;
|
|
80
85
|
}
|
|
81
86
|
}
|
|
82
87
|
landingFailed(
|
|
83
|
-
`Could not
|
|
88
|
+
`Could not land on ${target.label}: it kept moving or was rejected. Run \`assist backlog land\` again.`
|
|
84
89
|
);
|
|
85
90
|
}
|
|
86
91
|
export {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
launchMode
|
|
3
|
-
} from "./chunk-
|
|
4
|
-
import "./chunk-
|
|
3
|
+
} from "./chunk-JR5FW3KV.js";
|
|
4
|
+
import "./chunk-RCJLKJOU.js";
|
|
5
5
|
import "./chunk-AODN5R7L.js";
|
|
6
6
|
import "./chunk-B3JSQA5D.js";
|
|
7
|
-
import "./chunk-
|
|
7
|
+
import "./chunk-N636AHMZ.js";
|
|
8
8
|
import "./chunk-COVJ6KFD.js";
|
|
9
9
|
import "./chunk-OTCLPDCV.js";
|
|
10
10
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -12,17 +12,17 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
12
12
|
import "./chunk-6FDUCI2A.js";
|
|
13
13
|
import "./chunk-WXTBAGAR.js";
|
|
14
14
|
import "./chunk-OZNYQOQK.js";
|
|
15
|
-
import "./chunk-
|
|
16
|
-
import "./chunk-
|
|
15
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
16
|
+
import "./chunk-QYXQ5VO4.js";
|
|
17
17
|
import "./chunk-7NZOH4LN.js";
|
|
18
18
|
import "./chunk-F7QYFJB2.js";
|
|
19
19
|
import "./chunk-ZYK7V4PG.js";
|
|
20
20
|
import "./chunk-EEFDZ4FS.js";
|
|
21
21
|
import "./chunk-4YAIQN3S.js";
|
|
22
22
|
import "./chunk-7KDF6H4R.js";
|
|
23
|
-
import "./chunk-VVUYBY6D.js";
|
|
24
23
|
import "./chunk-6KLKCT2Y.js";
|
|
25
|
-
import "./chunk-
|
|
24
|
+
import "./chunk-VVUYBY6D.js";
|
|
25
|
+
import "./chunk-OT5TJO2U.js";
|
|
26
26
|
import "./chunk-ORSRBZ2X.js";
|
|
27
27
|
import "./chunk-3WN7B2HM.js";
|
|
28
28
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -38,10 +38,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
38
38
|
import "./chunk-A7ONLVZD.js";
|
|
39
39
|
import "./chunk-DISNKALJ.js";
|
|
40
40
|
import "./chunk-X3ZC7AXI.js";
|
|
41
|
-
import "./chunk-
|
|
42
|
-
import "./chunk-
|
|
43
|
-
import "./chunk-
|
|
44
|
-
import "./chunk-
|
|
41
|
+
import "./chunk-UYX3OYGX.js";
|
|
42
|
+
import "./chunk-RJE2QI4J.js";
|
|
43
|
+
import "./chunk-JKQSNQTI.js";
|
|
44
|
+
import "./chunk-2DCW5B2A.js";
|
|
45
45
|
import "./chunk-6Z7XJJNZ.js";
|
|
46
46
|
import "./chunk-TVYPHGC5.js";
|
|
47
47
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -5,12 +5,12 @@ import {
|
|
|
5
5
|
starMarker,
|
|
6
6
|
statusIcon,
|
|
7
7
|
typeLabel
|
|
8
|
-
} from "./chunk-
|
|
8
|
+
} from "./chunk-OT5TJO2U.js";
|
|
9
9
|
import {
|
|
10
10
|
originDisplayLabels
|
|
11
11
|
} from "./chunk-ZSDCXYYA.js";
|
|
12
|
-
import "./chunk-
|
|
13
|
-
import "./chunk-
|
|
12
|
+
import "./chunk-JKQSNQTI.js";
|
|
13
|
+
import "./chunk-2DCW5B2A.js";
|
|
14
14
|
import "./chunk-6Z7XJJNZ.js";
|
|
15
15
|
import {
|
|
16
16
|
loadBacklog
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
next
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-RCJLKJOU.js";
|
|
4
4
|
import "./chunk-AODN5R7L.js";
|
|
5
5
|
import "./chunk-B3JSQA5D.js";
|
|
6
|
-
import "./chunk-
|
|
6
|
+
import "./chunk-N636AHMZ.js";
|
|
7
7
|
import "./chunk-COVJ6KFD.js";
|
|
8
8
|
import "./chunk-OTCLPDCV.js";
|
|
9
9
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -11,17 +11,17 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
11
11
|
import "./chunk-6FDUCI2A.js";
|
|
12
12
|
import "./chunk-WXTBAGAR.js";
|
|
13
13
|
import "./chunk-OZNYQOQK.js";
|
|
14
|
-
import "./chunk-
|
|
15
|
-
import "./chunk-
|
|
14
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
15
|
+
import "./chunk-QYXQ5VO4.js";
|
|
16
16
|
import "./chunk-7NZOH4LN.js";
|
|
17
17
|
import "./chunk-F7QYFJB2.js";
|
|
18
18
|
import "./chunk-ZYK7V4PG.js";
|
|
19
19
|
import "./chunk-EEFDZ4FS.js";
|
|
20
20
|
import "./chunk-4YAIQN3S.js";
|
|
21
21
|
import "./chunk-7KDF6H4R.js";
|
|
22
|
-
import "./chunk-VVUYBY6D.js";
|
|
23
22
|
import "./chunk-6KLKCT2Y.js";
|
|
24
|
-
import "./chunk-
|
|
23
|
+
import "./chunk-VVUYBY6D.js";
|
|
24
|
+
import "./chunk-OT5TJO2U.js";
|
|
25
25
|
import "./chunk-ORSRBZ2X.js";
|
|
26
26
|
import "./chunk-3WN7B2HM.js";
|
|
27
27
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -36,10 +36,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
36
36
|
import "./chunk-A7ONLVZD.js";
|
|
37
37
|
import "./chunk-DISNKALJ.js";
|
|
38
38
|
import "./chunk-X3ZC7AXI.js";
|
|
39
|
-
import "./chunk-
|
|
40
|
-
import "./chunk-
|
|
41
|
-
import "./chunk-
|
|
42
|
-
import "./chunk-
|
|
39
|
+
import "./chunk-UYX3OYGX.js";
|
|
40
|
+
import "./chunk-RJE2QI4J.js";
|
|
41
|
+
import "./chunk-JKQSNQTI.js";
|
|
42
|
+
import "./chunk-2DCW5B2A.js";
|
|
43
43
|
import "./chunk-6Z7XJJNZ.js";
|
|
44
44
|
import "./chunk-TVYPHGC5.js";
|
|
45
45
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -2,12 +2,16 @@ import {
|
|
|
2
2
|
closeRunPreviews
|
|
3
3
|
} from "./chunk-AEDF2LCO.js";
|
|
4
4
|
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
landingTarget
|
|
6
|
+
} from "./chunk-67DONCGH.js";
|
|
7
|
+
import "./chunk-D6WBUFXT.js";
|
|
8
8
|
import {
|
|
9
9
|
markPhaseDone
|
|
10
10
|
} from "./chunk-6KLKCT2Y.js";
|
|
11
|
+
import {
|
|
12
|
+
isAncestor,
|
|
13
|
+
phaseGit
|
|
14
|
+
} from "./chunk-VVUYBY6D.js";
|
|
11
15
|
import "./chunk-YGQKTDZC.js";
|
|
12
16
|
import "./chunk-A2XSU5K6.js";
|
|
13
17
|
import "./chunk-5H7EHZ3J.js";
|
|
@@ -16,9 +20,9 @@ import {
|
|
|
16
20
|
} from "./chunk-X3ZC7AXI.js";
|
|
17
21
|
import {
|
|
18
22
|
resolvePlan
|
|
19
|
-
} from "./chunk-
|
|
20
|
-
import "./chunk-
|
|
21
|
-
import "./chunk-
|
|
23
|
+
} from "./chunk-RJE2QI4J.js";
|
|
24
|
+
import "./chunk-JKQSNQTI.js";
|
|
25
|
+
import "./chunk-2DCW5B2A.js";
|
|
22
26
|
import {
|
|
23
27
|
landTree
|
|
24
28
|
} from "./chunk-6Z7XJJNZ.js";
|
|
@@ -114,9 +118,10 @@ function unlandedPhaseError(phaseNumber) {
|
|
|
114
118
|
if (!tree || parallelPhaseNumber() !== phaseNumber) return void 0;
|
|
115
119
|
if (phaseGit(["status", "--porcelain"]).out)
|
|
116
120
|
return "Phase not landed: commit your work, then run `assist backlog land` before phase-done.";
|
|
117
|
-
const target =
|
|
118
|
-
|
|
119
|
-
|
|
121
|
+
const target = landingTarget(tree);
|
|
122
|
+
const tip = target.tip();
|
|
123
|
+
if (tip && isAncestor("HEAD", tip)) return void 0;
|
|
124
|
+
return `Phase not landed on ${target.label}: run \`assist backlog land\`, then run phase-done again.`;
|
|
120
125
|
}
|
|
121
126
|
|
|
122
127
|
// src/commands/backlog/phaseRun/refuseUnlanded.ts
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
replacePlan,
|
|
4
4
|
startProposedRun,
|
|
5
5
|
toStartApproval
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-TRQ4XZIM.js";
|
|
7
7
|
import "./chunk-YS3HSXSJ.js";
|
|
8
8
|
import {
|
|
9
9
|
renderMarkdownTerminal
|
|
@@ -34,7 +34,7 @@ import "./chunk-A7ONLVZD.js";
|
|
|
34
34
|
import {
|
|
35
35
|
createItemWithDefaults
|
|
36
36
|
} from "./chunk-D2VCDC22.js";
|
|
37
|
-
import "./chunk-
|
|
37
|
+
import "./chunk-2DCW5B2A.js";
|
|
38
38
|
import "./chunk-6Z7XJJNZ.js";
|
|
39
39
|
import "./chunk-QNVYNVAM.js";
|
|
40
40
|
import {
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
refine
|
|
3
|
-
} from "./chunk-
|
|
4
|
-
import "./chunk-
|
|
5
|
-
import "./chunk-
|
|
3
|
+
} from "./chunk-SYEGSQJ6.js";
|
|
4
|
+
import "./chunk-JR5FW3KV.js";
|
|
5
|
+
import "./chunk-RCJLKJOU.js";
|
|
6
6
|
import "./chunk-AODN5R7L.js";
|
|
7
7
|
import "./chunk-B3JSQA5D.js";
|
|
8
|
-
import "./chunk-
|
|
8
|
+
import "./chunk-N636AHMZ.js";
|
|
9
9
|
import "./chunk-COVJ6KFD.js";
|
|
10
10
|
import "./chunk-OTCLPDCV.js";
|
|
11
11
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -13,17 +13,17 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
13
13
|
import "./chunk-6FDUCI2A.js";
|
|
14
14
|
import "./chunk-WXTBAGAR.js";
|
|
15
15
|
import "./chunk-OZNYQOQK.js";
|
|
16
|
-
import "./chunk-
|
|
17
|
-
import "./chunk-
|
|
16
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
17
|
+
import "./chunk-QYXQ5VO4.js";
|
|
18
18
|
import "./chunk-7NZOH4LN.js";
|
|
19
19
|
import "./chunk-F7QYFJB2.js";
|
|
20
20
|
import "./chunk-ZYK7V4PG.js";
|
|
21
21
|
import "./chunk-EEFDZ4FS.js";
|
|
22
22
|
import "./chunk-4YAIQN3S.js";
|
|
23
23
|
import "./chunk-7KDF6H4R.js";
|
|
24
|
-
import "./chunk-VVUYBY6D.js";
|
|
25
24
|
import "./chunk-6KLKCT2Y.js";
|
|
26
|
-
import "./chunk-
|
|
25
|
+
import "./chunk-VVUYBY6D.js";
|
|
26
|
+
import "./chunk-OT5TJO2U.js";
|
|
27
27
|
import "./chunk-ORSRBZ2X.js";
|
|
28
28
|
import "./chunk-3WN7B2HM.js";
|
|
29
29
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -40,10 +40,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
40
40
|
import "./chunk-A7ONLVZD.js";
|
|
41
41
|
import "./chunk-DISNKALJ.js";
|
|
42
42
|
import "./chunk-X3ZC7AXI.js";
|
|
43
|
-
import "./chunk-
|
|
44
|
-
import "./chunk-
|
|
45
|
-
import "./chunk-
|
|
46
|
-
import "./chunk-
|
|
43
|
+
import "./chunk-UYX3OYGX.js";
|
|
44
|
+
import "./chunk-RJE2QI4J.js";
|
|
45
|
+
import "./chunk-JKQSNQTI.js";
|
|
46
|
+
import "./chunk-2DCW5B2A.js";
|
|
47
47
|
import "./chunk-6Z7XJJNZ.js";
|
|
48
48
|
import "./chunk-TVYPHGC5.js";
|
|
49
49
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -2,20 +2,20 @@ import {
|
|
|
2
2
|
linkStatus,
|
|
3
3
|
postToPeer,
|
|
4
4
|
startPeerAction
|
|
5
|
-
} from "./chunk-
|
|
6
|
-
import "./chunk-
|
|
5
|
+
} from "./chunk-EFUMKM5Y.js";
|
|
6
|
+
import "./chunk-3LI4RTLC.js";
|
|
7
7
|
import "./chunk-4HKB2TAG.js";
|
|
8
|
-
import "./chunk-
|
|
8
|
+
import "./chunk-A3DGNRVR.js";
|
|
9
9
|
import "./chunk-VABNWHSE.js";
|
|
10
10
|
import "./chunk-DS2YJZZY.js";
|
|
11
|
-
import "./chunk-
|
|
11
|
+
import "./chunk-SLPDXJ2U.js";
|
|
12
12
|
import "./chunk-5BDVREVD.js";
|
|
13
13
|
import "./chunk-SV6V52FL.js";
|
|
14
14
|
import "./chunk-B7VOTF5Q.js";
|
|
15
15
|
import "./chunk-E36L7ASL.js";
|
|
16
16
|
import "./chunk-5H7EHZ3J.js";
|
|
17
17
|
import "./chunk-GIHVMELY.js";
|
|
18
|
-
import "./chunk-
|
|
18
|
+
import "./chunk-KXEMYRFH.js";
|
|
19
19
|
import "./chunk-EGHUOQR6.js";
|
|
20
20
|
import "./chunk-HXYVAIAG.js";
|
|
21
21
|
import "./chunk-GRXFWFGP.js";
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import {
|
|
2
2
|
rewindItemToPhase
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-UA5GGKHC.js";
|
|
4
4
|
import "./chunk-YGQKTDZC.js";
|
|
5
5
|
import "./chunk-5H7EHZ3J.js";
|
|
6
6
|
import "./chunk-X3ZC7AXI.js";
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
9
|
-
import "./chunk-
|
|
10
|
-
import "./chunk-
|
|
11
|
-
import "./chunk-
|
|
7
|
+
import "./chunk-ILA3UXIH.js";
|
|
8
|
+
import "./chunk-UYX3OYGX.js";
|
|
9
|
+
import "./chunk-RJE2QI4J.js";
|
|
10
|
+
import "./chunk-JKQSNQTI.js";
|
|
11
|
+
import "./chunk-2DCW5B2A.js";
|
|
12
12
|
import "./chunk-6Z7XJJNZ.js";
|
|
13
13
|
import {
|
|
14
14
|
findOneItem
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
run
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-N636AHMZ.js";
|
|
4
4
|
import "./chunk-COVJ6KFD.js";
|
|
5
5
|
import "./chunk-OTCLPDCV.js";
|
|
6
6
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -8,16 +8,16 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
8
8
|
import "./chunk-6FDUCI2A.js";
|
|
9
9
|
import "./chunk-WXTBAGAR.js";
|
|
10
10
|
import "./chunk-OZNYQOQK.js";
|
|
11
|
-
import "./chunk-
|
|
12
|
-
import "./chunk-
|
|
11
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
12
|
+
import "./chunk-QYXQ5VO4.js";
|
|
13
13
|
import "./chunk-7NZOH4LN.js";
|
|
14
14
|
import "./chunk-F7QYFJB2.js";
|
|
15
15
|
import "./chunk-ZYK7V4PG.js";
|
|
16
16
|
import "./chunk-EEFDZ4FS.js";
|
|
17
17
|
import "./chunk-4YAIQN3S.js";
|
|
18
18
|
import "./chunk-7KDF6H4R.js";
|
|
19
|
-
import "./chunk-VVUYBY6D.js";
|
|
20
19
|
import "./chunk-6KLKCT2Y.js";
|
|
20
|
+
import "./chunk-VVUYBY6D.js";
|
|
21
21
|
import "./chunk-ORSRBZ2X.js";
|
|
22
22
|
import "./chunk-3WN7B2HM.js";
|
|
23
23
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -31,10 +31,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
31
31
|
import "./chunk-A7ONLVZD.js";
|
|
32
32
|
import "./chunk-DISNKALJ.js";
|
|
33
33
|
import "./chunk-X3ZC7AXI.js";
|
|
34
|
-
import "./chunk-
|
|
35
|
-
import "./chunk-
|
|
36
|
-
import "./chunk-
|
|
37
|
-
import "./chunk-
|
|
34
|
+
import "./chunk-UYX3OYGX.js";
|
|
35
|
+
import "./chunk-RJE2QI4J.js";
|
|
36
|
+
import "./chunk-JKQSNQTI.js";
|
|
37
|
+
import "./chunk-2DCW5B2A.js";
|
|
38
38
|
import "./chunk-6Z7XJJNZ.js";
|
|
39
39
|
import "./chunk-TVYPHGC5.js";
|
|
40
40
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
import "./chunk-B3JSQA5D.js";
|
|
21
21
|
import {
|
|
22
22
|
run
|
|
23
|
-
} from "./chunk-
|
|
23
|
+
} from "./chunk-N636AHMZ.js";
|
|
24
24
|
import "./chunk-COVJ6KFD.js";
|
|
25
25
|
import "./chunk-OTCLPDCV.js";
|
|
26
26
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -28,16 +28,16 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
28
28
|
import "./chunk-6FDUCI2A.js";
|
|
29
29
|
import "./chunk-WXTBAGAR.js";
|
|
30
30
|
import "./chunk-OZNYQOQK.js";
|
|
31
|
-
import "./chunk-
|
|
32
|
-
import "./chunk-
|
|
31
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
32
|
+
import "./chunk-QYXQ5VO4.js";
|
|
33
33
|
import "./chunk-7NZOH4LN.js";
|
|
34
34
|
import "./chunk-F7QYFJB2.js";
|
|
35
35
|
import "./chunk-ZYK7V4PG.js";
|
|
36
36
|
import "./chunk-EEFDZ4FS.js";
|
|
37
37
|
import "./chunk-4YAIQN3S.js";
|
|
38
38
|
import "./chunk-7KDF6H4R.js";
|
|
39
|
-
import "./chunk-VVUYBY6D.js";
|
|
40
39
|
import "./chunk-6KLKCT2Y.js";
|
|
40
|
+
import "./chunk-VVUYBY6D.js";
|
|
41
41
|
import "./chunk-ORSRBZ2X.js";
|
|
42
42
|
import "./chunk-3WN7B2HM.js";
|
|
43
43
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -55,10 +55,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
55
55
|
import "./chunk-A7ONLVZD.js";
|
|
56
56
|
import "./chunk-DISNKALJ.js";
|
|
57
57
|
import "./chunk-X3ZC7AXI.js";
|
|
58
|
-
import "./chunk-
|
|
59
|
-
import "./chunk-
|
|
60
|
-
import "./chunk-
|
|
61
|
-
import "./chunk-
|
|
58
|
+
import "./chunk-UYX3OYGX.js";
|
|
59
|
+
import "./chunk-RJE2QI4J.js";
|
|
60
|
+
import "./chunk-JKQSNQTI.js";
|
|
61
|
+
import "./chunk-2DCW5B2A.js";
|
|
62
62
|
import "./chunk-6Z7XJJNZ.js";
|
|
63
63
|
import "./chunk-TVYPHGC5.js";
|
|
64
64
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -62,7 +62,7 @@ import {
|
|
|
62
62
|
import {
|
|
63
63
|
backlogPhaseActivity,
|
|
64
64
|
recordPhaseSession
|
|
65
|
-
} from "./chunk-
|
|
65
|
+
} from "./chunk-QYXQ5VO4.js";
|
|
66
66
|
import {
|
|
67
67
|
buildResumePrompt,
|
|
68
68
|
wrapRestartNudge
|
|
@@ -126,7 +126,7 @@ import {
|
|
|
126
126
|
isHello,
|
|
127
127
|
linkVersionCheck,
|
|
128
128
|
negotiateProtocol
|
|
129
|
-
} from "./chunk-
|
|
129
|
+
} from "./chunk-SLPDXJ2U.js";
|
|
130
130
|
import {
|
|
131
131
|
loadLinkSpecs
|
|
132
132
|
} from "./chunk-5BDVREVD.js";
|
|
@@ -179,9 +179,9 @@ import {
|
|
|
179
179
|
} from "./chunk-QAJUCN3A.js";
|
|
180
180
|
import {
|
|
181
181
|
resolvePlan
|
|
182
|
-
} from "./chunk-
|
|
183
|
-
import "./chunk-
|
|
184
|
-
import "./chunk-
|
|
182
|
+
} from "./chunk-RJE2QI4J.js";
|
|
183
|
+
import "./chunk-JKQSNQTI.js";
|
|
184
|
+
import "./chunk-2DCW5B2A.js";
|
|
185
185
|
import "./chunk-6Z7XJJNZ.js";
|
|
186
186
|
import {
|
|
187
187
|
loadItem
|
|
@@ -264,7 +264,7 @@ import {
|
|
|
264
264
|
import "./chunk-APZ6ZTDA.js";
|
|
265
265
|
import "./chunk-BFQSGIN6.js";
|
|
266
266
|
import "./chunk-D7UZLH36.js";
|
|
267
|
-
import "./chunk-
|
|
267
|
+
import "./chunk-KXEMYRFH.js";
|
|
268
268
|
import "./chunk-EW2ZM2PC.js";
|
|
269
269
|
import "./chunk-MYH4MQX2.js";
|
|
270
270
|
import {
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import {
|
|
2
|
+
phaseUpstream
|
|
3
|
+
} from "./chunk-D6WBUFXT.js";
|
|
1
4
|
import {
|
|
2
5
|
executePhase
|
|
3
|
-
} from "./chunk-
|
|
4
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-ZNA6WQDJ.js";
|
|
7
|
+
import "./chunk-QYXQ5VO4.js";
|
|
5
8
|
import "./chunk-7NZOH4LN.js";
|
|
6
9
|
import "./chunk-F7QYFJB2.js";
|
|
7
10
|
import "./chunk-ZYK7V4PG.js";
|
|
@@ -13,6 +16,9 @@ import {
|
|
|
13
16
|
loadPhaseRunRows,
|
|
14
17
|
markPhaseDone
|
|
15
18
|
} from "./chunk-6KLKCT2Y.js";
|
|
19
|
+
import {
|
|
20
|
+
phaseGit
|
|
21
|
+
} from "./chunk-VVUYBY6D.js";
|
|
16
22
|
import "./chunk-NGYZK6AF.js";
|
|
17
23
|
import "./chunk-YGQKTDZC.js";
|
|
18
24
|
import "./chunk-A2XSU5K6.js";
|
|
@@ -22,9 +28,9 @@ import {
|
|
|
22
28
|
import "./chunk-X3ZC7AXI.js";
|
|
23
29
|
import {
|
|
24
30
|
resolvePlan
|
|
25
|
-
} from "./chunk-
|
|
26
|
-
import "./chunk-
|
|
27
|
-
import "./chunk-
|
|
31
|
+
} from "./chunk-RJE2QI4J.js";
|
|
32
|
+
import "./chunk-JKQSNQTI.js";
|
|
33
|
+
import "./chunk-2DCW5B2A.js";
|
|
28
34
|
import "./chunk-6Z7XJJNZ.js";
|
|
29
35
|
import {
|
|
30
36
|
findOneItem,
|
|
@@ -93,6 +99,21 @@ import "./chunk-SSKHLBQB.js";
|
|
|
93
99
|
// src/commands/backlog/phaseRun/runParallelPhase.ts
|
|
94
100
|
import chalk2 from "chalk";
|
|
95
101
|
|
|
102
|
+
// src/commands/backlog/phaseRun/adoptItemUpstream.ts
|
|
103
|
+
function adoptItemUpstream(itemTree, label) {
|
|
104
|
+
const upstream = phaseUpstream(itemTree);
|
|
105
|
+
if (!upstream) {
|
|
106
|
+
appendDaemonLog(
|
|
107
|
+
`${label}: item tree ${itemTree} tracks no remote branch; landing stays local`
|
|
108
|
+
);
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
const set = phaseGit(["branch", "--set-upstream-to", upstream.ref]);
|
|
112
|
+
appendDaemonLog(
|
|
113
|
+
set.ok ? `${label}: worktree branch now tracks ${upstream.ref}` : `${label}: could not track ${upstream.ref}; landing stays local`
|
|
114
|
+
);
|
|
115
|
+
}
|
|
116
|
+
|
|
96
117
|
// src/commands/backlog/phaseRun/phaseStartRefusal.ts
|
|
97
118
|
import chalk from "chalk";
|
|
98
119
|
|
|
@@ -203,6 +224,10 @@ async function runParallelPhase(id, phaseNumber, options) {
|
|
|
203
224
|
process.env.ASSIST_SESSION_ID ??= String(process.pid);
|
|
204
225
|
process.env.ASSIST_BACKLOG_PHASE = String(phaseNumber);
|
|
205
226
|
process.env.ASSIST_PHASE_LAND_TREE = options.itemTree;
|
|
227
|
+
adoptItemUpstream(
|
|
228
|
+
options.itemTree,
|
|
229
|
+
`backlog run-phase ${itemId} phase ${phaseNumber}`
|
|
230
|
+
);
|
|
206
231
|
recordSignalOwner(itemId, idx);
|
|
207
232
|
const watcher = watchPhaseCancel(itemId, idx, options.token);
|
|
208
233
|
try {
|
|
@@ -3,12 +3,12 @@ import {
|
|
|
3
3
|
} from "./chunk-MLE3TRAN.js";
|
|
4
4
|
import {
|
|
5
5
|
refine
|
|
6
|
-
} from "./chunk-
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
6
|
+
} from "./chunk-SYEGSQJ6.js";
|
|
7
|
+
import "./chunk-JR5FW3KV.js";
|
|
8
|
+
import "./chunk-RCJLKJOU.js";
|
|
9
9
|
import "./chunk-AODN5R7L.js";
|
|
10
10
|
import "./chunk-B3JSQA5D.js";
|
|
11
|
-
import "./chunk-
|
|
11
|
+
import "./chunk-N636AHMZ.js";
|
|
12
12
|
import "./chunk-COVJ6KFD.js";
|
|
13
13
|
import "./chunk-OTCLPDCV.js";
|
|
14
14
|
import "./chunk-AFQMD7AO.js";
|
|
@@ -16,17 +16,17 @@ import "./chunk-HKGCLAZ7.js";
|
|
|
16
16
|
import "./chunk-6FDUCI2A.js";
|
|
17
17
|
import "./chunk-WXTBAGAR.js";
|
|
18
18
|
import "./chunk-OZNYQOQK.js";
|
|
19
|
-
import "./chunk-
|
|
20
|
-
import "./chunk-
|
|
19
|
+
import "./chunk-ZNA6WQDJ.js";
|
|
20
|
+
import "./chunk-QYXQ5VO4.js";
|
|
21
21
|
import "./chunk-7NZOH4LN.js";
|
|
22
22
|
import "./chunk-F7QYFJB2.js";
|
|
23
23
|
import "./chunk-ZYK7V4PG.js";
|
|
24
24
|
import "./chunk-EEFDZ4FS.js";
|
|
25
25
|
import "./chunk-4YAIQN3S.js";
|
|
26
26
|
import "./chunk-7KDF6H4R.js";
|
|
27
|
-
import "./chunk-VVUYBY6D.js";
|
|
28
27
|
import "./chunk-6KLKCT2Y.js";
|
|
29
|
-
import "./chunk-
|
|
28
|
+
import "./chunk-VVUYBY6D.js";
|
|
29
|
+
import "./chunk-OT5TJO2U.js";
|
|
30
30
|
import "./chunk-ORSRBZ2X.js";
|
|
31
31
|
import "./chunk-3WN7B2HM.js";
|
|
32
32
|
import "./chunk-YQAQAP4O.js";
|
|
@@ -43,10 +43,10 @@ import "./chunk-F4XCHVD7.js";
|
|
|
43
43
|
import "./chunk-A7ONLVZD.js";
|
|
44
44
|
import "./chunk-DISNKALJ.js";
|
|
45
45
|
import "./chunk-X3ZC7AXI.js";
|
|
46
|
-
import "./chunk-
|
|
47
|
-
import "./chunk-
|
|
48
|
-
import "./chunk-
|
|
49
|
-
import "./chunk-
|
|
46
|
+
import "./chunk-UYX3OYGX.js";
|
|
47
|
+
import "./chunk-RJE2QI4J.js";
|
|
48
|
+
import "./chunk-JKQSNQTI.js";
|
|
49
|
+
import "./chunk-2DCW5B2A.js";
|
|
50
50
|
import "./chunk-6Z7XJJNZ.js";
|
|
51
51
|
import "./chunk-TVYPHGC5.js";
|
|
52
52
|
import "./chunk-2JYJEYRY.js";
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
statusIcon,
|
|
3
3
|
typeLabel
|
|
4
|
-
} from "./chunk-
|
|
5
|
-
import "./chunk-
|
|
6
|
-
import "./chunk-
|
|
4
|
+
} from "./chunk-OT5TJO2U.js";
|
|
5
|
+
import "./chunk-JKQSNQTI.js";
|
|
6
|
+
import "./chunk-2DCW5B2A.js";
|
|
7
7
|
import "./chunk-6Z7XJJNZ.js";
|
|
8
8
|
import {
|
|
9
9
|
searchBacklog
|
|
@@ -2,13 +2,13 @@ import {
|
|
|
2
2
|
linkStatus,
|
|
3
3
|
postToPeer,
|
|
4
4
|
startPeerAction
|
|
5
|
-
} from "./chunk-
|
|
6
|
-
import "./chunk-
|
|
5
|
+
} from "./chunk-EFUMKM5Y.js";
|
|
6
|
+
import "./chunk-3LI4RTLC.js";
|
|
7
7
|
import "./chunk-4HKB2TAG.js";
|
|
8
|
-
import "./chunk-
|
|
8
|
+
import "./chunk-A3DGNRVR.js";
|
|
9
9
|
import "./chunk-VABNWHSE.js";
|
|
10
10
|
import "./chunk-DS2YJZZY.js";
|
|
11
|
-
import "./chunk-
|
|
11
|
+
import "./chunk-SLPDXJ2U.js";
|
|
12
12
|
import "./chunk-5BDVREVD.js";
|
|
13
13
|
import "./chunk-SV6V52FL.js";
|
|
14
14
|
import "./chunk-B7VOTF5Q.js";
|
|
@@ -19,7 +19,7 @@ import {
|
|
|
19
19
|
} from "./chunk-A7ONLVZD.js";
|
|
20
20
|
import "./chunk-GIHVMELY.js";
|
|
21
21
|
import "./chunk-2EW62DM5.js";
|
|
22
|
-
import "./chunk-
|
|
22
|
+
import "./chunk-KXEMYRFH.js";
|
|
23
23
|
import "./chunk-EGHUOQR6.js";
|
|
24
24
|
import "./chunk-HXYVAIAG.js";
|
|
25
25
|
import "./chunk-GRXFWFGP.js";
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
replacePlan,
|
|
6
6
|
startProposedRun,
|
|
7
7
|
toStartApproval
|
|
8
|
-
} from "./chunk-
|
|
8
|
+
} from "./chunk-TRQ4XZIM.js";
|
|
9
9
|
import "./chunk-YS3HSXSJ.js";
|
|
10
10
|
import {
|
|
11
11
|
renderMarkdownTerminal
|
|
@@ -32,7 +32,7 @@ import {
|
|
|
32
32
|
import "./chunk-F4XCHVD7.js";
|
|
33
33
|
import "./chunk-A7ONLVZD.js";
|
|
34
34
|
import "./chunk-ZDSSSQZZ.js";
|
|
35
|
-
import "./chunk-
|
|
35
|
+
import "./chunk-2DCW5B2A.js";
|
|
36
36
|
import "./chunk-6Z7XJJNZ.js";
|
|
37
37
|
import "./chunk-QNVYNVAM.js";
|
|
38
38
|
import {
|