@memnexus-ai/mx-agent-cli 0.1.296-next.5 → 0.1.296-next.7
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/__tests__/catalog-origin-main.test.js +12 -3
- package/dist/__tests__/catalog-origin-main.test.js.map +1 -1
- package/dist/__tests__/init-coordination-url.test.js +108 -5
- package/dist/__tests__/init-coordination-url.test.js.map +1 -1
- package/dist/__tests__/new-project-first-team.test.js +182 -1
- package/dist/__tests__/new-project-first-team.test.js.map +1 -1
- package/dist/__tests__/provision-behavioral-contract.test.js +3 -1
- package/dist/__tests__/provision-behavioral-contract.test.js.map +1 -1
- package/dist/__tests__/provision-catalog-precondition.test.js +3 -1
- package/dist/__tests__/provision-catalog-precondition.test.js.map +1 -1
- package/dist/__tests__/provision-completion-rows.test.js +27 -6
- package/dist/__tests__/provision-completion-rows.test.js.map +1 -1
- package/dist/__tests__/provision-identity-gate.test.js +3 -1
- package/dist/__tests__/provision-identity-gate.test.js.map +1 -1
- package/dist/__tests__/provision-resume.test.js +35 -1
- package/dist/__tests__/provision-resume.test.js.map +1 -1
- package/dist/__tests__/provision-row12-stub-server.test.js +3 -1
- package/dist/__tests__/provision-row12-stub-server.test.js.map +1 -1
- package/dist/__tests__/provision-skeleton-fill.test.js +3 -1
- package/dist/__tests__/provision-skeleton-fill.test.js.map +1 -1
- package/dist/__tests__/provision-step8-commit.test.d.ts +40 -0
- package/dist/__tests__/provision-step8-commit.test.d.ts.map +1 -0
- package/dist/__tests__/provision-step8-commit.test.js +529 -0
- package/dist/__tests__/provision-step8-commit.test.js.map +1 -0
- package/dist/__tests__/provision-teambuilder-flow.test.js +3 -1
- package/dist/__tests__/provision-teambuilder-flow.test.js.map +1 -1
- package/dist/__tests__/rows-9-10-zero-remotes.test.d.ts +32 -0
- package/dist/__tests__/rows-9-10-zero-remotes.test.d.ts.map +1 -0
- package/dist/__tests__/rows-9-10-zero-remotes.test.js +203 -0
- package/dist/__tests__/rows-9-10-zero-remotes.test.js.map +1 -0
- package/dist/__tests__/template-sync.test.js +5 -1
- package/dist/__tests__/template-sync.test.js.map +1 -1
- package/dist/commands/create.d.ts +124 -0
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +319 -87
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/new.d.ts +38 -0
- package/dist/commands/new.d.ts.map +1 -1
- package/dist/commands/new.js +118 -7
- package/dist/commands/new.js.map +1 -1
- package/dist/lib/catalog-commit.d.ts +99 -0
- package/dist/lib/catalog-commit.d.ts.map +1 -0
- package/dist/lib/catalog-commit.js +315 -0
- package/dist/lib/catalog-commit.js.map +1 -0
- package/dist/lib/catalog.d.ts +16 -8
- package/dist/lib/catalog.d.ts.map +1 -1
- package/dist/lib/catalog.js +17 -9
- package/dist/lib/catalog.js.map +1 -1
- package/dist/lib/roster.d.ts +19 -0
- package/dist/lib/roster.d.ts.map +1 -1
- package/dist/lib/roster.js +18 -8
- package/dist/lib/roster.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,315 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Commit a scaffolded project's catalog entry, then bring the team worktree up
|
|
3
|
+
* to that commit (#607).
|
|
4
|
+
*
|
|
5
|
+
* WHY THIS EXISTS. A project with zero remotes (`mx-agent new project` builds
|
|
6
|
+
* one) has no base branch anywhere but its own. Provisioning wrote the team's
|
|
7
|
+
* catalog entry into the project root and copied it into the new worktree, both
|
|
8
|
+
* untracked, so the entry waited one `git add -A` away in two trees and every
|
|
9
|
+
* later read of the base branch missed it. This module commits that one path on
|
|
10
|
+
* the base branch and fast-forwards the team worktree's branch to the commit, so
|
|
11
|
+
* both trees end clean and the entry is tracked in both.
|
|
12
|
+
*
|
|
13
|
+
* ORDER, and the reason for it (#607 plan revision 4):
|
|
14
|
+
* 1. Pre-flight. Nothing is written to git until every check passes: HEAD is
|
|
15
|
+
* `refs/heads/<base>`, an author AND a committer identity resolve, no
|
|
16
|
+
* untracked file at the entry path in the worktree differs from the bytes
|
|
17
|
+
* to be committed, and the worktree's HEAD is an ancestor of the base
|
|
18
|
+
* branch (its branch has no commits of its own).
|
|
19
|
+
* 2. Commit: `git add -- <path>`, then `git commit --only -- <path>`, so
|
|
20
|
+
* anything else the operator has staged is not swept in. On failure,
|
|
21
|
+
* `git reset -q -- <path>` removes only this path from the index. The state
|
|
22
|
+
* is then the same as a pre-flight failure: entry untracked, nothing staged.
|
|
23
|
+
* 3. Worktree: remove a byte-identical untracked copy, then
|
|
24
|
+
* `git -C <worktree> merge --ff-only refs/heads/<base>`. A failure here is a
|
|
25
|
+
* stated partial state: the entry is committed on the base branch, the
|
|
26
|
+
* worktree is one or more commits behind it, and the one command that
|
|
27
|
+
* finishes the job is named.
|
|
28
|
+
*
|
|
29
|
+
* WHAT IT NEVER DOES. It sets no git identity, passes no `--no-verify`, and
|
|
30
|
+
* reads no configuration of its own: the operator's hooks and signing run as
|
|
31
|
+
* they would for the operator's own `git commit`. An identity git derives from
|
|
32
|
+
* the hostname is accepted, because it is what that commit would use too.
|
|
33
|
+
*
|
|
34
|
+
* Nothing here prints. Every outcome is returned, and the caller names the step.
|
|
35
|
+
* Every git call is an argv array, never a shell string.
|
|
36
|
+
*/
|
|
37
|
+
import { spawnSync } from 'child_process';
|
|
38
|
+
import { existsSync, lstatSync, readFileSync, realpathSync, unlinkSync } from 'fs';
|
|
39
|
+
import { dirname, isAbsolute, join } from 'path';
|
|
40
|
+
import { isReadableCatalogRef, isReadableRepoPath } from './catalog.js';
|
|
41
|
+
/**
|
|
42
|
+
* How long one git call here may run before it is stopped (#610 red-team).
|
|
43
|
+
*
|
|
44
|
+
* The operator's hooks and signing run on this commit, so a signing prompt or an
|
|
45
|
+
* interactive hook could otherwise hold `new project` open with no output. Each
|
|
46
|
+
* git call gets this long, with stdin closed so nothing waits on the terminal.
|
|
47
|
+
* A call that is stopped fails like any other failed call: the commit path
|
|
48
|
+
* returns `not-committed` with cause `commit-failed`, and the caller writes the
|
|
49
|
+
* entry uncommitted and names the step.
|
|
50
|
+
*/
|
|
51
|
+
export const CATALOG_COMMIT_GIT_TIMEOUT_MS = 60_000;
|
|
52
|
+
/** The first non-empty line of git's output, with control characters removed and a length cap. */
|
|
53
|
+
export function firstGitLine(text) {
|
|
54
|
+
const line = text.split('\n').map((l) => l.trim()).find((l) => l.length > 0) ?? '';
|
|
55
|
+
// eslint-disable-next-line no-control-regex
|
|
56
|
+
const printable = line.replace(/[\u0000-\u001F\u007F-\u009F]/g, ' ');
|
|
57
|
+
return printable.length > 160 ? `${printable.slice(0, 160)}...` : printable;
|
|
58
|
+
}
|
|
59
|
+
export function commitCatalogEntry(i) {
|
|
60
|
+
const env = i.env ?? process.env;
|
|
61
|
+
const timeout = i.timeoutMs ?? CATALOG_COMMIT_GIT_TIMEOUT_MS;
|
|
62
|
+
// stdin 'ignore': no git call here, and no hook it runs, can wait on the terminal.
|
|
63
|
+
const run = (cwd, args) => {
|
|
64
|
+
const r = spawnSync('git', args, { cwd, env, encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'], timeout });
|
|
65
|
+
return {
|
|
66
|
+
status: r.error ? null : r.status,
|
|
67
|
+
stdout: typeof r.stdout === 'string' ? r.stdout : '',
|
|
68
|
+
stderr: typeof r.stderr === 'string' && r.stderr.length > 0 ? r.stderr : r.error ? r.error.message : '',
|
|
69
|
+
timedOut: r.error?.code === 'ETIMEDOUT',
|
|
70
|
+
};
|
|
71
|
+
};
|
|
72
|
+
const runBytes = (cwd, args) => {
|
|
73
|
+
const r = spawnSync('git', args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'], maxBuffer: 4 * 1024 * 1024, timeout });
|
|
74
|
+
return r.error || r.status !== 0 ? null : r.stdout;
|
|
75
|
+
};
|
|
76
|
+
const baseRef = `refs/heads/${i.baseBranch}`;
|
|
77
|
+
// Both are interpolated into `<ref>:<path>` revisions below, so both are held
|
|
78
|
+
// to the readers' rules before any git argument is built.
|
|
79
|
+
if (!isReadableCatalogRef(baseRef) || !isReadableRepoPath(i.relPath)) {
|
|
80
|
+
return {
|
|
81
|
+
kind: 'not-committed',
|
|
82
|
+
cause: 'unreadable',
|
|
83
|
+
// Both failed validation, so either may hold control characters: each goes
|
|
84
|
+
// through the same sanitiser as git's output before it reaches a terminal.
|
|
85
|
+
detail: `the base branch or the entry path is not one this command reads (${firstGitLine(baseRef)}, ${firstGitLine(i.relPath)})`,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
const worktreeEntry = join(i.worktreePath, i.relPath);
|
|
89
|
+
/** The worktree's HEAD commit, or null when it cannot be read. */
|
|
90
|
+
const worktreeHead = () => {
|
|
91
|
+
const r = run(i.worktreePath, ['rev-parse', '--verify', '-q', 'HEAD']);
|
|
92
|
+
return r.status === 0 ? r.stdout.trim() : null;
|
|
93
|
+
};
|
|
94
|
+
/** Pre-flight 3: the worktree branch has no commits of its own. */
|
|
95
|
+
const worktreeIsAncestor = () => {
|
|
96
|
+
const head = worktreeHead();
|
|
97
|
+
if (head === null)
|
|
98
|
+
return { ok: false, ownCommits: false, detail: `could not read HEAD in ${i.worktreePath}` };
|
|
99
|
+
const r = run(i.projectRoot, ['merge-base', '--is-ancestor', head, baseRef]);
|
|
100
|
+
if (r.status === 0)
|
|
101
|
+
return { ok: true };
|
|
102
|
+
if (r.status === 1) {
|
|
103
|
+
return {
|
|
104
|
+
ok: false,
|
|
105
|
+
ownCommits: true,
|
|
106
|
+
detail: `the team worktree's branch has commits of its own that ${i.baseBranch} does not hold, so it cannot be fast-forwarded`,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
return { ok: false, ownCommits: false, detail: `git merge-base --is-ancestor failed: ${firstGitLine(r.stderr)}` };
|
|
110
|
+
};
|
|
111
|
+
/**
|
|
112
|
+
* Pre-flight 2: whatever is at the entry path in the worktree. `absent` and
|
|
113
|
+
* `identical-untracked` let the fast-forward proceed; `differs` does not.
|
|
114
|
+
*/
|
|
115
|
+
const worktreeCopy = (expected) => {
|
|
116
|
+
// Containment first (CWE-59). `lstatSync` follows a symlinked DIRECTORY on
|
|
117
|
+
// the way to the entry, and git reports a path beyond a symlink as
|
|
118
|
+
// untracked, so without this check a byte-identical file outside the
|
|
119
|
+
// worktree reads as `identical-untracked` and step 3 unlinks it. The entry's
|
|
120
|
+
// directory must resolve to the same directory under the resolved worktree.
|
|
121
|
+
// A directory that does not resolve holds no entry: lstat below says absent.
|
|
122
|
+
let realDir = null;
|
|
123
|
+
try {
|
|
124
|
+
realDir = realpathSync(dirname(worktreeEntry));
|
|
125
|
+
}
|
|
126
|
+
catch {
|
|
127
|
+
realDir = null;
|
|
128
|
+
}
|
|
129
|
+
if (realDir !== null) {
|
|
130
|
+
let realWorktree;
|
|
131
|
+
try {
|
|
132
|
+
realWorktree = realpathSync(i.worktreePath);
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
return { differs: 'the worktree path could not be resolved' };
|
|
136
|
+
}
|
|
137
|
+
if (realDir !== join(realWorktree, dirname(i.relPath))) {
|
|
138
|
+
return { differs: 'its directory resolves outside the worktree' };
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
let isFile;
|
|
142
|
+
try {
|
|
143
|
+
isFile = lstatSync(worktreeEntry).isFile();
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
return existsSync(worktreeEntry) ? { differs: 'it could not be read' } : 'absent';
|
|
147
|
+
}
|
|
148
|
+
if (!isFile)
|
|
149
|
+
return { differs: 'it is not a regular file' };
|
|
150
|
+
const tracked = run(i.worktreePath, ['ls-files', '--error-unmatch', '--', i.relPath]);
|
|
151
|
+
if (tracked.status === 0)
|
|
152
|
+
return { differs: 'the worktree\'s index already holds a file at that path' };
|
|
153
|
+
let onDisk;
|
|
154
|
+
try {
|
|
155
|
+
onDisk = readFileSync(worktreeEntry);
|
|
156
|
+
}
|
|
157
|
+
catch {
|
|
158
|
+
return { differs: 'it could not be read' };
|
|
159
|
+
}
|
|
160
|
+
return onDisk.equals(expected) ? 'identical-untracked' : { differs: 'its content differs from the entry this run commits' };
|
|
161
|
+
};
|
|
162
|
+
/** Step 3: remove an identical untracked copy, then fast-forward. */
|
|
163
|
+
const bringWorktreeUp = (expected) => {
|
|
164
|
+
if (worktreeCopy(expected) === 'identical-untracked') {
|
|
165
|
+
try {
|
|
166
|
+
unlinkSync(worktreeEntry);
|
|
167
|
+
}
|
|
168
|
+
catch (err) {
|
|
169
|
+
return { ok: false, detail: `could not remove the identical untracked copy at ${worktreeEntry}: ${err instanceof Error ? err.message : String(err)}` };
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
const merged = run(i.worktreePath, ['merge', '--ff-only', '-q', baseRef]);
|
|
173
|
+
if (merged.status === 0)
|
|
174
|
+
return { ok: true };
|
|
175
|
+
return { ok: false, detail: `git merge --ff-only failed: ${firstGitLine(merged.stderr || merged.stdout)}` };
|
|
176
|
+
};
|
|
177
|
+
// ── Already on the base branch: commit nothing ─────────────────────
|
|
178
|
+
//
|
|
179
|
+
// A resume after a run that committed and then could not fast-forward, or an
|
|
180
|
+
// operator who committed the entry by hand. Nothing is committed. The worktree
|
|
181
|
+
// is brought up to the base branch only when it lacks the entry, under the
|
|
182
|
+
// same two worktree checks the commit path runs before it writes.
|
|
183
|
+
const onBase = runBytes(i.projectRoot, ['cat-file', 'blob', '--end-of-options', `${baseRef}:${i.relPath}`]);
|
|
184
|
+
if (onBase !== null) {
|
|
185
|
+
const head = worktreeHead();
|
|
186
|
+
const inWorktreeHead = head !== null
|
|
187
|
+
&& run(i.worktreePath, ['cat-file', '-e', '--end-of-options', `${head}:${i.relPath}`]).status === 0;
|
|
188
|
+
if (inWorktreeHead)
|
|
189
|
+
return { kind: 'already-tracked', worktreeUpdated: false };
|
|
190
|
+
const sha = run(i.projectRoot, ['rev-parse', '--verify', '-q', baseRef]).stdout.trim() || null;
|
|
191
|
+
const copy = worktreeCopy(onBase);
|
|
192
|
+
if (typeof copy === 'object') {
|
|
193
|
+
return {
|
|
194
|
+
kind: 'worktree-behind',
|
|
195
|
+
sha,
|
|
196
|
+
detail: `an untracked file at the entry path in the team worktree blocks the fast-forward: ${copy.differs}`,
|
|
197
|
+
worktreeHasOwnCommits: false,
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
const ancestor = worktreeIsAncestor();
|
|
201
|
+
if (!ancestor.ok) {
|
|
202
|
+
return { kind: 'worktree-behind', sha, detail: ancestor.detail, worktreeHasOwnCommits: ancestor.ownCommits };
|
|
203
|
+
}
|
|
204
|
+
const up = bringWorktreeUp(onBase);
|
|
205
|
+
return up.ok
|
|
206
|
+
? { kind: 'already-tracked', worktreeUpdated: true }
|
|
207
|
+
: { kind: 'worktree-behind', sha, detail: up.detail, worktreeHasOwnCommits: false };
|
|
208
|
+
}
|
|
209
|
+
// ── 1. Pre-flight: nothing is written to git until all of these pass ──
|
|
210
|
+
const symbolic = run(i.projectRoot, ['symbolic-ref', '-q', 'HEAD']);
|
|
211
|
+
if (symbolic.status !== 0 || symbolic.stdout.trim() !== baseRef) {
|
|
212
|
+
return {
|
|
213
|
+
kind: 'not-committed',
|
|
214
|
+
cause: 'head-not-on-base',
|
|
215
|
+
detail: symbolic.status === 0
|
|
216
|
+
? `the project root is on ${firstGitLine(symbolic.stdout)}, not ${baseRef}`
|
|
217
|
+
: `the project root's HEAD is detached or unreadable, not ${baseRef}`,
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
for (const ident of ['GIT_AUTHOR_IDENT', 'GIT_COMMITTER_IDENT']) {
|
|
221
|
+
const probe = run(i.projectRoot, ['var', ident]);
|
|
222
|
+
if (probe.status !== 0) {
|
|
223
|
+
return {
|
|
224
|
+
kind: 'not-committed',
|
|
225
|
+
cause: 'no-identity',
|
|
226
|
+
detail: `git cannot resolve an ${ident === 'GIT_AUTHOR_IDENT' ? 'author' : 'committer'} identity in the project root `
|
|
227
|
+
+ `(git var ${ident}: ${firstGitLine(probe.stderr) || `exit ${probe.status}`})`,
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
let bytes;
|
|
232
|
+
try {
|
|
233
|
+
bytes = readFileSync(join(i.projectRoot, i.relPath));
|
|
234
|
+
}
|
|
235
|
+
catch (err) {
|
|
236
|
+
return {
|
|
237
|
+
kind: 'not-committed',
|
|
238
|
+
cause: 'unreadable',
|
|
239
|
+
detail: `the entry in the project root could not be read: ${err instanceof Error ? err.message : String(err)}`,
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
const copy = worktreeCopy(bytes);
|
|
243
|
+
if (typeof copy === 'object') {
|
|
244
|
+
return {
|
|
245
|
+
kind: 'not-committed',
|
|
246
|
+
cause: 'differing-copy',
|
|
247
|
+
detail: `a file already at the entry path in the team worktree is not this run's entry: ${copy.differs}`,
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
const ancestor = worktreeIsAncestor();
|
|
251
|
+
if (!ancestor.ok) {
|
|
252
|
+
return {
|
|
253
|
+
kind: 'not-committed',
|
|
254
|
+
cause: ancestor.ownCommits ? 'worktree-has-own-commits' : 'unreadable',
|
|
255
|
+
detail: ancestor.detail,
|
|
256
|
+
};
|
|
257
|
+
}
|
|
258
|
+
/**
|
|
259
|
+
* I-1: whether `<git-dir>/index.lock` exists, read after a stopped git call.
|
|
260
|
+
* Only the yes or no reaches the operator; the resolved path is never printed.
|
|
261
|
+
*/
|
|
262
|
+
const indexLockRemains = () => {
|
|
263
|
+
const gitDir = run(i.projectRoot, ['rev-parse', '--git-dir']);
|
|
264
|
+
if (gitDir.status !== 0)
|
|
265
|
+
return false;
|
|
266
|
+
const dir = gitDir.stdout.trim();
|
|
267
|
+
if (dir === '')
|
|
268
|
+
return false;
|
|
269
|
+
return existsSync(join(isAbsolute(dir) ? dir : join(i.projectRoot, dir), 'index.lock'));
|
|
270
|
+
};
|
|
271
|
+
// ── 2. Commit this one path ────────────────────────────────────────
|
|
272
|
+
const baseBefore = run(i.projectRoot, ['rev-parse', '--verify', '-q', baseRef]).stdout.trim();
|
|
273
|
+
const added = run(i.projectRoot, ['add', '--', i.relPath]);
|
|
274
|
+
const committed = added.status === 0
|
|
275
|
+
? run(i.projectRoot, ['commit', '--only', '-q', '-m', i.message, '--', i.relPath])
|
|
276
|
+
: added;
|
|
277
|
+
// A commit can exist although git did not exit 0: a post-commit hook that
|
|
278
|
+
// outran the timeout is stopped after the commit was written. That case alone
|
|
279
|
+
// is accepted (SF-1, CWE-354), and only when every one of these holds: the
|
|
280
|
+
// commit call was stopped at the timeout after `git add` succeeded; the base
|
|
281
|
+
// branch now points at a commit T other than `baseBefore` whose first parent
|
|
282
|
+
// is `baseBefore`, so exactly one commit was added; and T holds at the entry
|
|
283
|
+
// path the bytes this run committed. Anything else, including a hook that
|
|
284
|
+
// committed other bytes and then failed, is a failed commit. The sha reported
|
|
285
|
+
// is T, not a second read of the branch.
|
|
286
|
+
const tipNow = committed.timedOut && added.status === 0
|
|
287
|
+
? run(i.projectRoot, ['rev-parse', '--verify', '-q', baseRef]).stdout.trim()
|
|
288
|
+
: '';
|
|
289
|
+
const committedAnyway = tipNow !== '' && tipNow !== baseBefore
|
|
290
|
+
&& run(i.projectRoot, ['rev-parse', '--verify', '-q', `${tipNow}^1`]).stdout.trim() === baseBefore
|
|
291
|
+
&& (runBytes(i.projectRoot, ['cat-file', 'blob', '--end-of-options', `${tipNow}:${i.relPath}`])?.equals(bytes) ?? false);
|
|
292
|
+
if (committed.status !== 0 && !committedAnyway) {
|
|
293
|
+
// Removes only this path from the index and leaves the file in place. It
|
|
294
|
+
// also removes an entry the operator had staged at this same path before the
|
|
295
|
+
// run; the file on disk is unchanged either way.
|
|
296
|
+
run(i.projectRoot, ['reset', '-q', '--', i.relPath]);
|
|
297
|
+
const step = added.status === 0 ? 'commit' : 'add';
|
|
298
|
+
return {
|
|
299
|
+
kind: 'not-committed',
|
|
300
|
+
cause: 'commit-failed',
|
|
301
|
+
detail: committed.timedOut
|
|
302
|
+
? `git ${step} did not finish within ${timeout % 1000 === 0 ? `${timeout / 1000} s` : `${timeout} ms`} and was stopped; `
|
|
303
|
+
+ 'a commit hook or a signing prompt may be waiting for input'
|
|
304
|
+
+ (indexLockRemains() ? '; if .git/index.lock remains, remove it' : '')
|
|
305
|
+
: `git ${step} failed: ${firstGitLine(committed.stderr || committed.stdout) || `exit ${committed.status}`}`,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
const sha = committedAnyway ? tipNow : run(i.projectRoot, ['rev-parse', '--verify', '-q', baseRef]).stdout.trim();
|
|
309
|
+
// ── 3. The worktree, after the commit has succeeded ────────────────
|
|
310
|
+
const up = bringWorktreeUp(bytes);
|
|
311
|
+
if (!up.ok)
|
|
312
|
+
return { kind: 'worktree-behind', sha, detail: up.detail, worktreeHasOwnCommits: false };
|
|
313
|
+
return { kind: 'committed', sha };
|
|
314
|
+
}
|
|
315
|
+
//# sourceMappingURL=catalog-commit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-commit.js","sourceRoot":"","sources":["../../src/lib/catalog-commit.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/catalog.d.ts
CHANGED
|
@@ -356,14 +356,22 @@ export declare function teamInteractionOnOriginMain(projectRoot: string, slug: s
|
|
|
356
356
|
*/
|
|
357
357
|
export declare function teamInteractionOnRef(projectRoot: string, slug: string, ref: string, teamsDir?: string): TeamInteraction | 'unresolvable';
|
|
358
358
|
/**
|
|
359
|
-
* Whether `ref` is one of the
|
|
360
|
-
*
|
|
361
|
-
* `HEAD`, or `
|
|
362
|
-
* underscore, hyphen and slash. That excludes every
|
|
363
|
-
* revision syntax in either interpolation: `:` (path
|
|
364
|
-
* (ancestry), `@{` (reflog), `?` `*` `[` (globs),
|
|
365
|
-
* `...` ranges. A leading dash cannot occur,
|
|
366
|
-
* `HEAD` or `
|
|
359
|
+
* Whether `ref` is one of the three forms `catalogEntryOnRef` reads.
|
|
360
|
+
*
|
|
361
|
+
* `HEAD`, `origin/<name>`, or `refs/heads/<name>`, where the name holds only
|
|
362
|
+
* letters, digits, dot, underscore, hyphen and slash. That excludes every
|
|
363
|
+
* character git reads as revision syntax in either interpolation: `:` (path
|
|
364
|
+
* separator), `^` and `~` (ancestry), `@{` (reflog), `?` `*` `[` (globs),
|
|
365
|
+
* whitespace, and the `..` and `...` ranges. A leading dash cannot occur,
|
|
366
|
+
* because the string must start with `HEAD`, `origin/` or `refs/heads/`, and
|
|
367
|
+
* `--end-of-options` covers that class regardless.
|
|
368
|
+
*
|
|
369
|
+
* `refs/heads/<name>` is the local base branch, read only by a project that has
|
|
370
|
+
* NO remote at all (#607): a freshly scaffolded project, whose base branch is
|
|
371
|
+
* where provisioning commits the catalog entry, has no `origin/<base>` to read.
|
|
372
|
+
* The full form, never a bare branch name, so a tag or a remote-tracking ref of
|
|
373
|
+
* the same short name cannot answer in its place. Every other `refs/` form
|
|
374
|
+
* (`refs/remotes/...`, `refs/tags/...`) is still refused.
|
|
367
375
|
*
|
|
368
376
|
* Exported for the test that enumerates the refusals.
|
|
369
377
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/catalog.js
CHANGED
|
@@ -559,21 +559,29 @@ export function teamInteractionOnRef(projectRoot, slug, ref, teamsDir = 'mx-agen
|
|
|
559
559
|
}
|
|
560
560
|
}
|
|
561
561
|
/**
|
|
562
|
-
* Whether `ref` is one of the
|
|
563
|
-
*
|
|
564
|
-
* `HEAD`, or `
|
|
565
|
-
* underscore, hyphen and slash. That excludes every
|
|
566
|
-
* revision syntax in either interpolation: `:` (path
|
|
567
|
-
* (ancestry), `@{` (reflog), `?` `*` `[` (globs),
|
|
568
|
-
* `...` ranges. A leading dash cannot occur,
|
|
569
|
-
* `HEAD` or `
|
|
562
|
+
* Whether `ref` is one of the three forms `catalogEntryOnRef` reads.
|
|
563
|
+
*
|
|
564
|
+
* `HEAD`, `origin/<name>`, or `refs/heads/<name>`, where the name holds only
|
|
565
|
+
* letters, digits, dot, underscore, hyphen and slash. That excludes every
|
|
566
|
+
* character git reads as revision syntax in either interpolation: `:` (path
|
|
567
|
+
* separator), `^` and `~` (ancestry), `@{` (reflog), `?` `*` `[` (globs),
|
|
568
|
+
* whitespace, and the `..` and `...` ranges. A leading dash cannot occur,
|
|
569
|
+
* because the string must start with `HEAD`, `origin/` or `refs/heads/`, and
|
|
570
|
+
* `--end-of-options` covers that class regardless.
|
|
571
|
+
*
|
|
572
|
+
* `refs/heads/<name>` is the local base branch, read only by a project that has
|
|
573
|
+
* NO remote at all (#607): a freshly scaffolded project, whose base branch is
|
|
574
|
+
* where provisioning commits the catalog entry, has no `origin/<base>` to read.
|
|
575
|
+
* The full form, never a bare branch name, so a tag or a remote-tracking ref of
|
|
576
|
+
* the same short name cannot answer in its place. Every other `refs/` form
|
|
577
|
+
* (`refs/remotes/...`, `refs/tags/...`) is still refused.
|
|
570
578
|
*
|
|
571
579
|
* Exported for the test that enumerates the refusals.
|
|
572
580
|
*/
|
|
573
581
|
export function isReadableCatalogRef(ref) {
|
|
574
582
|
if (ref === 'HEAD')
|
|
575
583
|
return true;
|
|
576
|
-
if (!/^origin\/[A-Za-z0-9._\/-]+$/.test(ref))
|
|
584
|
+
if (!/^(?:origin|refs\/heads)\/[A-Za-z0-9._\/-]+$/.test(ref))
|
|
577
585
|
return false;
|
|
578
586
|
// `..` is range syntax and every component of a valid ref name is non-empty,
|
|
579
587
|
// so this one check covers `a..b`, `a...b` and a trailing or doubled slash.
|
package/dist/lib/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/roster.d.ts
CHANGED
|
@@ -51,7 +51,25 @@ export interface RosterReadOptions {
|
|
|
51
51
|
* whose age nothing established.
|
|
52
52
|
*/
|
|
53
53
|
fetchOk?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* Read the LOCAL base branch, `refs/heads/<base>`, instead of `origin/<base>`
|
|
56
|
+
* (#607). Set by a caller only when the project has zero remotes, which it
|
|
57
|
+
* established with `git remote` itself: a freshly scaffolded project has no
|
|
58
|
+
* `origin/<base>` to read, and its base branch is local. `fetchOk` is not
|
|
59
|
+
* consulted on this path, because no fetch is involved: the ref is the
|
|
60
|
+
* repository's own branch, not a copy of unknown age.
|
|
61
|
+
*/
|
|
62
|
+
localBase?: boolean;
|
|
54
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* The ref a roster read uses: `refs/heads/<base>` when `localBase` is set,
|
|
66
|
+
* `origin/<base>` otherwise. Exported so a caller can name in a message the ref
|
|
67
|
+
* the read actually used, rather than rebuilding the string (#607).
|
|
68
|
+
*/
|
|
69
|
+
export declare function rosterRefFor(opts: {
|
|
70
|
+
baseBranch?: string;
|
|
71
|
+
localBase?: boolean;
|
|
72
|
+
}): string;
|
|
55
73
|
/**
|
|
56
74
|
* Whether the generated offline roster file on `origin/<base>` lists the slug
|
|
57
75
|
* under the project.
|
|
@@ -90,6 +108,7 @@ export declare function rosterEntryOnRef(projectRoot: string, slug: string, opts
|
|
|
90
108
|
export declare function rosterSourceHasSlug(projectRoot: string, slug: string, project: string, opts?: {
|
|
91
109
|
baseBranch?: string;
|
|
92
110
|
fetchOk?: boolean;
|
|
111
|
+
localBase?: boolean;
|
|
93
112
|
}): RosterOutcome;
|
|
94
113
|
/**
|
|
95
114
|
* The parse, separate from the read so every shape it refuses is testable
|
package/dist/lib/roster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roster.d.ts","sourceRoot":"","sources":["../../src/lib/roster.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAMH,kFAAkF;AAClF,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,cAAc,CAAC;AAElE;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,CAAC;AAElE,kFAAkF;AAClF,eAAO,MAAM,gBAAgB,qEAAqE,CAAC;AAEnG,+EAA+E;AAC/E,eAAO,MAAM,kBAAkB,+DAA+D,CAAC;AAU/F,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"roster.d.ts","sourceRoot":"","sources":["../../src/lib/roster.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAMH,kFAAkF;AAClF,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,cAAc,CAAC;AAElE;;;;;;;GAOG;AACH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,gBAAgB,CAAC;AAElE,kFAAkF;AAClF,eAAO,MAAM,gBAAgB,qEAAqE,CAAC;AAEnG,+EAA+E;AAC/E,eAAO,MAAM,kBAAkB,+DAA+D,CAAC;AAU/F,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAGvF;AAkCD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GACtB,kBAAkB,CAyBpB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GACzE,aAAa,CAOf;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,CASnG"}
|
package/dist/lib/roster.js
CHANGED
|
@@ -38,6 +38,15 @@ export const ROSTER_SOURCE_PATH = 'mx-agent-system/coordination-service/src/conf
|
|
|
38
38
|
* different set and is not what the token gate reads.
|
|
39
39
|
*/
|
|
40
40
|
const PROVISIONED_ROSTERS_EXPORT = 'PROVISIONED_ROSTERS';
|
|
41
|
+
/**
|
|
42
|
+
* The ref a roster read uses: `refs/heads/<base>` when `localBase` is set,
|
|
43
|
+
* `origin/<base>` otherwise. Exported so a caller can name in a message the ref
|
|
44
|
+
* the read actually used, rather than rebuilding the string (#607).
|
|
45
|
+
*/
|
|
46
|
+
export function rosterRefFor(opts) {
|
|
47
|
+
const base = opts.baseBranch?.trim() || 'main';
|
|
48
|
+
return opts.localBase === true ? `refs/heads/${base}` : `origin/${base}`;
|
|
49
|
+
}
|
|
41
50
|
/**
|
|
42
51
|
* Read one path at one ref. `undefined` means the read could not be performed;
|
|
43
52
|
* `null` means the ref resolved and holds no such path.
|
|
@@ -47,9 +56,9 @@ const PROVISIONED_ROSTERS_EXPORT = 'PROVISIONED_ROSTERS';
|
|
|
47
56
|
*/
|
|
48
57
|
function showAtRef(projectRoot, ref, path) {
|
|
49
58
|
try {
|
|
50
|
-
// The
|
|
51
|
-
//
|
|
52
|
-
// the whole of what these callers need.
|
|
59
|
+
// The accepted forms, for the reason `catalogEntryOnRef` states: the ref is
|
|
60
|
+
// interpolated into a revision string, and `origin/<name>` or, with zero
|
|
61
|
+
// remotes, `refs/heads/<name>` is the whole of what these callers need.
|
|
53
62
|
if (!isReadableCatalogRef(ref))
|
|
54
63
|
return undefined;
|
|
55
64
|
if (!refExists(ref, projectRoot))
|
|
@@ -87,10 +96,11 @@ function showAtRef(projectRoot, ref, path) {
|
|
|
87
96
|
* roster for the project (#507). See RosterEntryOutcome.
|
|
88
97
|
*/
|
|
89
98
|
export function rosterEntryOnRef(projectRoot, slug, opts) {
|
|
90
|
-
// A failed fetch settles the answer before any ref is read.
|
|
91
|
-
|
|
99
|
+
// A failed fetch settles the answer before any ref is read. Not on the local
|
|
100
|
+
// path, which reads the repository's own branch and depends on no fetch.
|
|
101
|
+
if (opts.localBase !== true && opts.fetchOk !== true)
|
|
92
102
|
return 'unresolvable';
|
|
93
|
-
const ref =
|
|
103
|
+
const ref = rosterRefFor(opts);
|
|
94
104
|
const raw = showAtRef(projectRoot, ref, ROSTER_JSON_PATH);
|
|
95
105
|
if (raw === undefined)
|
|
96
106
|
return 'unresolvable';
|
|
@@ -141,9 +151,9 @@ export function rosterEntryOnRef(projectRoot, slug, opts) {
|
|
|
141
151
|
* The file is parsed as text. Nothing in it is evaluated, imported or executed.
|
|
142
152
|
*/
|
|
143
153
|
export function rosterSourceHasSlug(projectRoot, slug, project, opts = {}) {
|
|
144
|
-
if (opts.fetchOk !== true)
|
|
154
|
+
if (opts.localBase !== true && opts.fetchOk !== true)
|
|
145
155
|
return 'unresolvable';
|
|
146
|
-
const ref =
|
|
156
|
+
const ref = rosterRefFor(opts);
|
|
147
157
|
const raw = showAtRef(projectRoot, ref, ROSTER_SOURCE_PATH);
|
|
148
158
|
if (raw === undefined)
|
|
149
159
|
return 'unresolvable';
|
package/dist/lib/roster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roster.js","sourceRoot":"","sources":["../../src/lib/roster.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAe1C,kFAAkF;AAClF,MAAM,CAAC,MAAM,gBAAgB,GAAG,kEAAkE,CAAC;AAEnG,+EAA+E;AAC/E,MAAM,CAAC,MAAM,kBAAkB,GAAG,4DAA4D,CAAC;AAE/F;;;;;GAKG;AACH,MAAM,0BAA0B,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"roster.js","sourceRoot":"","sources":["../../src/lib/roster.ts"],"names":[],"mappings":"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"}
|