@agent-vm/agent-vm 0.0.49 → 0.0.50

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.
Files changed (126) hide show
  1. package/dist/build/gondolin-image-build-child-entrypoint.d.ts +2 -0
  2. package/dist/build/gondolin-image-build-child-entrypoint.d.ts.map +1 -0
  3. package/dist/build/gondolin-image-build-child-entrypoint.js +52 -0
  4. package/dist/build/gondolin-image-build-child-entrypoint.js.map +1 -0
  5. package/dist/build/gondolin-image-builder.d.ts +14 -0
  6. package/dist/build/gondolin-image-builder.d.ts.map +1 -1
  7. package/dist/build/gondolin-image-builder.js +152 -7
  8. package/dist/build/gondolin-image-builder.js.map +1 -1
  9. package/dist/build/managed-image-dockerfile.d.ts +11 -5
  10. package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
  11. package/dist/build/managed-image-dockerfile.js +62 -13
  12. package/dist/build/managed-image-dockerfile.js.map +1 -1
  13. package/dist/build/stale-image-cleaner.d.ts +6 -0
  14. package/dist/build/stale-image-cleaner.d.ts.map +1 -1
  15. package/dist/build/stale-image-cleaner.js +32 -0
  16. package/dist/build/stale-image-cleaner.js.map +1 -1
  17. package/dist/build/zig-compatibility.d.ts +32 -0
  18. package/dist/build/zig-compatibility.d.ts.map +1 -0
  19. package/dist/build/zig-compatibility.js +148 -0
  20. package/dist/build/zig-compatibility.js.map +1 -0
  21. package/dist/cli/auth-interactive-command.d.ts +1 -1
  22. package/dist/cli/auth-interactive-command.d.ts.map +1 -1
  23. package/dist/cli/auth-interactive-command.js +12 -3
  24. package/dist/cli/auth-interactive-command.js.map +1 -1
  25. package/dist/cli/build-command.d.ts +10 -3
  26. package/dist/cli/build-command.d.ts.map +1 -1
  27. package/dist/cli/build-command.js +121 -36
  28. package/dist/cli/build-command.js.map +1 -1
  29. package/dist/cli/cache-commands.d.ts +1 -5
  30. package/dist/cli/cache-commands.d.ts.map +1 -1
  31. package/dist/cli/cache-commands.js.map +1 -1
  32. package/dist/cli/commands/command-definition-support.d.ts +1 -4
  33. package/dist/cli/commands/command-definition-support.d.ts.map +1 -1
  34. package/dist/cli/commands/command-definition-support.js +4 -10
  35. package/dist/cli/commands/command-definition-support.js.map +1 -1
  36. package/dist/cli/commands/controller-definition.d.ts +2 -4
  37. package/dist/cli/commands/controller-definition.d.ts.map +1 -1
  38. package/dist/cli/commands/controller-definition.js +4 -6
  39. package/dist/cli/commands/controller-definition.js.map +1 -1
  40. package/dist/cli/commands/create-app.d.ts +2 -4
  41. package/dist/cli/commands/create-app.d.ts.map +1 -1
  42. package/dist/cli/init-command.d.ts.map +1 -1
  43. package/dist/cli/init-command.js +29 -6
  44. package/dist/cli/init-command.js.map +1 -1
  45. package/dist/cli/manual-templates.d.ts.map +1 -1
  46. package/dist/cli/manual-templates.js +5 -0
  47. package/dist/cli/manual-templates.js.map +1 -1
  48. package/dist/cli/ssh-commands.d.ts +6 -0
  49. package/dist/cli/ssh-commands.d.ts.map +1 -1
  50. package/dist/cli/ssh-commands.js +44 -22
  51. package/dist/cli/ssh-commands.js.map +1 -1
  52. package/dist/cli/vm-host-system-templates.d.ts.map +1 -1
  53. package/dist/cli/vm-host-system-templates.js +0 -6
  54. package/dist/cli/vm-host-system-templates.js.map +1 -1
  55. package/dist/config/system-cache-identifier.d.ts +5 -2
  56. package/dist/config/system-cache-identifier.d.ts.map +1 -1
  57. package/dist/config/system-cache-identifier.js +33 -3
  58. package/dist/config/system-cache-identifier.js.map +1 -1
  59. package/dist/config/system-config.d.ts +24 -0
  60. package/dist/config/system-config.d.ts.map +1 -1
  61. package/dist/config/system-config.js +22 -0
  62. package/dist/config/system-config.js.map +1 -1
  63. package/dist/controller/controller-runtime-operations.d.ts +9 -2
  64. package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
  65. package/dist/controller/controller-runtime-operations.js +75 -6
  66. package/dist/controller/controller-runtime-operations.js.map +1 -1
  67. package/dist/controller/controller-runtime.d.ts.map +1 -1
  68. package/dist/controller/controller-runtime.js +1 -0
  69. package/dist/controller/controller-runtime.js.map +1 -1
  70. package/dist/controller/git-pull-default-operations.d.ts +1 -0
  71. package/dist/controller/git-pull-default-operations.d.ts.map +1 -1
  72. package/dist/controller/git-pull-default-operations.js +100 -43
  73. package/dist/controller/git-pull-default-operations.js.map +1 -1
  74. package/dist/controller/git-push-operations.d.ts +1 -0
  75. package/dist/controller/git-push-operations.d.ts.map +1 -1
  76. package/dist/controller/git-push-operations.js +50 -32
  77. package/dist/controller/git-push-operations.js.map +1 -1
  78. package/dist/controller/git-retry-support.d.ts +3 -2
  79. package/dist/controller/git-retry-support.d.ts.map +1 -1
  80. package/dist/controller/git-retry-support.js +16 -8
  81. package/dist/controller/git-retry-support.js.map +1 -1
  82. package/dist/controller/heartbeat-sender.d.ts.map +1 -1
  83. package/dist/controller/heartbeat-sender.js +6 -0
  84. package/dist/controller/heartbeat-sender.js.map +1 -1
  85. package/dist/controller/host-git-command.d.ts +6 -0
  86. package/dist/controller/host-git-command.d.ts.map +1 -0
  87. package/dist/controller/host-git-command.js +13 -0
  88. package/dist/controller/host-git-command.js.map +1 -0
  89. package/dist/controller/http/controller-client.d.ts +9 -2
  90. package/dist/controller/http/controller-client.d.ts.map +1 -1
  91. package/dist/controller/http/controller-client.js +13 -3
  92. package/dist/controller/http/controller-client.js.map +1 -1
  93. package/dist/controller/http/controller-http-route-support.d.ts +9 -2
  94. package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
  95. package/dist/controller/http/controller-http-route-support.js.map +1 -1
  96. package/dist/controller/http/controller-request-schemas.d.ts +9 -1
  97. package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
  98. package/dist/controller/http/controller-request-schemas.js +11 -2
  99. package/dist/controller/http/controller-request-schemas.js.map +1 -1
  100. package/dist/controller/http/controller-zone-operation-routes.d.ts.map +1 -1
  101. package/dist/controller/http/controller-zone-operation-routes.js +101 -24
  102. package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
  103. package/dist/controller/worker-task-runner.d.ts.map +1 -1
  104. package/dist/controller/worker-task-runner.js +42 -19
  105. package/dist/controller/worker-task-runner.js.map +1 -1
  106. package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts +10 -0
  107. package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts.map +1 -1
  108. package/dist/controller/zone-runtimes/zone-runtime-errors.js +14 -0
  109. package/dist/controller/zone-runtimes/zone-runtime-errors.js.map +1 -1
  110. package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
  111. package/dist/gateway/gateway-zone-support.js +1 -0
  112. package/dist/gateway/gateway-zone-support.js.map +1 -1
  113. package/dist/operations/doctor.d.ts +0 -3
  114. package/dist/operations/doctor.d.ts.map +1 -1
  115. package/dist/operations/doctor.js +8 -35
  116. package/dist/operations/doctor.js.map +1 -1
  117. package/dist/resources/repo-resource-contract-loader.d.ts +1 -1
  118. package/dist/resources/repo-resource-contract-loader.d.ts.map +1 -1
  119. package/dist/resources/repo-resource-contract-loader.js +2 -6
  120. package/dist/resources/repo-resource-contract-loader.js.map +1 -1
  121. package/dist/resources/repo-resource-provider-runner.d.ts +3 -1
  122. package/dist/resources/repo-resource-provider-runner.d.ts.map +1 -1
  123. package/dist/resources/repo-resource-provider-runner.js +24 -10
  124. package/dist/resources/repo-resource-provider-runner.js.map +1 -1
  125. package/managed-images.json +19 -0
  126. package/package.json +10 -9
@@ -1,6 +1,7 @@
1
1
  import { execa } from 'execa';
2
2
  import { scrubGithubTokenFromOutput } from './git-auth-support.js';
3
3
  import { runGitCommandWithTransientRetries } from './git-retry-support.js';
4
+ import { buildHostGitArgs } from './host-git-command.js';
4
5
  const GIT_OPERATION_TIMEOUT_MS = 120_000;
5
6
  const GIT_PULL_RETRY_AFTER_SECONDS = 300;
6
7
  const GIT_PULL_RETRY_AFTER_MESSAGE = 'GitHub or the network is still rejecting the pull after retries. Try git-pull-default again in 5 minutes; the controller retains task state while the task remains registered.';
@@ -37,18 +38,19 @@ function errorMessage(error) {
37
38
  return scrubGithubTokenFromOutput(error instanceof Error ? error.message : String(error));
38
39
  }
39
40
  async function git(options) {
40
- const result = await execa('git', ['-c', 'core.hooksPath=/dev/null', `--git-dir=${options.gitDir}`, ...options.args], {
41
+ const result = await execa('git', buildHostGitArgs({ args: options.args, gitDir: options.gitDir }), {
42
+ ...(options.signal ? { cancelSignal: options.signal } : {}),
41
43
  env: { LANG: 'C', LC_ALL: 'C' },
42
44
  reject: false,
43
45
  timeout: GIT_OPERATION_TIMEOUT_MS,
44
46
  });
45
- if (typeof result.exitCode !== 'number') {
46
- throw new GitCommandFailureError(`git ${options.args.join(' ')} terminated without an exit code\n${result.stdout}\n${result.stderr}`.trim());
47
- }
47
+ const terminatedWithoutExitCode = typeof result.exitCode !== 'number';
48
48
  const normalized = {
49
49
  stdout: result.stdout,
50
- stderr: result.stderr,
51
- exitCode: result.exitCode,
50
+ stderr: terminatedWithoutExitCode
51
+ ? `${result.stderr}\ngit ${options.args.join(' ')} terminated without an exit code`.trim()
52
+ : result.stderr,
53
+ exitCode: typeof result.exitCode === 'number' ? result.exitCode : 128,
52
54
  };
53
55
  if (options.reject === true && normalized.exitCode !== 0) {
54
56
  throw new GitCommandFailureError(formatGitCommandFailure(options.args, normalized));
@@ -58,15 +60,15 @@ async function git(options) {
58
60
  function formatGitCommandFailure(args, result) {
59
61
  return scrubGithubTokenFromOutput(`git ${args.join(' ')} failed\n${result.stdout}\n${result.stderr}`.trim());
60
62
  }
61
- async function sleep(delayMs) {
62
- await new Promise((resolve) => {
63
- setTimeout(resolve, delayMs);
64
- });
65
- }
66
63
  async function gitWithTransientRetries(options) {
67
64
  const retryResult = await runGitCommandWithTransientRetries({
68
- run: async () => await git({ args: options.args, gitDir: options.gitDir, reject: false }),
69
- sleep,
65
+ run: async (signal) => await git({
66
+ args: options.args,
67
+ gitDir: options.gitDir,
68
+ reject: false,
69
+ ...(signal ? { signal } : {}),
70
+ }),
71
+ ...(options.signal ? { signal: options.signal } : {}),
70
72
  });
71
73
  if (retryResult.result.exitCode !== 0) {
72
74
  throw new GitCommandFailureError(formatGitCommandFailure(options.args, retryResult.result));
@@ -77,18 +79,20 @@ async function updateRefAndVerify(options) {
77
79
  await gitWithTransientRetries({
78
80
  gitDir: options.gitDir,
79
81
  args: ['update-ref', options.ref, options.sourceRef],
82
+ ...(options.signal ? { signal: options.signal } : {}),
80
83
  });
81
84
  const actualHead = (await git({
82
85
  gitDir: options.gitDir,
83
86
  args: ['rev-parse', options.ref],
84
87
  reject: true,
88
+ ...(options.signal ? { signal: options.signal } : {}),
85
89
  })).stdout.trim();
86
90
  if (actualHead !== options.expectedHead) {
87
91
  throw new GitCommandFailureError(`git update-ref ${options.ref} ${options.expectedHead} did not move the ref; ${options.ref} is at ${actualHead}`);
88
92
  }
89
93
  }
90
- async function gitStdout(gitDir, args) {
91
- return (await gitWithTransientRetries({ args, gitDir })).stdout.trim();
94
+ async function gitStdout(gitDir, args, signal) {
95
+ return (await gitWithTransientRetries({ args, gitDir, ...(signal ? { signal } : {}) })).stdout.trim();
92
96
  }
93
97
  function parseCommitSummaries(output) {
94
98
  if (output.trim().length === 0)
@@ -111,16 +115,17 @@ function parseCommitSummaries(output) {
111
115
  return summary;
112
116
  });
113
117
  }
114
- async function commitSummaries(gitDir, range) {
118
+ async function commitSummaries(gitDir, range, signal) {
115
119
  const result = await gitWithTransientRetries({
116
120
  gitDir,
117
121
  args: ['log', range, '--format=%H%x09%s%x09%an%x09%aI'],
122
+ ...(signal ? { signal } : {}),
118
123
  });
119
124
  return parseCommitSummaries(result.stdout);
120
125
  }
121
- async function refExists(gitDir, ref) {
126
+ async function refExists(gitDir, ref, signal) {
122
127
  const args = ['rev-parse', '--verify', '--quiet', ref];
123
- const result = await git({ gitDir, args, reject: false });
128
+ const result = await git({ gitDir, args, reject: false, ...(signal ? { signal } : {}) });
124
129
  if (result.exitCode === 0)
125
130
  return true;
126
131
  if (result.exitCode === 1)
@@ -129,17 +134,23 @@ async function refExists(gitDir, ref) {
129
134
  }
130
135
  async function isAncestor(options) {
131
136
  const args = ['merge-base', '--is-ancestor', options.ancestorRef, options.descendantRef];
132
- const result = await git({ gitDir: options.gitDir, args, reject: false });
137
+ const result = await git({
138
+ gitDir: options.gitDir,
139
+ args,
140
+ reject: false,
141
+ ...(options.signal ? { signal: options.signal } : {}),
142
+ });
133
143
  if (result.exitCode === 0)
134
144
  return true;
135
145
  if (result.exitCode === 1)
136
146
  return false;
137
147
  throw new GitCommandFailureError(formatGitCommandFailure(args, result));
138
148
  }
139
- async function countRange(gitDir, range) {
149
+ async function countRange(gitDir, range, signal) {
140
150
  const result = await gitWithTransientRetries({
141
151
  gitDir,
142
152
  args: ['rev-list', '--count', range],
153
+ ...(signal ? { signal } : {}),
143
154
  });
144
155
  const parsed = Number.parseInt(result.stdout.trim(), 10);
145
156
  if (Number.isNaN(parsed)) {
@@ -153,6 +164,7 @@ async function fetchCurrentBranch(options) {
153
164
  const upstreamProbe = await gitWithTransientRetries({
154
165
  gitDir: options.gitDir,
155
166
  args: upstreamProbeArgs,
167
+ ...(options.signal ? { signal: options.signal } : {}),
156
168
  });
157
169
  if (upstreamProbe.stdout.trim().length === 0) {
158
170
  return 'no-upstream';
@@ -164,7 +176,11 @@ async function fetchCurrentBranch(options) {
164
176
  authenticatedUrl,
165
177
  `refs/heads/${options.branch}:${remoteRef}`,
166
178
  ];
167
- await gitWithTransientRetries({ gitDir: options.gitDir, args: fetchArgs });
179
+ await gitWithTransientRetries({
180
+ gitDir: options.gitDir,
181
+ args: fetchArgs,
182
+ ...(options.signal ? { signal: options.signal } : {}),
183
+ });
168
184
  return 'fetched';
169
185
  }
170
186
  function describeCurrentBranchSync(sync) {
@@ -210,10 +226,22 @@ async function recordControllerGitPullEvent(options) {
210
226
  process.stderr.write(`[git-pull-default] Failed to record ${options.event.event}: ${errorMessage(error)}\n`);
211
227
  }
212
228
  }
229
+ async function recordControllerGitPullRefused(options) {
230
+ await recordControllerGitPullEvent({
231
+ recordEvent: options.recordEvent,
232
+ event: {
233
+ event: 'controller-git-pull-failed',
234
+ repoUrl: options.repoUrl,
235
+ attempts: 0,
236
+ message: options.message,
237
+ },
238
+ });
239
+ }
213
240
  async function buildCurrentBranchSyncResult(options) {
214
241
  const branch = options.pullRequest.currentBranch;
215
242
  if (!branch) {
216
- const detachedHead = options.pullRequest.currentHead ?? (await gitStdout(options.gitDir, ['rev-parse', 'HEAD']));
243
+ const detachedHead = options.pullRequest.currentHead ??
244
+ (await gitStdout(options.gitDir, ['rev-parse', 'HEAD'], options.signal));
217
245
  return {
218
246
  branch: null,
219
247
  upstreamTrackingRef: null,
@@ -226,8 +254,9 @@ async function buildCurrentBranchSyncResult(options) {
226
254
  const remoteRef = `refs/remotes/origin/${branch}`;
227
255
  const upstreamTrackingRef = `origin/${branch}`;
228
256
  if (branch === options.defaultBranch) {
229
- const localHead = options.pullRequest.currentHead ?? (await gitStdout(options.gitDir, ['rev-parse', localRef]));
230
- const remoteHead = await gitStdout(options.gitDir, ['rev-parse', remoteRef]);
257
+ const localHead = options.pullRequest.currentHead ??
258
+ (await gitStdout(options.gitDir, ['rev-parse', localRef], options.signal));
259
+ const remoteHead = await gitStdout(options.gitDir, ['rev-parse', remoteRef], options.signal);
231
260
  return {
232
261
  branch,
233
262
  upstreamTrackingRef,
@@ -244,6 +273,7 @@ async function buildCurrentBranchSyncResult(options) {
244
273
  gitDir: options.gitDir,
245
274
  githubToken: options.githubToken,
246
275
  repoUrl: options.repoUrl,
276
+ ...(options.signal ? { signal: options.signal } : {}),
247
277
  });
248
278
  if (fetchStatus === 'no-upstream') {
249
279
  return {
@@ -254,8 +284,9 @@ async function buildCurrentBranchSyncResult(options) {
254
284
  reason: `Current branch '${branch}' has no upstream tracking ref on origin.`,
255
285
  };
256
286
  }
257
- const localHead = options.pullRequest.currentHead ?? (await gitStdout(options.gitDir, ['rev-parse', localRef]));
258
- const remoteHead = await gitStdout(options.gitDir, ['rev-parse', remoteRef]);
287
+ const localHead = options.pullRequest.currentHead ??
288
+ (await gitStdout(options.gitDir, ['rev-parse', localRef], options.signal));
289
+ const remoteHead = await gitStdout(options.gitDir, ['rev-parse', remoteRef], options.signal);
259
290
  if (localHead === remoteHead) {
260
291
  return {
261
292
  branch,
@@ -269,6 +300,7 @@ async function buildCurrentBranchSyncResult(options) {
269
300
  gitDir: options.gitDir,
270
301
  ancestorRef: localRef,
271
302
  descendantRef: remoteRef,
303
+ ...(options.signal ? { signal: options.signal } : {}),
272
304
  });
273
305
  if (localAncestorOfRemote) {
274
306
  if (options.pullRequest.worktreeDirty === true) {
@@ -286,6 +318,7 @@ async function buildCurrentBranchSyncResult(options) {
286
318
  ref: localRef,
287
319
  sourceRef: remoteRef,
288
320
  expectedHead: remoteHead,
321
+ ...(options.signal ? { signal: options.signal } : {}),
289
322
  });
290
323
  return {
291
324
  branch,
@@ -299,6 +332,7 @@ async function buildCurrentBranchSyncResult(options) {
299
332
  gitDir: options.gitDir,
300
333
  ancestorRef: remoteRef,
301
334
  descendantRef: localRef,
335
+ ...(options.signal ? { signal: options.signal } : {}),
302
336
  });
303
337
  if (remoteAncestorOfLocal) {
304
338
  return {
@@ -328,8 +362,8 @@ export async function pullDefaultForTask(options) {
328
362
  const defaultBranch = repo.baseBranch;
329
363
  const defaultRef = `refs/heads/${defaultBranch}`;
330
364
  const remoteDefaultRef = `refs/remotes/origin/${defaultBranch}`;
331
- const previousRemoteDefaultHead = (await refExists(repo.hostGitDir, remoteDefaultRef))
332
- ? await gitStdout(repo.hostGitDir, ['rev-parse', remoteDefaultRef])
365
+ const previousRemoteDefaultHead = (await refExists(repo.hostGitDir, remoteDefaultRef, options.signal))
366
+ ? await gitStdout(repo.hostGitDir, ['rev-parse', remoteDefaultRef], options.signal)
333
367
  : null;
334
368
  await recordControllerGitPullEvent({
335
369
  recordEvent: options.recordEvent,
@@ -345,7 +379,12 @@ export async function pullDefaultForTask(options) {
345
379
  `${defaultBranch}:${remoteDefaultRef}`,
346
380
  ];
347
381
  const fetchRetryResult = await runGitCommandWithTransientRetries({
348
- run: async () => await git({ gitDir: repo.hostGitDir, args: fetchArgs, reject: false }),
382
+ run: async (signal) => await git({
383
+ gitDir: repo.hostGitDir,
384
+ args: fetchArgs,
385
+ reject: false,
386
+ ...(signal ? { signal } : {}),
387
+ }),
349
388
  onRetry: async ({ attempt, delayMs, result }) => {
350
389
  const detail = scrubGithubTokenFromOutput(`${result.stdout}\n${result.stderr}`).trim();
351
390
  await recordControllerGitPullEvent({
@@ -359,7 +398,7 @@ export async function pullDefaultForTask(options) {
359
398
  },
360
399
  });
361
400
  },
362
- sleep,
401
+ ...(options.signal ? { signal: options.signal } : {}),
363
402
  });
364
403
  if (fetchRetryResult.result.exitCode !== 0) {
365
404
  const detail = scrubGithubTokenFromOutput(`${fetchRetryResult.result.stdout}\n${fetchRetryResult.result.stderr}`).trim();
@@ -368,12 +407,17 @@ export async function pullDefaultForTask(options) {
368
407
  : `Fetch failed\n${detail}`;
369
408
  throw new GitPullFailedAfterRetriesError(message, fetchRetryResult.attempts);
370
409
  }
371
- const remoteDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', remoteDefaultRef]);
410
+ const remoteDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', remoteDefaultRef], options.signal);
372
411
  const fetchedCommits = previousRemoteDefaultHead
373
- ? await commitSummaries(repo.hostGitDir, `${previousRemoteDefaultHead}..${remoteDefaultRef}`)
412
+ ? await commitSummaries(repo.hostGitDir, `${previousRemoteDefaultHead}..${remoteDefaultRef}`, options.signal)
374
413
  : [];
375
- if (!(await refExists(repo.hostGitDir, defaultRef))) {
414
+ if (!(await refExists(repo.hostGitDir, defaultRef, options.signal))) {
376
415
  const message = `Local default branch ref '${defaultRef}' is missing; controller refused to create it during git-pull-default. Recreate the task or inspect the host gitdir.`;
416
+ await recordControllerGitPullRefused({
417
+ recordEvent: options.recordEvent,
418
+ repoUrl: options.repoUrl,
419
+ message,
420
+ });
377
421
  return {
378
422
  kind: 'refused-not-fast-forward',
379
423
  repoUrl: options.repoUrl,
@@ -389,9 +433,15 @@ export async function pullDefaultForTask(options) {
389
433
  gitDir: repo.hostGitDir,
390
434
  ancestorRef: defaultRef,
391
435
  descendantRef: remoteDefaultRef,
436
+ ...(options.signal ? { signal: options.signal } : {}),
392
437
  });
393
438
  if (!fastForwardCheck) {
394
439
  const message = `Local ${defaultBranch} cannot be fast-forwarded to origin/${defaultBranch}; inspect it manually.`;
440
+ await recordControllerGitPullRefused({
441
+ recordEvent: options.recordEvent,
442
+ repoUrl: options.repoUrl,
443
+ message,
444
+ });
395
445
  return {
396
446
  kind: 'refused-not-fast-forward',
397
447
  repoUrl: options.repoUrl,
@@ -403,11 +453,16 @@ export async function pullDefaultForTask(options) {
403
453
  };
404
454
  }
405
455
  }
406
- const previousLocalDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', defaultRef]);
456
+ const previousLocalDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', defaultRef], options.signal);
407
457
  if (options.currentBranch === defaultBranch &&
408
458
  options.worktreeDirty === true &&
409
459
  previousLocalDefaultHead !== remoteDefaultHead) {
410
460
  const message = `Current branch '${defaultBranch}' is the default branch and can fast-forward to origin/${defaultBranch}, but the worker worktree has uncommitted changes. Commit or stash before calling git-pull-default.`;
461
+ await recordControllerGitPullRefused({
462
+ recordEvent: options.recordEvent,
463
+ repoUrl: options.repoUrl,
464
+ message,
465
+ });
411
466
  return {
412
467
  kind: 'refused-not-fast-forward',
413
468
  repoUrl: options.repoUrl,
@@ -423,8 +478,9 @@ export async function pullDefaultForTask(options) {
423
478
  ref: defaultRef,
424
479
  sourceRef: remoteDefaultRef,
425
480
  expectedHead: remoteDefaultHead,
481
+ ...(options.signal ? { signal: options.signal } : {}),
426
482
  });
427
- const localDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', defaultRef]);
483
+ const localDefaultHead = await gitStdout(repo.hostGitDir, ['rev-parse', defaultRef], options.signal);
428
484
  const shouldSyncCurrentBranch = options.currentBranch !== undefined ||
429
485
  options.currentHead !== undefined ||
430
486
  options.worktreeDirty !== undefined;
@@ -435,15 +491,16 @@ export async function pullDefaultForTask(options) {
435
491
  githubToken: options.githubToken,
436
492
  pullRequest: options,
437
493
  repoUrl: options.repoUrl,
494
+ ...(options.signal ? { signal: options.signal } : {}),
438
495
  })
439
496
  : undefined;
440
497
  const currentHeadRef = options.currentHead ?? 'HEAD';
441
- const forkPoint = await gitStdout(repo.hostGitDir, [
442
- 'merge-base',
443
- currentHeadRef,
444
- remoteDefaultRef,
445
- ]);
446
- const commitsSinceForkPoint = await commitSummaries(repo.hostGitDir, `${forkPoint}..${remoteDefaultRef}`);
498
+ const effectiveCurrentHeadRef = currentBranchSync?.status === 'fast-forwarded' ||
499
+ currentBranchSync?.status === 'default-branch'
500
+ ? currentBranchSync.remoteHead
501
+ : currentHeadRef;
502
+ const forkPoint = await gitStdout(repo.hostGitDir, ['merge-base', effectiveCurrentHeadRef, remoteDefaultRef], options.signal);
503
+ const commitsSinceForkPoint = await commitSummaries(repo.hostGitDir, `${forkPoint}..${remoteDefaultRef}`, options.signal);
447
504
  const message = buildAdvancedPullMessage({
448
505
  currentBranchSync,
449
506
  defaultBranch,
@@ -463,8 +520,8 @@ export async function pullDefaultForTask(options) {
463
520
  fetchedCommits,
464
521
  commitsSinceForkPoint,
465
522
  divergence: {
466
- aheadOfDefault: await countRange(repo.hostGitDir, `${remoteDefaultRef}..${currentHeadRef}`),
467
- behindDefault: await countRange(repo.hostGitDir, `${currentHeadRef}..${remoteDefaultRef}`),
523
+ aheadOfDefault: await countRange(repo.hostGitDir, `${remoteDefaultRef}..${effectiveCurrentHeadRef}`, options.signal),
524
+ behindDefault: await countRange(repo.hostGitDir, `${effectiveCurrentHeadRef}..${remoteDefaultRef}`, options.signal),
468
525
  forkPoint,
469
526
  },
470
527
  };
@@ -1 +1 @@
1
- {"version":3,"file":"git-pull-default-operations.js","sourceRoot":"","sources":["../../src/controller/git-pull-default-operations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-pull-default-operations.js","sourceRoot":"","sources":["../../src/controller/git-pull-default-operations.ts"],"names":[],"mappings":"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"}
@@ -34,6 +34,7 @@ export declare function pushBranchesForTask(options: {
34
34
  readonly branches: readonly PushBranchRequest[];
35
35
  readonly githubToken: string;
36
36
  readonly recordEvent?: (event: TaskEvent) => Promise<void>;
37
+ readonly signal?: AbortSignal;
37
38
  }): Promise<{
38
39
  readonly results: readonly PushBranchResult[];
39
40
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"git-push-operations.d.ts","sourceRoot":"","sources":["../../src/controller/git-push-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AASlE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACzD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1F;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAwXzD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IAClD,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,CAAC,CAgD7D"}
1
+ {"version":3,"file":"git-push-operations.d.ts","sourceRoot":"","sources":["../../src/controller/git-push-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA0B,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGnF,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,2BAA2B,CAAC;AAU9E,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACzD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1F;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AA4azD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IAClD,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC9B,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,CAAC,CAiD7D"}