@on-par/factory-core 0.9.28-next.2 → 0.9.28-next.21
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/blockers/declared-prerequisites.d.ts +4 -1
- package/dist/blockers/declared-prerequisites.d.ts.map +1 -1
- package/dist/blockers/declared-prerequisites.js +10 -5
- package/dist/blockers/declared-prerequisites.js.map +1 -1
- package/dist/checkers/app-smoke.d.ts.map +1 -1
- package/dist/checkers/app-smoke.js +4 -1
- package/dist/checkers/app-smoke.js.map +1 -1
- package/dist/checkers/evidence-plan.d.ts +2 -0
- package/dist/checkers/evidence-plan.d.ts.map +1 -1
- package/dist/checkers/evidence-plan.js +13 -6
- package/dist/checkers/evidence-plan.js.map +1 -1
- package/dist/checkers/evidence-selector.d.ts +2 -0
- package/dist/checkers/evidence-selector.d.ts.map +1 -1
- package/dist/checkers/evidence-selector.js +13 -10
- package/dist/checkers/evidence-selector.js.map +1 -1
- package/dist/checkers/evidence-workspace.d.ts +21 -0
- package/dist/checkers/evidence-workspace.d.ts.map +1 -0
- package/dist/checkers/evidence-workspace.js +118 -0
- package/dist/checkers/evidence-workspace.js.map +1 -0
- package/dist/checkers/index.js +1 -1
- package/dist/checkers/index.js.map +1 -1
- package/dist/checkers/internal-exports.d.ts +1 -0
- package/dist/checkers/internal-exports.d.ts.map +1 -1
- package/dist/checkers/internal-exports.js +1 -0
- package/dist/checkers/internal-exports.js.map +1 -1
- package/dist/checkers/resolve-commands.d.ts.map +1 -1
- package/dist/checkers/resolve-commands.js +5 -1
- package/dist/checkers/resolve-commands.js.map +1 -1
- package/dist/config/example.d.ts.map +1 -1
- package/dist/config/example.js +11 -2
- package/dist/config/example.js.map +1 -1
- package/dist/config/index.d.ts +20 -32
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +11 -30
- package/dist/config/index.js.map +1 -1
- package/dist/config/merge-policy.d.ts +36 -0
- package/dist/config/merge-policy.d.ts.map +1 -0
- package/dist/config/merge-policy.js +31 -0
- package/dist/config/merge-policy.js.map +1 -0
- package/dist/config/runtime-config-keys.d.ts.map +1 -1
- package/dist/config/runtime-config-keys.js +1 -0
- package/dist/config/runtime-config-keys.js.map +1 -1
- package/dist/config/tracker-section.d.ts +39 -0
- package/dist/config/tracker-section.d.ts.map +1 -0
- package/dist/config/tracker-section.js +31 -0
- package/dist/config/tracker-section.js.map +1 -0
- package/dist/environment/process-groups.d.ts +5 -0
- package/dist/environment/process-groups.d.ts.map +1 -1
- package/dist/environment/process-groups.js +19 -0
- package/dist/environment/process-groups.js.map +1 -1
- package/dist/events/queue-traits.d.ts +1 -1
- package/dist/events/queue-traits.d.ts.map +1 -1
- package/dist/events/queue-traits.js +5 -1
- package/dist/events/queue-traits.js.map +1 -1
- package/dist/filing/redact.d.ts +1 -0
- package/dist/filing/redact.d.ts.map +1 -1
- package/dist/filing/redact.js +1 -1
- package/dist/filing/redact.js.map +1 -1
- package/dist/harness/opencode-version.d.ts +2 -2
- package/dist/harness/opencode-version.d.ts.map +1 -1
- package/dist/harness/opencode-version.js +3 -3
- package/dist/harness/opencode-version.js.map +1 -1
- package/dist/internal.d.ts +11 -1
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +11 -0
- package/dist/internal.js.map +1 -1
- package/dist/phases/check-evidence.d.ts.map +1 -1
- package/dist/phases/check-evidence.js +5 -1
- package/dist/phases/check-evidence.js.map +1 -1
- package/dist/phases/ship-approval.d.ts +17 -0
- package/dist/phases/ship-approval.d.ts.map +1 -0
- package/dist/phases/ship-approval.js +21 -0
- package/dist/phases/ship-approval.js.map +1 -0
- package/dist/phases/ship-branch-push.d.ts +17 -0
- package/dist/phases/ship-branch-push.d.ts.map +1 -0
- package/dist/phases/ship-branch-push.js +77 -0
- package/dist/phases/ship-branch-push.js.map +1 -0
- package/dist/phases/ship-ci-watch.d.ts +25 -0
- package/dist/phases/ship-ci-watch.d.ts.map +1 -0
- package/dist/phases/ship-ci-watch.js +53 -0
- package/dist/phases/ship-ci-watch.js.map +1 -0
- package/dist/phases/ship-evidence-comment.d.ts +12 -0
- package/dist/phases/ship-evidence-comment.d.ts.map +1 -0
- package/dist/phases/ship-evidence-comment.js +30 -0
- package/dist/phases/ship-evidence-comment.js.map +1 -0
- package/dist/phases/ship-existing-pr.d.ts +11 -0
- package/dist/phases/ship-existing-pr.d.ts.map +1 -0
- package/dist/phases/ship-existing-pr.js +36 -0
- package/dist/phases/ship-existing-pr.js.map +1 -0
- package/dist/phases/ship-finish.d.ts +15 -0
- package/dist/phases/ship-finish.d.ts.map +1 -0
- package/dist/phases/ship-finish.js +69 -0
- package/dist/phases/ship-finish.js.map +1 -0
- package/dist/phases/ship-git-detail.d.ts +31 -0
- package/dist/phases/ship-git-detail.d.ts.map +1 -0
- package/dist/phases/ship-git-detail.js +71 -0
- package/dist/phases/ship-git-detail.js.map +1 -0
- package/dist/phases/ship-git-remote.d.ts +51 -0
- package/dist/phases/ship-git-remote.d.ts.map +1 -0
- package/dist/phases/ship-git-remote.js +70 -0
- package/dist/phases/ship-git-remote.js.map +1 -0
- package/dist/phases/ship-git.d.ts +4 -79
- package/dist/phases/ship-git.d.ts.map +1 -1
- package/dist/phases/ship-git.js +2 -135
- package/dist/phases/ship-git.js.map +1 -1
- package/dist/phases/ship-open-pr.d.ts +19 -0
- package/dist/phases/ship-open-pr.d.ts.map +1 -0
- package/dist/phases/ship-open-pr.js +71 -0
- package/dist/phases/ship-open-pr.js.map +1 -0
- package/dist/phases/ship-options.d.ts +76 -0
- package/dist/phases/ship-options.d.ts.map +1 -0
- package/dist/phases/ship-options.js +4 -0
- package/dist/phases/ship-options.js.map +1 -0
- package/dist/phases/ship-pr-lookup.d.ts +8 -0
- package/dist/phases/ship-pr-lookup.d.ts.map +1 -0
- package/dist/phases/ship-pr-lookup.js +41 -0
- package/dist/phases/ship-pr-lookup.js.map +1 -0
- package/dist/phases/ship-recovery.d.ts +16 -0
- package/dist/phases/ship-recovery.d.ts.map +1 -0
- package/dist/phases/ship-recovery.js +81 -0
- package/dist/phases/ship-recovery.js.map +1 -0
- package/dist/phases/ship-reentry.d.ts +20 -0
- package/dist/phases/ship-reentry.d.ts.map +1 -0
- package/dist/phases/ship-reentry.js +47 -0
- package/dist/phases/ship-reentry.js.map +1 -0
- package/dist/phases/ship-types.d.ts +36 -0
- package/dist/phases/ship-types.d.ts.map +1 -0
- package/dist/phases/ship-types.js +2 -0
- package/dist/phases/ship-types.js.map +1 -0
- package/dist/phases/ship.d.ts +6 -113
- package/dist/phases/ship.d.ts.map +1 -1
- package/dist/phases/ship.js +55 -458
- package/dist/phases/ship.js.map +1 -1
- package/dist/queue/comment-rework-trigger.d.ts +24 -0
- package/dist/queue/comment-rework-trigger.d.ts.map +1 -0
- package/dist/queue/comment-rework-trigger.js +128 -0
- package/dist/queue/comment-rework-trigger.js.map +1 -0
- package/dist/queue/internal-exports.d.ts +2 -0
- package/dist/queue/internal-exports.d.ts.map +1 -1
- package/dist/queue/internal-exports.js +1 -0
- package/dist/queue/internal-exports.js.map +1 -1
- package/dist/queue/lane-discovery-interval.d.ts +6 -0
- package/dist/queue/lane-discovery-interval.d.ts.map +1 -0
- package/dist/queue/lane-discovery-interval.js +9 -0
- package/dist/queue/lane-discovery-interval.js.map +1 -0
- package/dist/queue/linear-queue-backend.d.ts +17 -0
- package/dist/queue/linear-queue-backend.d.ts.map +1 -0
- package/dist/queue/linear-queue-backend.js +42 -0
- package/dist/queue/linear-queue-backend.js.map +1 -0
- package/dist/queue/linear-queue-lifecycle.d.ts +62 -0
- package/dist/queue/linear-queue-lifecycle.d.ts.map +1 -0
- package/dist/queue/linear-queue-lifecycle.js +139 -0
- package/dist/queue/linear-queue-lifecycle.js.map +1 -0
- package/dist/queue/linear-queue.d.ts +51 -0
- package/dist/queue/linear-queue.d.ts.map +1 -0
- package/dist/queue/linear-queue.js +335 -0
- package/dist/queue/linear-queue.js.map +1 -0
- package/dist/queue/queue-backend.d.ts +11 -5
- package/dist/queue/queue-backend.d.ts.map +1 -1
- package/dist/queue/queue-backend.js +8 -3
- package/dist/queue/queue-backend.js.map +1 -1
- package/dist/queue/review-rework-trigger.d.ts +7 -2
- package/dist/queue/review-rework-trigger.d.ts.map +1 -1
- package/dist/queue/review-rework-trigger.js +12 -8
- package/dist/queue/review-rework-trigger.js.map +1 -1
- package/dist/reports/pr-body.d.ts.map +1 -1
- package/dist/reports/pr-body.js +18 -8
- package/dist/reports/pr-body.js.map +1 -1
- package/dist/run/ports.d.ts +10 -0
- package/dist/run/ports.d.ts.map +1 -1
- package/dist/run/ports.js +12 -0
- package/dist/run/ports.js.map +1 -1
- package/dist/run/pr-run-state.d.ts +99 -0
- package/dist/run/pr-run-state.d.ts.map +1 -0
- package/dist/run/pr-run-state.js +235 -0
- package/dist/run/pr-run-state.js.map +1 -0
- package/dist/run/review-rework-cap.d.ts +3 -1
- package/dist/run/review-rework-cap.d.ts.map +1 -1
- package/dist/run/review-rework-cap.js +2 -1
- package/dist/run/review-rework-cap.js.map +1 -1
- package/dist/run/review-rework.d.ts +10 -0
- package/dist/run/review-rework.d.ts.map +1 -1
- package/dist/run/review-rework.js +45 -15
- package/dist/run/review-rework.js.map +1 -1
- package/dist/run/state.d.ts +6 -4
- package/dist/run/state.d.ts.map +1 -1
- package/dist/run/state.js +8 -5
- package/dist/run/state.js.map +1 -1
- package/dist/utils/command-runner.d.ts.map +1 -1
- package/dist/utils/command-runner.js +4 -1
- package/dist/utils/command-runner.js.map +1 -1
- package/dist/utils/exec.d.ts.map +1 -1
- package/dist/utils/exec.js +4 -1
- package/dist/utils/exec.js.map +1 -1
- package/dist/utils/in-place.d.ts +24 -0
- package/dist/utils/in-place.d.ts.map +1 -0
- package/dist/utils/in-place.js +105 -0
- package/dist/utils/in-place.js.map +1 -0
- package/dist/work/index.d.ts +2 -2
- package/dist/work/index.d.ts.map +1 -1
- package/dist/work/index.js +4 -2
- package/dist/work/index.js.map +1 -1
- package/dist/work/linear-client.d.ts +21 -0
- package/dist/work/linear-client.d.ts.map +1 -0
- package/dist/work/linear-client.js +69 -0
- package/dist/work/linear-client.js.map +1 -0
- package/dist/work/linear-issue.d.ts +11 -0
- package/dist/work/linear-issue.d.ts.map +1 -0
- package/dist/work/linear-issue.js +69 -0
- package/dist/work/linear-issue.js.map +1 -0
- package/dist/work/linear-preflight.d.ts +21 -0
- package/dist/work/linear-preflight.d.ts.map +1 -0
- package/dist/work/linear-preflight.js +67 -0
- package/dist/work/linear-preflight.js.map +1 -0
- package/package.json +5 -5
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { reworkWorker } from '../phases/check.js';
|
|
2
|
+
import { parseReworkCommand } from '../queue/comment-rework-trigger.js';
|
|
2
3
|
import { UNTRUSTED_REVIEW_FEEDBACK_NOTICE, wrapUntrustedReviewFeedback } from '../utils/untrusted-input.js';
|
|
3
4
|
export class ReviewReworkError extends Error {
|
|
4
5
|
name = 'ReviewReworkError';
|
|
5
6
|
}
|
|
6
7
|
const REVIEW_FEEDBACK_MAX_CHARS = 20_000;
|
|
7
|
-
export const REVIEW_REWORK_INSTRUCTIONS = "This round addresses a reviewer's change request on the open PR, not a checker failure. " +
|
|
8
|
+
export const REVIEW_REWORK_INSTRUCTIONS = "This round addresses a reviewer's change request or feedback comment on the open PR, not a checker failure. " +
|
|
8
9
|
'Make the changes each review comment asks for, scoped to the files and lines it names. ' +
|
|
9
10
|
'Do not change code the review does not ask about. If a comment conflicts with the spec, follow the spec and say so in the commit message.';
|
|
10
11
|
const errorMessage = (err) => (err instanceof Error ? err.message : String(err));
|
|
@@ -39,16 +40,36 @@ export async function fetchReviewFeedback(octokit, opts) {
|
|
|
39
40
|
})),
|
|
40
41
|
};
|
|
41
42
|
}
|
|
43
|
+
/** The feedback of one `/factory rework` comment, re-read from GitHub so only the text after the command is used. */
|
|
44
|
+
export async function fetchCommentFeedback(octokit, opts) {
|
|
45
|
+
const { owner, repo, prNumber, commentId } = opts;
|
|
46
|
+
const { data: comment } = await octokit.rest.issues.getComment({ owner, repo, comment_id: commentId });
|
|
47
|
+
const feedback = parseReworkCommand(comment.body ?? '');
|
|
48
|
+
if (feedback === null || feedback === '') {
|
|
49
|
+
throw new ReviewReworkError(`comment ${commentId} on PR #${prNumber} is no longer a /factory rework command`);
|
|
50
|
+
}
|
|
51
|
+
return {
|
|
52
|
+
prNumber,
|
|
53
|
+
reviewId: commentId,
|
|
54
|
+
reviewer: comment.user?.login ?? '',
|
|
55
|
+
state: 'COMMENTED',
|
|
56
|
+
body: feedback,
|
|
57
|
+
comments: [],
|
|
58
|
+
source: 'comment',
|
|
59
|
+
};
|
|
60
|
+
}
|
|
42
61
|
export function renderReviewFeedback(feedback) {
|
|
43
62
|
const comments = feedback.comments.length === 0
|
|
44
63
|
? ['(no inline comments)']
|
|
45
64
|
: feedback.comments.map((c) => `- ${c.path}${c.line === undefined ? '' : `:${c.line}`} (@${c.author}):\n ${c.body}`);
|
|
46
|
-
let inner =
|
|
47
|
-
`
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
65
|
+
let inner = feedback.source === 'comment'
|
|
66
|
+
? [`Comment ${feedback.reviewId} by @${feedback.reviewer} on PR #${feedback.prNumber}:`, feedback.body].join('\n')
|
|
67
|
+
: [
|
|
68
|
+
`Review ${feedback.reviewId} by @${feedback.reviewer} (${feedback.state}) on PR #${feedback.prNumber}:`,
|
|
69
|
+
feedback.body === '' ? '(no review body)' : feedback.body,
|
|
70
|
+
'Inline comments:',
|
|
71
|
+
...comments,
|
|
72
|
+
].join('\n');
|
|
52
73
|
if (inner.length > REVIEW_FEEDBACK_MAX_CHARS) {
|
|
53
74
|
inner = `${inner.slice(0, REVIEW_FEEDBACK_MAX_CHARS)}\n… (review truncated)`;
|
|
54
75
|
}
|
|
@@ -78,26 +99,35 @@ export function reviewReworkResume(request) {
|
|
|
78
99
|
export async function runReviewReworkBuild(opts) {
|
|
79
100
|
const { target, repo, branch, octokit, checkOpts, rework = reworkWorker } = opts;
|
|
80
101
|
const [owner = '', name = ''] = repo.split('/');
|
|
81
|
-
const
|
|
102
|
+
const kind = target.source === 'comment' ? 'comment' : 'review';
|
|
103
|
+
const where = `PR #${target.prNumber} / ${kind} ${target.reviewId}`;
|
|
82
104
|
let feedback;
|
|
83
105
|
try {
|
|
84
106
|
const { data: pull } = await octokit.rest.pulls.get({ owner, repo: name, pull_number: target.prNumber });
|
|
85
107
|
if (pull.state !== 'open' || pull.head.ref !== branch) {
|
|
86
108
|
throw new ReviewReworkError(`PR #${target.prNumber} must be open with head ${branch}; found ${pull.state} with head ${pull.head.ref}`);
|
|
87
109
|
}
|
|
88
|
-
feedback =
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
110
|
+
feedback =
|
|
111
|
+
target.source === 'comment'
|
|
112
|
+
? await fetchCommentFeedback(octokit, {
|
|
113
|
+
owner,
|
|
114
|
+
repo: name,
|
|
115
|
+
prNumber: target.prNumber,
|
|
116
|
+
commentId: target.reviewId,
|
|
117
|
+
})
|
|
118
|
+
: await fetchReviewFeedback(octokit, {
|
|
119
|
+
owner,
|
|
120
|
+
repo: name,
|
|
121
|
+
prNumber: target.prNumber,
|
|
122
|
+
reviewId: target.reviewId,
|
|
123
|
+
});
|
|
94
124
|
}
|
|
95
125
|
catch (err) {
|
|
96
126
|
if (err instanceof ReviewReworkError)
|
|
97
127
|
throw err;
|
|
98
128
|
throw new ReviewReworkError(`could not read ${where}: ${errorMessage(err)}`, { cause: err });
|
|
99
129
|
}
|
|
100
|
-
checkOpts.log('rework', `review rework: PR #${target.prNumber}
|
|
130
|
+
checkOpts.log('rework', `review rework: PR #${target.prNumber} ${kind} ${target.reviewId} by @${target.reviewer} — ${feedback.comments.length} inline comment(s) on ${branch}`);
|
|
101
131
|
const worked = await rework({
|
|
102
132
|
issue: checkOpts.issue,
|
|
103
133
|
worktree: checkOpts.worktree,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-rework.js","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"review-rework.js","sourceRoot":"","sources":["../../src/run/review-rework.ts"],"names":[],"mappings":"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"}
|
package/dist/run/state.d.ts
CHANGED
|
@@ -4,10 +4,12 @@ import type { BuildRoute, RunOutcome } from './outcome.js';
|
|
|
4
4
|
/** Path of one issue's persisted run state inside `runsDir`
|
|
5
5
|
* (`getFactoryPaths(repoRoot).runs`). */
|
|
6
6
|
export declare function runStateFile(runsDir: string, key: WorkKey): string;
|
|
7
|
-
/** Persists `state` with its string `key`
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
7
|
+
/** Persists `state` with its string `key` (#3890), filling `repo` from the run's worktree when the
|
|
8
|
+
* caller did not supply one. A numeric key also persists the numeric `issue`, so a factory binary
|
|
9
|
+
* from before #3890 (0.9.27 or earlier) on the same host still reads the record (ADR-0168: no
|
|
10
|
+
* on-disk state migrates). A non-numeric key (a Linear or Jira ticket) persists no `issue`.
|
|
11
|
+
* Returns the in-memory record (both `key` and `issue`), so a caller can see the resolved slug.
|
|
12
|
+
* An unresolvable slug omits the key rather than writing a placeholder. */
|
|
11
13
|
export declare function writeIssueRunState(file: string, state: IssueRunState): Promise<IssueRunState>;
|
|
12
14
|
/** Reads one issue's persisted run state, or null when the file is missing,
|
|
13
15
|
* unreadable, or not a JSON object. Never throws. `repo` is surfaced when the record
|
package/dist/run/state.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/run/state.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAgE,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACjH,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE3D;0CAC0C;AAC1C,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAElE;AAED
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/run/state.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAgE,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACjH,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE3D;0CAC0C;AAC1C,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAElE;AAED;;;;;4EAK4E;AAC5E,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAcnG;AAED;;;;mEAImE;AACnE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA2BnF;AAED,MAAM,WAAW,oBAAoB;IACnC,6FAA6F;IAC7F,KAAK,CAAC,EAAE,IAAI,CAAC;IACb,0EAA0E;IAC1E,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,0FAA0F;IAC1F,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;yGACyG;AACzG,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAUtG;AAED;;2FAE2F;AAC3F,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmCrH;AAED,mGAAmG;AACnG,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,yCAAyC;AACzC,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAWhE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAYhE;AAED,kGAAkG;AAClG,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,aAAa,GAAG,SAAS,EAC/B,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,MAAM,GACV,aAAa,CAkBf"}
|
package/dist/run/state.js
CHANGED
|
@@ -13,15 +13,18 @@ import { isNumericWorkKey, issueNumberOf, toWorkKey, workKeyFromIssue } from '..
|
|
|
13
13
|
export function runStateFile(runsDir, key) {
|
|
14
14
|
return resolve(runsDir, `issue-${key}.json`);
|
|
15
15
|
}
|
|
16
|
-
/** Persists `state` with its string `key`
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
16
|
+
/** Persists `state` with its string `key` (#3890), filling `repo` from the run's worktree when the
|
|
17
|
+
* caller did not supply one. A numeric key also persists the numeric `issue`, so a factory binary
|
|
18
|
+
* from before #3890 (0.9.27 or earlier) on the same host still reads the record (ADR-0168: no
|
|
19
|
+
* on-disk state migrates). A non-numeric key (a Linear or Jira ticket) persists no `issue`.
|
|
20
|
+
* Returns the in-memory record (both `key` and `issue`), so a caller can see the resolved slug.
|
|
21
|
+
* An unresolvable slug omits the key rather than writing a placeholder. */
|
|
20
22
|
export async function writeIssueRunState(file, state) {
|
|
21
23
|
const repo = state.repo ?? resolveRepoSlug(state.worktree) ?? undefined;
|
|
22
24
|
const key = state.key ?? workKeyFromIssue(state.issue);
|
|
23
25
|
const { issue: _issue, key: _key, ...rest } = state;
|
|
24
|
-
const
|
|
26
|
+
const legacy = isNumericWorkKey(key) ? { issue: issueNumberOf(key) } : {};
|
|
27
|
+
const persisted = repo === undefined ? { ...legacy, ...rest } : { ...legacy, ...rest, repo };
|
|
25
28
|
// `repo` must be absent, not undefined, in the JSON: JSON.stringify drops undefined
|
|
26
29
|
// values, so the two shapes serialize identically — keep it that way.
|
|
27
30
|
await mkdir(dirname(file), { recursive: true });
|
package/dist/run/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/run/state.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,+EAA+E;AAC/E,kFAAkF;AAClF,oFAAoF;AACpF,oFAAoF;AACpF,qFAAqF;AAErF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAgB,MAAM,qBAAqB,CAAC;AAGjH;0CAC0C;AAC1C,MAAM,UAAU,YAAY,CAAC,OAAe,EAAE,GAAY;IACxD,OAAO,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/run/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-runner.d.ts","sourceRoot":"","sources":["../../src/utils/command-runner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"command-runner.d.ts","sourceRoot":"","sources":["../../src/utils/command-runner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAwB,MAAM,kCAAkC,CAAC;AAI1F,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB;+EAC2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/C;;uBAEmB;IACnB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,6EAA6E;IAC7E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,iDAAiD;IACjD,SAAS,CAAC,EAAE,OAAO,gBAAgB,CAAC;IACpC;;;iEAG6D;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,0CAA0C;IAC1C,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,MAAM,EAAE,OAAO,CAAC;IAChB,sDAAsD;IACtD,QAAQ,EAAE,OAAO,CAAC;IAClB,6CAA6C;IAC7C,EAAE,EAAE,OAAO,CAAC;CACb;AA8HD,wBAAsB,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC,CAiBjH"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { spawn } from 'node:child_process';
|
|
3
3
|
import { execa } from 'execa';
|
|
4
4
|
import { basename } from 'node:path';
|
|
5
|
-
import { killProcessGroup } from '../environment/process-groups.js';
|
|
5
|
+
import { killProcessGroup, registerProcessGroup } from '../environment/process-groups.js';
|
|
6
6
|
import { childProcessEnv, redactGitHubCredentials } from './github-credentials.js';
|
|
7
7
|
import { spawnSupervisedCommand } from './supervised-exec.js';
|
|
8
8
|
const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
|
|
@@ -31,8 +31,11 @@ async function runCommandDetached(argv, options, env) {
|
|
|
31
31
|
shell: false,
|
|
32
32
|
});
|
|
33
33
|
const pid = child.pid;
|
|
34
|
+
const deregister = pid !== undefined ? registerProcessGroup(pid) : () => { };
|
|
34
35
|
if (pid !== undefined)
|
|
35
36
|
options.onPgid?.(pid);
|
|
37
|
+
child.once('exit', deregister);
|
|
38
|
+
child.once('error', deregister);
|
|
36
39
|
let stdoutLen = 0;
|
|
37
40
|
let stderrLen = 0;
|
|
38
41
|
const stdoutChunks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["../../src/utils/command-runner.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["../../src/utils/command-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/exec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3D,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAwB,MAAM,kCAAkC,CAAC;AAM1F,MAAM,MAAM,MAAM,GAAG,CACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IACJ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC;;uBAEmB;IACnB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC;2DACuD;IACvD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;qCAGiC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,KACE,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAoIjD,oGAAoG;AACpG,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;CAC5C;AAED,wGAAwG;AACxG,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,QAAa,GAAG,MAAM,CA0C/D;AAED;;;;;;;;;;;eAWe;AACf,eAAO,MAAM,aAAa,EAAE,MAA8B,CAAC"}
|
package/dist/utils/exec.js
CHANGED
|
@@ -4,7 +4,7 @@ import { StringDecoder } from 'node:string_decoder';
|
|
|
4
4
|
import { promisify } from 'node:util';
|
|
5
5
|
import { childProcessEnv, redactExecError } from './github-credentials.js';
|
|
6
6
|
import { spawnSupervisedCommand } from './supervised-exec.js';
|
|
7
|
-
import { killProcessGroup } from '../environment/process-groups.js';
|
|
7
|
+
import { killProcessGroup, registerProcessGroup } from '../environment/process-groups.js';
|
|
8
8
|
const exec = promisify(execCb);
|
|
9
9
|
const DEFAULT_MAX_BUFFER = 1024 * 1024;
|
|
10
10
|
/** `node:child_process.exec`'s `detached` option is silently dropped (it
|
|
@@ -29,6 +29,9 @@ function execDetached(cmd, opts, spawnFn) {
|
|
|
29
29
|
const child = ownershipFile
|
|
30
30
|
? spawnSupervisedCommand(cmd, { cwd: opts.cwd, env, ownershipFile })
|
|
31
31
|
: spawnFn(cmd, { shell: true, detached: true, cwd: opts.cwd, env });
|
|
32
|
+
const deregister = child.pid !== undefined ? registerProcessGroup(child.pid) : () => { };
|
|
33
|
+
child.once('exit', deregister);
|
|
34
|
+
child.once('error', deregister);
|
|
32
35
|
let stdoutLen = 0;
|
|
33
36
|
let stderrLen = 0;
|
|
34
37
|
const stdoutChunks = [];
|
package/dist/utils/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { EventKind } from '../events/kinds.js';
|
|
2
|
+
import { type WorktreeSetupOptions, type WorktreeSetupResult } from './index.js';
|
|
3
|
+
export type InPlaceCheckoutProblem = {
|
|
4
|
+
kind: 'dirty';
|
|
5
|
+
files: string[];
|
|
6
|
+
message: string;
|
|
7
|
+
} | {
|
|
8
|
+
kind: 'wrong-branch';
|
|
9
|
+
current: string;
|
|
10
|
+
expected: string;
|
|
11
|
+
message: string;
|
|
12
|
+
} | {
|
|
13
|
+
kind: 'not-at-tip';
|
|
14
|
+
head: string;
|
|
15
|
+
tip: string;
|
|
16
|
+
expected: string;
|
|
17
|
+
message: string;
|
|
18
|
+
};
|
|
19
|
+
/** Why the checkout cannot host an in-place run, or null when it is clean and at origin/<default>. */
|
|
20
|
+
export declare function checkInPlaceCheckout(repoRoot: string): Promise<InPlaceCheckoutProblem | null>;
|
|
21
|
+
/** Switches the checkout to the factory branch, cut from origin/<default> (or the branch's open
|
|
22
|
+
* PR head). Re-checks readiness first to guard a race with the preflight. Never deletes. */
|
|
23
|
+
export declare function setupInPlaceCheckout(repoRoot: string, branch: string, log?: (type: EventKind, msg: string) => void, opts?: Pick<WorktreeSetupOptions, 'findOpenPr'>): Promise<WorktreeSetupResult>;
|
|
24
|
+
//# sourceMappingURL=in-place.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"in-place.d.ts","sourceRoot":"","sources":["../../src/utils/in-place.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACzB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,sBAAsB,GAC9B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC5E;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAezF,sGAAsG;AACtG,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAuCnG;AAED;6FAC6F;AAC7F,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,EAC5C,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,YAAY,CAAC,GAC9C,OAAO,CAAC,mBAAmB,CAAC,CA2C9B"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
// src/utils/in-place.ts — in-place workspace mode (#3904): run the pipeline in the current
|
|
2
|
+
// checkout instead of a factory worktree. The clone is the isolation boundary, so the checkout
|
|
3
|
+
// must be clean and at the fetched default-branch tip, and nothing here ever deletes anything.
|
|
4
|
+
import { execGit } from './git-exec.js';
|
|
5
|
+
import { defaultRemoteBase, detectRemoteBranch, gitFetch, } from './index.js';
|
|
6
|
+
const MAX_LISTED_FILES = 20;
|
|
7
|
+
function porcelainPath(line) {
|
|
8
|
+
const path = line.slice(3);
|
|
9
|
+
const arrow = path.indexOf(' -> ');
|
|
10
|
+
return arrow === -1 ? path : path.slice(arrow + 4);
|
|
11
|
+
}
|
|
12
|
+
async function revParse(repoRoot, args) {
|
|
13
|
+
const { stdout } = await execGit(['rev-parse', ...args], { cwd: repoRoot });
|
|
14
|
+
return stdout.trim();
|
|
15
|
+
}
|
|
16
|
+
/** Why the checkout cannot host an in-place run, or null when it is clean and at origin/<default>. */
|
|
17
|
+
export async function checkInPlaceCheckout(repoRoot) {
|
|
18
|
+
await gitFetch(repoRoot);
|
|
19
|
+
const { stdout: status } = await execGit(['status', '--porcelain'], { cwd: repoRoot });
|
|
20
|
+
const files = status
|
|
21
|
+
.split('\n')
|
|
22
|
+
.filter((line) => line.trim() !== '')
|
|
23
|
+
.map(porcelainPath);
|
|
24
|
+
if (files.length > 0) {
|
|
25
|
+
const listed = files.slice(0, MAX_LISTED_FILES).join(', ');
|
|
26
|
+
const more = files.length > MAX_LISTED_FILES ? ` (+${files.length - MAX_LISTED_FILES} more)` : '';
|
|
27
|
+
return {
|
|
28
|
+
kind: 'dirty',
|
|
29
|
+
files,
|
|
30
|
+
message: `in-place run refused: the checkout has uncommitted changes: ${listed}${more} — commit, stash or discard them, or use a fresh clone`,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
const expected = await defaultRemoteBase(repoRoot);
|
|
34
|
+
const defaultName = expected.replace(/^origin\//, '');
|
|
35
|
+
const current = await revParse(repoRoot, ['--abbrev-ref', 'HEAD']);
|
|
36
|
+
if (current !== defaultName) {
|
|
37
|
+
return {
|
|
38
|
+
kind: 'wrong-branch',
|
|
39
|
+
current,
|
|
40
|
+
expected: defaultName,
|
|
41
|
+
message: `in-place run refused: the checkout is on '${current}' (detached HEAD when 'HEAD'), not the default branch '${defaultName}' — git switch ${defaultName}`,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
const head = await revParse(repoRoot, ['HEAD']);
|
|
45
|
+
const tip = await revParse(repoRoot, [`${expected}^{commit}`]);
|
|
46
|
+
if (head !== tip) {
|
|
47
|
+
return {
|
|
48
|
+
kind: 'not-at-tip',
|
|
49
|
+
head,
|
|
50
|
+
tip,
|
|
51
|
+
expected,
|
|
52
|
+
message: `in-place run refused: HEAD ${head.slice(0, 8)} is not the fetched ${expected} tip ${tip.slice(0, 8)} — git reset --hard ${expected} in a disposable clone`,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
/** Switches the checkout to the factory branch, cut from origin/<default> (or the branch's open
|
|
58
|
+
* PR head). Re-checks readiness first to guard a race with the preflight. Never deletes. */
|
|
59
|
+
export async function setupInPlaceCheckout(repoRoot, branch, log, opts) {
|
|
60
|
+
const problem = await checkInPlaceCheckout(repoRoot);
|
|
61
|
+
if (problem)
|
|
62
|
+
throw new Error(problem.message);
|
|
63
|
+
let openPrBranch = false;
|
|
64
|
+
let remoteBranch = null;
|
|
65
|
+
const remoteSha = await detectRemoteBranch(repoRoot, branch);
|
|
66
|
+
if (remoteSha) {
|
|
67
|
+
remoteBranch = { sha: remoteSha };
|
|
68
|
+
let prText = 'open PR not checked';
|
|
69
|
+
if (opts?.findOpenPr) {
|
|
70
|
+
let lookup;
|
|
71
|
+
try {
|
|
72
|
+
lookup = await opts.findOpenPr(branch);
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
lookup = { status: 'error', detail: err instanceof Error ? err.message : String(err) };
|
|
76
|
+
}
|
|
77
|
+
if (lookup.status === 'found') {
|
|
78
|
+
remoteBranch.prNumber = lookup.prNumber;
|
|
79
|
+
openPrBranch = true;
|
|
80
|
+
prText = `open PR #${lookup.prNumber} — continuing on origin/${branch}`;
|
|
81
|
+
}
|
|
82
|
+
else if (lookup.status === 'absent') {
|
|
83
|
+
prText = 'no open PR';
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
prText = `open PR lookup failed: ${lookup.detail}`;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
log?.('remote-branch-preexisting', `origin/${branch} already exists @ ${remoteSha}; ${prText}`);
|
|
90
|
+
}
|
|
91
|
+
const base = openPrBranch ? `origin/${branch}` : await defaultRemoteBase(repoRoot);
|
|
92
|
+
try {
|
|
93
|
+
await execGit(['switch', '--no-track', '-c', branch, base], { cwd: repoRoot });
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
const stderr = (err?.stderr ?? (err instanceof Error ? err.message : String(err)))
|
|
97
|
+
.toString()
|
|
98
|
+
.trim();
|
|
99
|
+
throw new Error(`in-place run refused: could not create branch '${branch}' in the checkout (${stderr}) — delete the local branch or use a fresh clone`, { cause: err });
|
|
100
|
+
}
|
|
101
|
+
const head = await revParse(repoRoot, ['--verify', 'HEAD']);
|
|
102
|
+
log?.('worktree-base', `in-place: switched ${repoRoot} to ${branch} from ${base} @ ${head}`);
|
|
103
|
+
return { base, head, remoteBranch };
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=in-place.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"in-place.js","sourceRoot":"","sources":["../../src/utils/in-place.ts"],"names":[],"mappings":"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"}
|
package/dist/work/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { WorkKey } from './work-key.js';
|
|
|
3
3
|
import { type BriefFileReader } from './local-brief.js';
|
|
4
4
|
export * from './work-key.js';
|
|
5
5
|
/** Registered input sources. Open-ended by design — adapters register by string key. */
|
|
6
|
-
export type WorkRequestSourceKind = 'github-issue' | 'local-brief' | (string & {});
|
|
6
|
+
export type WorkRequestSourceKind = 'github-issue' | 'local-brief' | 'linear-issue' | (string & {});
|
|
7
7
|
/** Source-native lifecycle state, for sources that have one. */
|
|
8
8
|
export type WorkRequestState = 'open' | 'closed';
|
|
9
9
|
/** Where the request came from, for traceability back to the native artifact. */
|
|
@@ -61,7 +61,7 @@ export declare class WorkSourceRegistry {
|
|
|
61
61
|
kinds(): WorkRequestSourceKind[];
|
|
62
62
|
resolve(kind: WorkRequestSourceKind, params: unknown): Promise<WorkRequest>;
|
|
63
63
|
}
|
|
64
|
-
/** Registry with the built-in input sources — GitHub issue + local Markdown brief
|
|
64
|
+
/** Registry with the built-in input sources — GitHub issue + local Markdown brief + Linear issue (lazy: no env/network until resolve). */
|
|
65
65
|
export declare function createDefaultWorkSourceRegistry(deps: {
|
|
66
66
|
octokit: Octokit;
|
|
67
67
|
briefReader?: BriefFileReader;
|
package/dist/work/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/work/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/work/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAgD,MAAM,kBAAkB,CAAC;AAEtG,cAAc,eAAe,CAAC;AAE9B,wFAAwF;AACxF,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAEpG,gEAAgE;AAChE,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEjD,iFAAiF;AACjF,MAAM,WAAW,oBAAoB;IACnC,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,mFAAmF;AACnF,MAAM,WAAW,WAAW;IAC1B,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAC;IACd,uFAAuF;IACvF,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B;qFACiF;IACjF,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,SAAS,CAAC,EAAE,oBAAoB,CAAC;IACjC,mGAAmG;IACnG,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,mFAAmF;IACnF,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAChD;AAED,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,qBAAqB,EAAE,CAAC;IAC5C,YAAY,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,SAAS,qBAAqB,EAAE,EAMnF;CACF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,YAAY,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAItD;CACF;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IAEjE,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAGzC;IAED,GAAG,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAExC;IAED,+CAA+C;IAC/C,KAAK,IAAI,qBAAqB,EAAE,CAE/B;IAEK,OAAO,CAAC,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAMhF;CACF;AAED,0IAA0I;AAC1I,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,GAAG,kBAAkB,CAKrB;AAED;;+CAE+C;AAC/C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAGrE"}
|
package/dist/work/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// packages/core/src/work/index.ts — Canonical work request + input-source seam (#505).
|
|
2
2
|
import { createGithubIssueAdapter, createOctokitIssueClient } from './github-issue.js';
|
|
3
|
+
import { createLinearIssueAdapter } from './linear-issue.js';
|
|
3
4
|
import { createFsBriefReader, createLocalBriefAdapter } from './local-brief.js';
|
|
4
5
|
export * from './work-key.js';
|
|
5
6
|
export class UnsupportedWorkSourceError extends Error {
|
|
@@ -43,11 +44,12 @@ export class WorkSourceRegistry {
|
|
|
43
44
|
return adapter.resolve(params);
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
|
-
/** Registry with the built-in input sources — GitHub issue + local Markdown brief
|
|
47
|
+
/** Registry with the built-in input sources — GitHub issue + local Markdown brief + Linear issue (lazy: no env/network until resolve). */
|
|
47
48
|
export function createDefaultWorkSourceRegistry(deps) {
|
|
48
49
|
return new WorkSourceRegistry()
|
|
49
50
|
.register(createGithubIssueAdapter(createOctokitIssueClient(deps.octokit)))
|
|
50
|
-
.register(createLocalBriefAdapter(deps.briefReader ?? createFsBriefReader()))
|
|
51
|
+
.register(createLocalBriefAdapter(deps.briefReader ?? createFsBriefReader()))
|
|
52
|
+
.register(createLinearIssueAdapter());
|
|
51
53
|
}
|
|
52
54
|
/** The reason to refuse this work before committing any resource, or null to proceed.
|
|
53
55
|
* Deliberately fails open: only the literal 'closed' skips, so an absent or unknown
|
package/dist/work/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/work/index.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAIvF,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/work/index.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAIvF,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAwB,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEtG,cAAc,eAAe,CAAC;AAgD9B,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IAC1C,IAAI,CAAwB;IAC5B,SAAS,CAA0B;IAC5C,YAAY,IAA2B,EAAE,SAA2C;QAClF,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAClE,KAAK,CAAC,oCAAoC,IAAI,2BAA2B,IAAI,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IAClC,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,KAAK;IAC5C,IAAI,CAAwB;IACrC,YAAY,IAA2B,EAAE,MAAc;QACrD,KAAK,CAAC,0CAA0C,IAAI,MAAM,MAAM,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IACZ,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;IAEjE,+DAA+D;IAC/D,QAAQ,CAAC,OAA0B;QACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,IAA2B;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,+CAA+C;IAC/C,KAAK;QACH,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAA2B,EAAE,MAAe;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACF;AAED,0IAA0I;AAC1I,MAAM,UAAU,+BAA+B,CAAC,IAG/C;IACC,OAAO,IAAI,kBAAkB,EAAE;SAC5B,QAAQ,CAAC,wBAAwB,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;SAC1E,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,WAAW,IAAI,mBAAmB,EAAE,CAAC,CAAC;SAC5E,QAAQ,CAAC,wBAAwB,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED;;+CAE+C;AAC/C,MAAM,UAAU,oBAAoB,CAAC,IAAiB;IACpD,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACzC,OAAO,GAAG,IAAI,CAAC,EAAE,uFAAuF,CAAC;AAC3G,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export type LinearIssueRecord = {
|
|
2
|
+
id: string;
|
|
3
|
+
identifier: string;
|
|
4
|
+
title: string;
|
|
5
|
+
description: string;
|
|
6
|
+
url: string;
|
|
7
|
+
stateType: string;
|
|
8
|
+
labels: string[];
|
|
9
|
+
};
|
|
10
|
+
export declare class LinearApiError extends Error {
|
|
11
|
+
constructor(message: string);
|
|
12
|
+
}
|
|
13
|
+
export declare function createLinearClient(opts: {
|
|
14
|
+
apiKey: string;
|
|
15
|
+
fetch?: typeof globalThis.fetch;
|
|
16
|
+
endpoint?: string;
|
|
17
|
+
timeoutMs?: number;
|
|
18
|
+
}): {
|
|
19
|
+
fetchIssue(ref: string): Promise<LinearIssueRecord>;
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=linear-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"linear-client.d.ts","sourceRoot":"","sources":["../../src/work/linear-client.ts"],"names":[],"mappings":"AA6BA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,qBAAa,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAAE,CAsC1D"}
|