@memnexus-ai/mx-agent-cli 0.1.305 → 0.1.307

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.
@@ -17,7 +17,11 @@
17
17
  * reads `active` can be restored (M6a, M6b). For such a team the worktree
18
18
  * lookup is `findTeamWorktree`, which accepts `<slug>` and
19
19
  * `<slug>-YYYYMMDD` only (M1, M9), so `start team` never resolves to a
20
- * `team-builder-*` worktree. Every other slug keeps the prefix lookup
20
+ * `team-builder-*` worktree. When that lookup finds nothing,
21
+ * `classifyTeamWorktreeCandidates` reads the identity of every other
22
+ * `<slug>-*` git worktree before a restore is chosen (#1193), so a folder
23
+ * named before the dated naming, such as `mcp-improvements`, is used rather
24
+ * than duplicated. Every other slug keeps the prefix lookup
21
25
  * `findWorktreePath`, which is how same-machine starts have always worked.
22
26
  * 2. `restoreTeamWorktree` fetches `origin/<base>` and the team's
23
27
  * `worktree/<slug>-*` branches (M10, M13b). By default it creates today's
@@ -56,10 +60,12 @@
56
60
  * so a test can read them without capturing a terminal.
57
61
  */
58
62
  import { spawnSync } from 'child_process';
59
- import { existsSync, lstatSync } from 'fs';
63
+ import { existsSync, lstatSync, readdirSync } from 'fs';
60
64
  import { basename, join } from 'path';
61
- import { getTeamWithStatus, getTeamsCatalogDir, TEAM_SLUG_RE } from './catalog.js';
65
+ import { getTeamWithStatus, getTeamsCatalogDir, listTeams, TEAM_SLUG_RE } from './catalog.js';
62
66
  import { CodeContextFileError, CODE_CONTEXT_FILENAME, writeCodeContextFile } from './code-context-file.js';
67
+ import { COORDINATION_MARKER_FILE, readTeamMarker, readWorktreeFile, topLevelRefusal, } from './coordination-worktree.js';
68
+ import { sanitizeField } from './coordination-render.js';
63
69
  import { checkWorktreeConfigPreflight, describePreflight, readWorktreeConfigExtension, teamGitEmail, writeTeamGitIdentity, } from './git-identity.js';
64
70
  import { teamMemorySpecs } from './memory.js';
65
71
  import { assignSlot, findTeamWorktree, findWorktreePath, generateWorktreeDirName, hasOriginRemote, repairSiblingWorktreeLinks, } from './worktree.js';
@@ -145,6 +151,278 @@ export function catalogPointerLines(projectRoot, teamsDir) {
145
151
  `To create a new team: ${NEW_TEAM_COMMAND}`,
146
152
  ];
147
153
  }
154
+ /**
155
+ * The `team` key of a candidate's `.mx-code-context.json`, read with the
156
+ * bounded, owner-checked, no-follow reader (#1193 amendment 1, A4), never with
157
+ * the unbounded `readCodeContextValues`.
158
+ */
159
+ function contextIdentity(path, slug, seams) {
160
+ const context = readContextTeam(path, seams);
161
+ if (context.kind === 'absent') {
162
+ return { kind: 'unknown', why: `it has no ${COORDINATION_MARKER_FILE} marker and no ${CODE_CONTEXT_FILENAME}` };
163
+ }
164
+ if (context.kind === 'unknown')
165
+ return { kind: 'unknown', why: context.why };
166
+ return context.team === slug ? { kind: 'this' } : { kind: 'other' };
167
+ }
168
+ /** The scope file's `team`: absent, a valid slug, or unreadable with a non-secret reason. */
169
+ function readContextTeam(path, seams) {
170
+ const read = readWorktreeFile({ root: path, source: 'git-toplevel' }, join(path, CODE_CONTEXT_FILENAME), seams);
171
+ if (read.kind === 'absent')
172
+ return { kind: 'absent' };
173
+ if (read.kind === 'refused')
174
+ return { kind: 'unknown', why: `its ${CODE_CONTEXT_FILENAME} was not read because ${read.why}` };
175
+ let team;
176
+ try {
177
+ team = JSON.parse(read.text)?.team;
178
+ }
179
+ catch {
180
+ return { kind: 'unknown', why: `its ${CODE_CONTEXT_FILENAME} is not valid JSON` };
181
+ }
182
+ if (typeof team !== 'string' || !TEAM_SLUG_RE.test(team)) {
183
+ return { kind: 'unknown', why: `its ${CODE_CONTEXT_FILENAME} holds no team slug` };
184
+ }
185
+ return { kind: 'team', team };
186
+ }
187
+ /**
188
+ * The team a candidate worktree names (#1193 amendment 1, A3). The marker
189
+ * first, through `readTeamMarker`, the reader every coordination command uses;
190
+ * the scope file only where A3 allows it.
191
+ */
192
+ function candidateIdentity(path, slug, seams) {
193
+ const marker = readTeamMarker({ root: path, source: 'git-toplevel' }, seams);
194
+ switch (marker.kind) {
195
+ case 'ok': {
196
+ const team = marker.line.replace(/\s+/g, '');
197
+ if (team === slug)
198
+ return { kind: 'this' };
199
+ // Another slug, including one the catalog no longer holds: not this team.
200
+ if (TEAM_SLUG_RE.test(team))
201
+ return { kind: 'other' };
202
+ // PRD does not specify a marker that holds no slug. It names no team, so
203
+ // it is treated as no readable identity, which refuses and writes nothing.
204
+ return { kind: 'unknown', why: `its ${COORDINATION_MARKER_FILE} marker holds no team slug` };
205
+ }
206
+ case 'absent':
207
+ return contextIdentity(path, slug, seams);
208
+ case 'unreadable':
209
+ // PRD does not specify this result. The marker is there and was not
210
+ // read (a link, another owner), so the scope file is not consulted in its
211
+ // place: the unread marker could name another team.
212
+ return { kind: 'unknown', why: `its ${COORDINATION_MARKER_FILE} marker was not read because ${marker.why}` };
213
+ case 'refused':
214
+ // `tracked-unknown`: git cannot read the worktree, for example a link a
215
+ // host-provisioned worktree holds. `tracked` and `context-mismatch` never
216
+ // fall back, so the mismatch guard holds.
217
+ if (marker.reason === 'tracked-unknown')
218
+ return brokenLinkIdentity(path, slug, seams, marker);
219
+ return { kind: 'refused', why: marker.why, remedy: marker.remedy };
220
+ }
221
+ }
222
+ /**
223
+ * A candidate whose marker reader answered `tracked-unknown` (#1193 amendment 1,
224
+ * A3; security review SF1, red-team N1 and N2 on PR #1217).
225
+ *
226
+ * `cwdMarkerRefusal` answers `tracked-unknown` before it compares the marker
227
+ * with the scope file, so the comparison is made here, and a broken `.git`
228
+ * link cannot switch the mismatch guard off. With an intact link,
229
+ * `cwdMarkerRefusal` refuses ANY marker and scope file that name two different
230
+ * valid slugs as `context-mismatch`, so a broken link refuses the same set:
231
+ * - the marker and the scope file name two different valid slugs, in either
232
+ * direction and whether or not either is this slug: refused with the
233
+ * git-link reason, naming both teams, and a remedy that says to make the
234
+ * two files agree (security I7). Dropping the folder instead would restore
235
+ * a second worktree of this team when either file names it (N1, N2);
236
+ * - the marker names another valid slug and the scope file is absent or
237
+ * names the same slug: `other`, dropped;
238
+ * - the marker and the scope file both name this slug: `this`, and start
239
+ * step 1b repairs the link;
240
+ * - anything else, including the marker naming this slug with no scope file
241
+ * and any file that is not readable: refused with the git-link reason.
242
+ * The marker is read again with the same owner-checked, no-follow reader; it
243
+ * was read once already, since `tracked-unknown` follows a successful read.
244
+ */
245
+ function brokenLinkIdentity(path, slug, seams, marker) {
246
+ const raw = readWorktreeFile({ root: path, source: 'git-toplevel' }, join(path, COORDINATION_MARKER_FILE), seams);
247
+ const markerTeam = raw.kind === 'ok' ? (raw.text.split(/\r?\n/, 1)[0] ?? '').replace(/\s+/g, '') : '';
248
+ const context = readContextTeam(path, seams);
249
+ const markerValid = TEAM_SLUG_RE.test(markerTeam);
250
+ if (markerValid && context.kind === 'team' && context.team !== markerTeam) {
251
+ return disagreementRefusal(slug, marker.why, markerTeam, context.team);
252
+ }
253
+ if (markerValid && markerTeam !== slug && (context.kind === 'absent' || context.kind === 'team'))
254
+ return { kind: 'other' };
255
+ if (markerTeam === slug && context.kind === 'team')
256
+ return { kind: 'this' };
257
+ return { kind: 'refused', why: marker.why, remedy: marker.remedy };
258
+ }
259
+ /**
260
+ * The refusal for a broken-link candidate whose marker and scope file name two
261
+ * different teams (red-team N1 and N2, security I7 on PR #1217). The reason
262
+ * names both files and both teams. The remedy says how to make them agree, or
263
+ * to remove the worktree, and that `start` repairs the git link once it accepts
264
+ * the folder. Every value goes through `sanitizeField`; the two teams are
265
+ * valid slugs already. No path is printed inside a command.
266
+ */
267
+ function disagreementRefusal(slug, linkWhy, markerTeam, contextTeam) {
268
+ const [s, m, c] = [slug, markerTeam, contextTeam].map((v) => sanitizeField(v));
269
+ return {
270
+ kind: 'refused',
271
+ why: `${linkWhy}, and its ${COORDINATION_MARKER_FILE} marker names team "${m}" while its ${CODE_CONTEXT_FILENAME} names team "${c}", so the two disagree`,
272
+ remedy: [
273
+ `In that folder, the ${COORDINATION_MARKER_FILE} marker names team "${m}" and ${CODE_CONTEXT_FILENAME} names team "${c}". `
274
+ + 'Edit the file that is wrong so both name the team that uses this worktree, or, if no team uses it, remove the worktree (git worktree remove).',
275
+ `Its git link is also broken. Once both files name team "${s}", mx-agent start ${s} uses this folder and repairs the link.`,
276
+ ],
277
+ };
278
+ }
279
+ /**
280
+ * The line `start` prints for a candidate `topLevelRefusal` refuses (red-team
281
+ * R3 on PR #1217). That function's owner sentence ends with a
282
+ * `CLAUDE_WORKTREE_PATH` remedy, which applies to coordination commands and
283
+ * which `start` ignores, so it is replaced here. Its mode sentence ends with
284
+ * `chmod go-w`, which works for `start` too, and is kept. The test file pins
285
+ * both texts, so a change to either sentence fails a test.
286
+ *
287
+ * WHICH SENTENCE. Decided by the fixed prefix that includes this folder's own
288
+ * path, never by searching the text: the path is in both sentences, so a
289
+ * folder named with the mode wording cannot make an owner refusal read as a
290
+ * mode refusal (security review I5, comment 7049834223).
291
+ */
292
+ function untrustedLine(path, refusal) {
293
+ if (refusal.startsWith(`the git worktree at ${sanitizeField(path)} is group- or world-writable (mode `)) {
294
+ return ` ${sanitizeField(refusal)}.`;
295
+ }
296
+ return ` ${sanitizeField(path).slice(0, 300)} is not owned by the current user, so start did not read it. `
297
+ + 'Run mx-agent start as the user who owns it, or remove that worktree (git worktree remove).';
298
+ }
299
+ /**
300
+ * The worktrees of `slug` whose folder `findTeamWorktree` does not accept, read
301
+ * by identity (#1193; plan comment 7044215366 and amendment 1, comment
302
+ * 7044277415, which governs where they differ).
303
+ *
304
+ * WHY. `findTeamWorktree` accepts `<slug>` and `<slug>-YYYYMMDD` only, so a team
305
+ * whose folder predates the dated naming (`mcp-improvements`) was restored
306
+ * beside its own worktree, and the second session could drain its inbox.
307
+ *
308
+ * CANDIDATES. Entries under `<projectRoot>/<worktreeDir>/` that start with
309
+ * `<slug>-`, except:
310
+ * - A1: a folder another catalog team claims by name. Every catalog slug
311
+ * claims the folder it equals and every `<slug>-*` folder, whatever its
312
+ * Status (red-team R2 on PR #1217). The longest claimant owns the folder,
313
+ * this slug included (R1), so `team-builder-20260101` is never a candidate
314
+ * of `team`, and `team-builder-improvements` is still one of
315
+ * `team-builder`.
316
+ * - A2: anything `lstat` shows is not a directory, a symbolic link included,
317
+ * and a directory whose `.git` is not a regular file, so a nested clone is
318
+ * skipped (R4). Owner and mode go through `topLevelRefusal`, as
319
+ * `scanTeamWorktrees` does.
320
+ *
321
+ * DECISION. A refusal from the marker reader refuses. Then exactly one
322
+ * candidate naming this slug is `existing`; two or more refuse; none and at
323
+ * least one with no readable identity refuses; otherwise `none`. A candidate
324
+ * naming another slug is dropped. Every refusal is returned before anything is
325
+ * written, and the lines name the folders and the remedy.
326
+ *
327
+ * STATED LIMIT. A folder that does not start with `<slug>-` is never a
328
+ * candidate.
329
+ *
330
+ * `seams` are the owner-check and git test seams of `LocateWorktreeOptions`.
331
+ */
332
+ export function classifyTeamWorktreeCandidates(opts, seams = {}) {
333
+ const { projectRoot, slug, worktreeDir, teamsDir } = opts;
334
+ if (!TEAM_SLUG_RE.test(slug))
335
+ return { kind: 'none' };
336
+ const parent = join(projectRoot, worktreeDir);
337
+ let entries;
338
+ try {
339
+ entries = readdirSync(parent).sort();
340
+ }
341
+ catch {
342
+ return { kind: 'none' };
343
+ }
344
+ const own = new RegExp(`^${slug}(-\\d{8})?$`);
345
+ // A1. Read once. Every catalog slug, whatever its Status, plus this one.
346
+ const claimants = [...new Set([slug, ...listTeams(projectRoot, teamsDir).map((t) => t.slug)])];
347
+ const named = [];
348
+ const unknown = [];
349
+ const untrusted = [];
350
+ const refusals = [];
351
+ for (const name of entries) {
352
+ if (!name.startsWith(`${slug}-`) || own.test(name))
353
+ continue;
354
+ const owner = claimants
355
+ .filter((c) => name === c || name.startsWith(`${c}-`))
356
+ .sort((a, b) => b.length - a.length)[0];
357
+ if (owner !== slug)
358
+ continue;
359
+ const path = join(parent, name);
360
+ // A2. `lstat`, so a symbolic link is not a directory here.
361
+ let isDir;
362
+ let gitIsFile;
363
+ try {
364
+ isDir = lstatSync(path).isDirectory();
365
+ gitIsFile = isDir && lstatSync(join(path, '.git')).isFile();
366
+ }
367
+ catch {
368
+ continue;
369
+ }
370
+ if (!isDir || !gitIsFile)
371
+ continue;
372
+ // PRD does not specify a candidate the owner or mode check refuses. Its
373
+ // files are not trusted, so it counts as no readable identity, which
374
+ // refuses and writes nothing rather than restoring beside it.
375
+ const top = topLevelRefusal(path, seams);
376
+ if (top) {
377
+ untrusted.push(untrustedLine(path, top));
378
+ continue;
379
+ }
380
+ const id = candidateIdentity(path, slug, seams);
381
+ if (id.kind === 'this')
382
+ named.push(path);
383
+ else if (id.kind === 'unknown')
384
+ unknown.push({ path, why: id.why });
385
+ else if (id.kind === 'refused')
386
+ refusals.push({ why: id.why, remedy: id.remedy });
387
+ }
388
+ const shown = safe(slug).slice(0, 80);
389
+ const head = `Could not choose a worktree for team '${shown}'. Nothing was written.`;
390
+ const again = `then run mx-agent start ${shown} again.`;
391
+ if (refusals.length > 0) {
392
+ const lines = [head];
393
+ const remedies = [];
394
+ for (const r of refusals) {
395
+ lines.push(` ${sanitizeField(r.why)}.`);
396
+ const text = r.remedy.join('\n');
397
+ if (!remedies.includes(text))
398
+ remedies.push(text);
399
+ }
400
+ for (const text of remedies)
401
+ lines.push(...text.split('\n').map((l) => ` ${l}`));
402
+ return { kind: 'refused', lines };
403
+ }
404
+ if (named.length === 1)
405
+ return { kind: 'existing', path: named[0] };
406
+ if (named.length > 1) {
407
+ return {
408
+ kind: 'refused',
409
+ lines: [
410
+ head,
411
+ ` ${named.length} worktrees name team '${shown}': ${named.map((p) => sanitizeField(p).slice(0, 300)).join(', ')}. start uses exactly one.`,
412
+ ` Remove the one this team does not use (git worktree remove), or correct its ${COORDINATION_MARKER_FILE} marker, ${again}`,
413
+ ],
414
+ };
415
+ }
416
+ if (unknown.length > 0 || untrusted.length > 0) {
417
+ const lines = [head];
418
+ if (unknown.length > 0) {
419
+ lines.push(...unknown.map((u) => ` ${sanitizeField(u.path).slice(0, 300)} starts with '${shown}-' and start cannot tell which team it belongs to: ${sanitizeField(u.why)}.`), ` If it is this team's worktree, write ${shown} as the only line of the ${COORDINATION_MARKER_FILE} file in that folder, ${again}`, ` If it belongs to another team, write that team's slug there instead. If no team uses it, remove the worktree (git worktree remove), ${again}`);
420
+ }
421
+ lines.push(...untrusted);
422
+ return { kind: 'refused', lines };
423
+ }
424
+ return { kind: 'none' };
425
+ }
148
426
  /**
149
427
  * Where `start <slug>` runs, or that it must restore, or that it must refuse.
150
428
  *
@@ -168,7 +446,14 @@ export function decideStartWorktree(opts) {
168
446
  const status = read.kind === 'ok' ? restorableStatus(read.entry) : null;
169
447
  if (read.kind === 'ok' && status?.ok === true) {
170
448
  const own = findTeamWorktree(projectRoot, slug, worktreeDir);
171
- return own ? { kind: 'existing', path: own } : { kind: 'restore', entry: read.entry };
449
+ if (own)
450
+ return { kind: 'existing', path: own };
451
+ // #1193: a worktree of this team under another name is used, or refused,
452
+ // before a restore creates a second one.
453
+ const found = classifyTeamWorktreeCandidates(opts);
454
+ if (found.kind !== 'none')
455
+ return found;
456
+ return { kind: 'restore', entry: read.entry };
172
457
  }
173
458
  const legacy = findWorktreePath(projectRoot, slug, worktreeDir);
174
459
  if (legacy)
@@ -1 +1 @@
1
- {"version":3,"file":"team-restore.js","sourceRoot":"","sources":["../../src/lib/team-restore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"team-restore.js","sourceRoot":"","sources":["../../src/lib/team-restore.ts"],"names":[],"mappings":"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"}
@@ -55,7 +55,8 @@ export declare const CHECKPOINT_RETENTION_DAYS = 14;
55
55
  /** Audit log path component. One line per run, every path including refusals. */
56
56
  export declare const AUDIT_LOG_FILENAME = "worktree-sync.jsonl";
57
57
  /**
58
- * The eleven fields the plan's Audit section names, plus `runId`, in written
58
+ * The eleven fields the plan's Audit section names, plus `runId`, plus the
59
+ * four #1159 added (`squashPr`, `via`, `backupRef`, `dropped`), in written
59
60
  * order.
60
61
  *
61
62
  * `runId` is the twelfth and it is required by the crash-durability fix (red
@@ -70,10 +71,12 @@ export declare const AUDIT_LOG_FILENAME = "worktree-sync.jsonl";
70
71
  * rather than weakened: the invariant now enforced is exactly one TERMINAL
71
72
  * record per run.
72
73
  */
73
- export declare const AUDIT_FIELDS: readonly ["runId", "timestamp", "worktree", "caller", "quiescenceAsserted", "baseRef", "headBefore", "headAfter", "checkpointRef", "syncBranch", "refsPruned", "outcome"];
74
+ export declare const AUDIT_FIELDS: readonly ["runId", "timestamp", "worktree", "caller", "quiescenceAsserted", "baseRef", "headBefore", "headAfter", "checkpointRef", "syncBranch", "squashPr", "via", "backupRef", "dropped", "refsPruned", "outcome"];
74
75
  export type AuditField = (typeof AUDIT_FIELDS)[number];
75
- /** Which arm of step 7 ran. `null` when step 7 was never reached. */
76
- export type SyncBranch = 'reset' | 'rebase-onto' | 'rebase';
76
+ /** Which arm of step 7 ran. `null` when step 7 was never reached.
77
+ * `carry-forward` is the #1159 arm: no merged pull request accounts for the
78
+ * local commits, so they are replayed onto the base from the merge base. */
79
+ export type SyncBranch = 'reset' | 'rebase-onto' | 'rebase' | 'carry-forward';
77
80
  export type SyncOutcome = 'ok'
78
81
  /** Written before step 7 begins. A record left at this value is a run that
79
82
  * died during the destructive step. */
@@ -90,10 +93,19 @@ export type SyncOutcome = 'ok'
90
93
  * (a 404 included, which is never read as "no pull request"), or the
91
94
  * response did not parse (#1131). */
92
95
  | 'refused-pr-lookup-failed'
93
- /** `origin/<base>..HEAD` is not empty and no merged pull request accounts for
94
- * it within the walk cap: unpushed work, or commits in no merged pull
95
- * request. The refusal names the commits (#1131). */
96
- | 'refused-unaccounted-commits'
96
+ /** #1159: the carry-forward replay of local commits that are in no merged
97
+ * pull request hit a merge conflict. The replay was aborted, and HEAD and
98
+ * the working tree are as they were before the sync. The backup ref holds
99
+ * HEAD. This replaces `refused-unaccounted-commits` (#1131), which is no
100
+ * longer written: those commits are now carried forward. */
101
+ | 'refused-replay-conflict'
102
+ /** #1159 lead decision: a carry-forward was refused before anything was
103
+ * written, because some local commit may belong to a merged pull request
104
+ * the lookup did not find. Either the range is longer than the walk cap,
105
+ * so commits beyond it were never looked up, or a commit to be replayed is
106
+ * on another remote-tracking branch. Replaying such a commit can re-apply
107
+ * work main has since changed or reverted. Nothing was mutated. */
108
+ | 'refused-unverified-commits'
97
109
  /** A real merge conflict during the rebase. */
98
110
  | 'conflict'
99
111
  /** The rebase failed for a reason that is NOT a merge conflict: disk full,
@@ -118,6 +130,19 @@ export interface SyncAuditRecord {
118
130
  headAfter: string | null;
119
131
  checkpointRef: string | null;
120
132
  syncBranch: SyncBranch | null;
133
+ /** The merged pull request whose squash point the run used or refused on.
134
+ * Null when no pull request was used (#1159). */
135
+ squashPr: number | null;
136
+ /** How `squashPr` was found. Null when `squashPr` is null (#1159). */
137
+ via: 'commit' | 'branch-name' | null;
138
+ /** The ref holding the pre-sync HEAD, written before a carry-forward replay
139
+ * (#1159). Null on every other path. */
140
+ backupRef: string | null;
141
+ /** Pre-sync local commits with no patch-id equivalent on HEAD after a
142
+ * carry-forward: their content was already on the base, or they were merge
143
+ * commits the replay linearised. Each is reachable from `backupRef`. Empty
144
+ * on every other path (#1159). */
145
+ dropped: string[];
121
146
  refsPruned: string[];
122
147
  outcome: SyncOutcome;
123
148
  }
@@ -304,7 +329,8 @@ export interface RestoreResult {
304
329
  export declare function restoreCheckpoint(cwd: string, restoreCommit: string | null, deps?: SyncDeps, indexCommit?: string | null, headBefore?: string | null): RestoreResult;
305
330
  export interface CheckpointRef {
306
331
  ref: string;
307
- /** Committer date, epoch SECONDS. */
332
+ /** When the ref was written, epoch SECONDS: the epoch-ms in the ref name,
333
+ * or the target commit's committer date when the name does not parse. */
308
334
  committedAt: number;
309
335
  }
310
336
  export declare function listCheckpoints(cwd: string, worktreeName: string, deps?: SyncDeps): CheckpointRef[];
@@ -407,11 +433,14 @@ export declare const GITHUB_HOST = "github.com";
407
433
  */
408
434
  export declare const SQUASH_WALK_CAP = 20;
409
435
  /**
410
- * The three ways the squash-point lookup fails. Each is a refusal, and none of
411
- * them falls back to a plain rebase: a plain rebase after a squash merge
412
- * replays the merged commits onto the squash and conflicts (#552).
436
+ * The three ways the squash-point lookup finds no squash point. The first two
437
+ * are refusals, and neither falls back to a plain rebase: a plain rebase after
438
+ * a squash merge replays the merged commits onto the squash and conflicts
439
+ * (#552). The third, `no-pull-request`, is not a refusal since #1159: the
440
+ * caller carries the local commits forward from the merge base, which replays
441
+ * no merged pull request because none accounts for them.
413
442
  */
414
- export type SquashLookupFailure = 'refused-gh-unavailable' | 'refused-pr-lookup-failed' | 'refused-unaccounted-commits';
443
+ export type SquashLookupFailure = 'refused-gh-unavailable' | 'refused-pr-lookup-failed' | 'no-pull-request';
415
444
  export type SquashPointResult = {
416
445
  ok: true;
417
446
  /** The merged pull request's last commit. `rebase --onto` replays the
@@ -427,8 +456,14 @@ export type SquashPointResult = {
427
456
  * at most an HTTP status or an exit code. */
428
457
  detail: string;
429
458
  /** The commits no merged pull request accounted for, newest first. Set
430
- * only for `refused-unaccounted-commits`. */
459
+ * only for `no-pull-request`. */
431
460
  unaccounted: string[];
461
+ /** A pull request the branch-name lookup found and then ignored, because
462
+ * its head commit is not an ancestor of HEAD (#1159). Null otherwise. */
463
+ ignoredByName: {
464
+ pr: number;
465
+ oid: string;
466
+ } | null;
432
467
  };
433
468
  /**
434
469
  * `owner/repo` from an `origin` URL, or null when the URL does not name a
@@ -513,11 +548,19 @@ export interface FindSquashPointOptions {
513
548
  * that fails the re-check in `lastCommitOfPr`: `refused-pr-lookup-failed`.
514
549
  * A 404 is never read as "no pull request".
515
550
  * - No merged pull request within the cap, by commit or by branch name:
516
- * `refused-unaccounted-commits`, naming the commits walked.
551
+ * `no-pull-request`, naming the commits walked. The caller carries them
552
+ * forward (#1159).
553
+ * - A pull request found by branch name whose head commit is not an ancestor
554
+ * of HEAD is no match (#1159). Branch names are reused, and a worktree
555
+ * branch realigned to main since that pull request merged does not contain
556
+ * its head, so it says nothing about the commits on HEAD now. It is
557
+ * reported in `ignoredByName`. The same check on the by-commit path stays a
558
+ * refusal in the caller, because there a commit on HEAD named the pull
559
+ * request.
517
560
  *
518
561
  * A "rebase and merge" pull request lands on the base under NEW SHAs, so a
519
- * lookup that finds nothing for the local SHAs refuses with
520
- * `refused-unaccounted-commits`. That refusal is the supported behaviour.
562
+ * lookup that finds nothing for the local SHAs returns `no-pull-request`, and
563
+ * the carry-forward drops those commits as already on the base.
521
564
  */
522
565
  export declare function findSquashPoint(cwd: string, options: FindSquashPointOptions, deps?: SyncDeps): SquashPointResult;
523
566
  /**
@@ -535,6 +578,65 @@ export declare function pendingGitOperation(cwd: string, deps?: SyncDeps): strin
535
578
  * is correct in a LINKED worktree, where the state lives under
536
579
  * `.git/worktrees/<name>/` and not `.git/`. */
537
580
  export declare function rebaseInProgress(cwd: string, deps?: SyncDeps): boolean;
581
+ export type CarryForwardPrep = {
582
+ ok: true;
583
+ mergeBase: string;
584
+ backupRef: string;
585
+ preCommits: string[];
586
+ } | {
587
+ ok: false;
588
+ outcome: 'error' | 'refused-invalid-checkpoint-ref' | 'refused-unverified-commits';
589
+ detail: string;
590
+ /** For `refused-unverified-commits`: each commit and the remote refs
591
+ * that hold it. Empty otherwise. */
592
+ unverified: Array<{
593
+ sha: string;
594
+ refs: string[];
595
+ }>;
596
+ };
597
+ export interface CarryForwardOptions {
598
+ /** `origin/<base>`. */
599
+ baseRef: string;
600
+ worktreeName: string;
601
+ headBefore: string | null;
602
+ /** The local branch. Its own `refs/remotes/origin/<branch>` is the one
603
+ * remote-tracking ref a carried commit may be on. */
604
+ branch: string;
605
+ /** The first-parent range was longer than `SQUASH_WALK_CAP`, so the lookup
606
+ * never asked about some commits. */
607
+ capped: boolean;
608
+ }
609
+ /**
610
+ * Everything the carry-forward needs before the in-progress record: the merge
611
+ * base, the full list of pre-sync local commits, and a ref holding HEAD.
612
+ *
613
+ * The backup ref is a SEPARATE ref, not the step-5 checkpoint. The checkpoint
614
+ * exists only on a dirty tree, and it points at a working-tree commit whose
615
+ * first parent is HEAD, not at HEAD itself. The backup is
616
+ * `refs/mx/checkpoint/<worktree>/<epoch-ms>-<rand6>-head`, in the same
617
+ * namespace so the same retention applies (step 3 reserves a slot for it).
618
+ * It is created with an empty old value, so `update-ref` refuses rather than
619
+ * overwrite an existing ref, and it is read back before anything mutates.
620
+ */
621
+ export declare function prepareCarryForward(cwd: string, options: CarryForwardOptions, deps?: SyncDeps): CarryForwardPrep;
622
+ /**
623
+ * Pre-sync local commits with no patch-id equivalent on the post-sync side,
624
+ * from `git cherry HEAD <backup> <merge-base>`. That command lists every commit
625
+ * in merge-base..backup, marking `-` when a commit with the same patch-id is in
626
+ * backup..HEAD: either on the base already, or replayed by the carry-forward.
627
+ * Everything not marked `-` is reported: a commit dropped as empty, a merge
628
+ * commit the replay linearised, or a commit whose replay changed its patch.
629
+ * The last is over-reporting, and it is the safe direction, because every
630
+ * listed commit stays reachable from the backup ref.
631
+ *
632
+ * If `git cherry` fails, every pre-sync commit is listed. Unknown is never
633
+ * reported as "nothing dropped".
634
+ */
635
+ export declare function droppedByCarryForward(cwd: string, carry: {
636
+ mergeBase: string;
637
+ backupRef: string;
638
+ preCommits: string[];
639
+ }, deps?: SyncDeps): string[];
538
640
  export interface RunSyncOptions {
539
641
  worktreePath: string;
540
642
  /** Step 0a. The caller's assertion that no teammate is active here. */