@fitlab-ai/agent-infra 0.9.8 → 0.9.10

package/lib/platform/pull-requests.ts

@@ -19,14 +19,16 @@ import { planPullRequestMetadata } from './pull-request-metadata.ts';
 import { platformResult } from './types.ts';
 import type { PlatformOperation, PlatformResult } from './types.ts';
 import { inspectCompletionArtifacts } from '../task/finalization-artifacts.ts';
-import { inspectCreatePrCommitGate } from '../task/commit-finalization.ts';
 import { TaskExecutionLockError, withTaskExecutionLock } from '../task/task-execution-lock.ts';
+import { mergeOperationWarnings, type OperationWarning } from '../task/operation-outcome.ts';
 
 type PullRequestSnapshot = PlatformChangeRequestSnapshot;
 
 type PullRequestResult = PlatformResult & {
   task: { id: string | null; issueNumber: number | null; prNumber: number | null };
   pullRequest: PullRequestSnapshot | null;
+  result: 'pr_created' | 'pr_reused' | 'no_op' | 'pr_created_with_warnings' | 'pr_reused_with_warnings' | 'no_op_with_warnings' | 'failed' | 'blocked' | null;
+  warnings: readonly OperationWarning[];
 };
 type InspectionOptions = { cwd?: string; client?: unknown };
 type SharedOptions = { cwd?: string; client?: GitHubClient };
@@ -40,7 +42,8 @@ type CreateOptions = SharedOptions & {
   dryRun?: boolean;
 };
 type BindOptions = SharedOptions & { agent: string; pr: number; dryRun?: boolean };
-type SyncOptions = SharedOptions & { agent: string; metadata?: boolean; closingIssue?: boolean; dryRun?: boolean };
+type PullRequestPrimaryResult = 'pr_created' | 'pr_reused' | 'no_op';
+type SyncOptions = SharedOptions & { agent: string; metadata?: boolean; closingIssue?: boolean; dryRun?: boolean; primaryResult: PullRequestPrimaryResult };
 type ResolveExternalOptions = SharedOptions & { agent: string; pr?: number; dryRun?: boolean };
 type ExternalPullRequestSelection =
   | { status: 'normal'; candidates: PullRequestSnapshot[]; eligible: [] }
@@ -102,6 +105,12 @@ type ClosingPullRequestPage = {
   } } } };
 };
 
+function warningResultForPrimary(primaryResult: PullRequestPrimaryResult): NonNullable<PullRequestResult['result']> {
+  if (primaryResult === 'pr_created') return 'pr_created_with_warnings';
+  if (primaryResult === 'pr_reused') return 'pr_reused_with_warnings';
+  return 'no_op_with_warnings';
+}
+
 function result(
   status: PlatformResult['status'],
   taskId: string | null,
@@ -109,12 +118,15 @@ function result(
   prNumber: number | null,
   overrides: Partial<PullRequestResult> = {}
 ): PullRequestResult {
-  return {
+  const output = {
     ...platformResult(status),
     task: { id: taskId, issueNumber, prNumber },
     pullRequest: null,
+    result: null,
+    warnings: [],
     ...overrides
   };
+  return { ...output, warnings: mergeOperationWarnings(output.warnings) };
 }
 
 function externalResult(
@@ -311,9 +323,9 @@ function expectedHead(repository: string, head: string): { repository: string; r
   return { repository: `${head.slice(0, colon)}/${repoName}`, ref: head.slice(colon + 1) };
 }
 
-function selectPullRequest(remotes: RemotePullRequest[], repository: string, head: string, base: string):
+function selectPullRequest(remotes: RemotePullRequest[], repository: string, head: string, base: string, expectedSha?: string):
   | { status: 'resolved'; pullRequest: PullRequestSnapshot }
-  | { status: 'missing' | 'ambiguous'; pullRequest: null } {
+  | { status: 'missing' | 'ambiguous' | 'head-mismatch'; pullRequest: null } {
   const wanted = expectedHead(repository, head);
   const matches = remotes.flatMap((remote) => {
     const normalized = normalizePullRequest(remote, repository);
@@ -321,10 +333,94 @@ function selectPullRequest(remotes: RemotePullRequest[], repository: string, hea
       normalized.head.ref === wanted.ref && normalized.base.repository === repository && normalized.base.ref === base
       ? [normalized] : [];
   });
+  if (expectedSha && matches.some((match) => match.head.sha !== expectedSha)) {
+    return { status: 'head-mismatch', pullRequest: null };
+  }
   if (matches.length === 1) return { status: 'resolved', pullRequest: matches[0]! };
   return { status: matches.length === 0 ? 'missing' : 'ambiguous', pullRequest: null };
 }
 
+function repositoryHead(cwd: string): string {
+  return execFileSync('git', ['rev-parse', 'HEAD'], {
+    cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe']
+  }).trim();
+}
+
+function remoteBranchHead(cwd: string, repository: string, head: string):
+  | { ok: true; value: string }
+  | { ok: false; error: { code: string; message: string; retryable: boolean } } {
+  const wanted = expectedHead(repository, head);
+  if (!wanted.ref || !/^[A-Za-z0-9._/-]+$/.test(wanted.ref)) return {
+    ok: false,
+    error: { code: 'PR_HEAD_INVALID', message: 'Pull request head ref is invalid', retryable: false }
+  };
+  const remotes = configuredGitRemotes(cwd);
+  const remote = remotes.find((item) => repositoryKey(item.repository) === repositoryKey(wanted.repository))
+    ?? remotes.find((item) => item.name === 'origin');
+  if (!remote) return {
+    ok: false,
+    error: { code: 'PR_REMOTE_BRANCH_MISSING', message: `No configured remote can verify ${wanted.repository}:${wanted.ref}`, retryable: false }
+  };
+  try {
+    const output = execFileSync('git', ['ls-remote', '--refs', remote.name, `refs/heads/${wanted.ref}`], {
+      cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe']
+    }).trim();
+    const match = output.split(/\r?\n/).map((line) => line.trim()).find((line) => line.endsWith(`refs/heads/${wanted.ref}`));
+    const sha = match?.split(/\s+/)[0] || null;
+    if (!sha || !/^[a-f0-9]{40}$/i.test(sha)) return {
+      ok: false,
+      error: { code: 'PR_REMOTE_BRANCH_MISSING', message: `Remote branch ${wanted.repository}:${wanted.ref} does not exist`, retryable: false }
+    };
+    return { ok: true, value: sha };
+  } catch (error) {
+    return {
+      ok: false,
+      error: { code: 'PR_REMOTE_BRANCH_UNAVAILABLE', message: error instanceof Error ? error.message : String(error), retryable: true }
+    };
+  }
+}
+
+function verifyCreateHead(base: ReturnType<typeof resolvedContext> & { ok: true }, head: string) {
+  let localHead: string;
+  try {
+    localHead = repositoryHead(base.resolved.repoRoot);
+  } catch (error) {
+    return { ok: false as const, error: { code: 'PR_LOCAL_HEAD_UNAVAILABLE', message: error instanceof Error ? error.message : String(error), retryable: false } };
+  }
+  const remote = remoteBranchHead(base.resolved.repoRoot, base.context.platform.repository!, head);
+  if (!remote.ok) return remote;
+  if (remote.value !== localHead) return {
+    ok: false as const,
+    error: { code: 'PR_REMOTE_HEAD_MISMATCH', message: `Remote head ${remote.value} does not match local HEAD ${localHead}`, retryable: false }
+  };
+  return { ok: true as const, value: localHead };
+}
+
+function validateBoundPullRequest(
+  base: ReturnType<typeof resolvedContext> & { ok: true },
+  pullRequest: PullRequestSnapshot | null,
+  head: string,
+  baseRef: string,
+  expectedSha: string
+): { ok: true } | { ok: false; error: { code: string; message: string; retryable: boolean } } {
+  if (!pullRequest) return {
+    ok: false,
+    error: { code: 'PR_BIND_RECHECK_FAILED', message: 'Bound pull request identity is unavailable', retryable: false }
+  };
+  const wanted = expectedHead(base.context.platform.repository!, head);
+  if (
+    pullRequest.head.repository !== wanted.repository
+    || pullRequest.head.ref !== wanted.ref
+    || pullRequest.head.sha !== expectedSha
+    || pullRequest.base.repository !== base.context.platform.repository
+    || pullRequest.base.ref !== baseRef
+  ) return {
+    ok: false,
+    error: { code: 'PR_BIND_IDENTITY_MISMATCH', message: 'Bound pull request identity does not match the current expected head/base', retryable: false }
+  };
+  return { ok: true };
+}
+
 function resolvedContext(taskRef: string, options: InspectionOptions) {
   const resolved = resolveTaskRef(taskRef, options.cwd ? { repoRoot: options.cwd } : {});
   if (!resolved.ok) return { ok: false as const, output: result('failed', resolved.taskId, null, null, {
@@ -464,18 +560,21 @@ registerPlatformCapabilities('github', {
   }
 });
 
-function locatePullRequest(base: ReturnType<typeof resolvedContext> & { ok: true }, head: string, target: string) {
+function locatePullRequest(base: ReturnType<typeof resolvedContext> & { ok: true }, head: string, target: string, expectedSha?: string) {
   const repository = base.context.platform.repository!;
   const listed = base.client.json<RemotePullRequest[]>([
     'api', `repos/${repository}/pulls?state=open&base=${encodeURIComponent(target)}&per_page=100`
   ], { cwd: base.resolved.repoRoot });
   if (!listed.ok) return listed;
-  const selected = selectPullRequest(listed.value, repository, head, target);
+  const selected = selectPullRequest(listed.value, repository, head, target, expectedSha);
   return selected.status === 'resolved'
     ? { ok: true as const, value: selected.pullRequest }
     : { ok: false as const, error: {
-      code: selected.status === 'ambiguous' ? 'PR_IDENTITY_AMBIGUOUS' : 'PR_NOT_FOUND',
-      message: selected.status === 'ambiguous' ? 'Multiple pull requests match the exact head/base identity' : 'No pull request matches the exact head/base identity',
+      code: selected.status === 'ambiguous' ? 'PR_IDENTITY_AMBIGUOUS'
+        : selected.status === 'head-mismatch' ? 'PR_HEAD_SHA_MISMATCH' : 'PR_NOT_FOUND',
+      message: selected.status === 'ambiguous' ? 'Multiple pull requests match the exact head/base identity'
+        : selected.status === 'head-mismatch' ? 'A pull request matches head/base but not the expected head SHA'
+          : 'No pull request matches the exact head/base identity',
       retryable: false
     } };
 }
@@ -755,24 +854,41 @@ function createPlatformPullRequestUnlocked(taskRef: string, options: CreateOptio
   if (!options.base || !options.head || !options.title.trim() || !options.body.trim()) return result('failed', base.resolved.taskId, base.issueNumber, base.prNumber, {
     error: { code: 'PR_PAYLOAD_INVALID', message: 'base, head, title and body are required', retryable: false }
   });
-  if (base.prNumber) return inspectPlatformPullRequest(taskRef, options);
-  const gate = inspectCreatePrCommitGate(base.resolved.taskDir, base.resolved.repoRoot, base.resolved.taskId);
-  if (!gate.allowed) return result('blocked', base.resolved.taskId, base.issueNumber, null, {
+  if (base.prNumber) {
+    const headCheck = verifyCreateHead(base, options.head);
+    if (!headCheck.ok) return result(headCheck.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, {
+      platform: base.context.platform,
+      capabilities: base.context.capabilities,
+      error: headCheck.error
+    });
+    const inspected = inspectPlatformPullRequest(taskRef, options);
+    const identity = validateBoundPullRequest(base, inspected.pullRequest, options.head, options.base, headCheck.value);
+    if (!identity.ok) return result('failed', base.resolved.taskId, base.issueNumber, base.prNumber, {
+      platform: base.context.platform,
+      capabilities: base.context.capabilities,
+      pullRequest: inspected.pullRequest,
+      error: identity.error
+    });
+    return { ...inspected, result: 'no_op' };
+  }
+  const headCheck = verifyCreateHead(base, options.head);
+  if (!headCheck.ok) return result(headCheck.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, null, {
     platform: base.context.platform,
     capabilities: base.context.capabilities,
-    error: {
-      code: gate.code!,
-      message: `${gate.message}; action=${gate.action}`,
-      retryable: gate.action === 'rerun-commit' || gate.action === 'rerun-review-code'
-    }
+    error: headCheck.error
   });
-  const located = locatePullRequest(base, options.head, options.base);
+  const expectedHeadSha = headCheck.value;
+  const located = locatePullRequest(base, options.head, options.base, expectedHeadSha);
   if (!located.ok && located.error.code === 'PR_IDENTITY_AMBIGUOUS') return result('failed', base.resolved.taskId, base.issueNumber, null, {
     platform: base.context.platform, capabilities: base.context.capabilities, error: located.error
   });
+  if (!located.ok && located.error.code === 'PR_HEAD_SHA_MISMATCH') return result('failed', base.resolved.taskId, base.issueNumber, null, {
+    platform: base.context.platform, capabilities: base.context.capabilities, error: located.error
+  });
   if (options.dryRun) return result('planned', base.resolved.taskId, base.issueNumber, null, {
     platform: base.context.platform, capabilities: base.context.capabilities,
-    operations: [{ name: located.ok ? 'pr:reuse' : 'pr:create', status: 'planned', reasonCode: null }], error: null
+    operations: [{ name: located.ok ? 'pr:reuse' : 'pr:create', status: 'planned', reasonCode: null }],
+    result: located.ok ? 'pr_reused' : 'pr_created', error: null
   });
   const started = writeCreateStarted(base, options.agent);
   if (started.status === 'failed') return result('failed', base.resolved.taskId, base.issueNumber, null, {
@@ -789,7 +905,7 @@ function createPlatformPullRequestUnlocked(taskRef: string, options: CreateOptio
     });
     if (response.ok) pullRequest = normalizePullRequest(response.value, repository);
     else if (response.error.retryable) {
-      const recovered = locatePullRequest(base, options.head, options.base);
+      const recovered = locatePullRequest(base, options.head, options.base, expectedHeadSha);
       if (recovered.ok) pullRequest = recovered.value;
       else return result('blocked', base.resolved.taskId, base.issueNumber, null, {
         platform: base.context.platform, capabilities: base.context.capabilities,
@@ -803,8 +919,44 @@ function createPlatformPullRequestUnlocked(taskRef: string, options: CreateOptio
     if (!pullRequest) return result('failed', base.resolved.taskId, base.issueNumber, null, {
       error: { code: 'PR_CREATE_RESPONSE_INVALID', message: 'PR create response lacks validated identity', retryable: false }
     });
+    if (pullRequest.head.sha !== expectedHeadSha) return result('failed', base.resolved.taskId, base.issueNumber, pullRequest.number, {
+      platform: base.context.platform, capabilities: base.context.capabilities,
+      resource: { kind: 'pull-request', number: pullRequest.number }, pullRequest,
+      error: { code: 'PR_HEAD_SHA_MISMATCH', message: 'Created pull request head does not match the expected local HEAD', retryable: false }
+    });
     created = true;
   }
+  const bindHeadCheck = verifyCreateHead(base, options.head);
+  if (!bindHeadCheck.ok || bindHeadCheck.value !== expectedHeadSha) {
+    const error = bindHeadCheck.ok
+      ? { code: 'PR_REMOTE_HEAD_MISMATCH', message: 'Remote head changed before task binding', retryable: false }
+      : bindHeadCheck.error;
+    return result(error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, pullRequest.number, {
+      platform: base.context.platform, capabilities: base.context.capabilities,
+      resource: { kind: 'pull-request', number: pullRequest.number }, pullRequest, error
+    });
+  }
+  const beforeBind = inspectGitHubPullRequest(base.client, base.context.platform.repository!, pullRequest.number, base.resolved.repoRoot);
+  if (!beforeBind.ok || !beforeBind.value) {
+    const error = beforeBind.ok
+      ? { code: 'PR_BIND_RECHECK_FAILED', message: 'Pull request recheck returned no identity', retryable: false }
+      : beforeBind.error;
+    return result(error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, pullRequest.number, {
+      platform: base.context.platform, capabilities: base.context.capabilities,
+      resource: { kind: 'pull-request', number: pullRequest.number }, pullRequest, error
+    });
+  }
+  if (
+    beforeBind.value.head.sha !== expectedHeadSha
+    || beforeBind.value.head.ref !== expectedHead(base.context.platform.repository!, options.head).ref
+    || beforeBind.value.base.ref !== options.base
+    || beforeBind.value.base.repository !== base.context.platform.repository
+  ) return result('failed', base.resolved.taskId, base.issueNumber, pullRequest.number, {
+    platform: base.context.platform, capabilities: base.context.capabilities,
+    resource: { kind: 'pull-request', number: pullRequest.number }, pullRequest: beforeBind.value,
+    error: { code: 'PR_BIND_IDENTITY_MISMATCH', message: 'Pull request identity changed before task binding', retryable: false }
+  });
+  pullRequest = beforeBind.value;
   const refreshed = resolvedContext(taskRef, options);
   if (!refreshed.ok) return result('failed', base.resolved.taskId, base.issueNumber, null, {
     pullRequest, error: { code: 'PR_CREATED_BIND_FAILED', message: pullRequest.url, retryable: false }
@@ -819,7 +971,8 @@ function createPlatformPullRequestUnlocked(taskRef: string, options: CreateOptio
   return result('applied', base.resolved.taskId, base.issueNumber, pullRequest.number, {
     changed: true, platform: base.context.platform, capabilities: base.context.capabilities,
     resource: { kind: 'pull-request', number: pullRequest.number }, pullRequest,
-    operations: [{ name: created ? 'pr:create' : 'pr:reuse', status: created ? 'applied' : 'no-op', reasonCode: null }, { name: 'task:bind-pr', status: 'applied', reasonCode: null }], error: null
+    operations: [{ name: created ? 'pr:create' : 'pr:reuse', status: created ? 'applied' : 'no-op', reasonCode: null }, { name: 'task:bind-pr', status: 'applied', reasonCode: null }],
+    result: created ? 'pr_created' : 'pr_reused', error: null
   });
 }
 
@@ -831,7 +984,6 @@ function createPlatformPullRequest(taskRef: string, options: CreateOptions): Pul
       error: { code: 'PR_PAYLOAD_INVALID', message: 'base, head, title and body are required', retryable: false }
     });
   }
-  if (base.prNumber) return inspectPlatformPullRequest(taskRef, options);
   try {
     return withTaskExecutionLock(
       base.resolved.repoRoot,
@@ -860,23 +1012,40 @@ function createPlatformPullRequest(taskRef: string, options: CreateOptions): Pul
 }
 
 function syncPlatformPullRequest(taskRef: string, options: SyncOptions): PullRequestResult {
+  const warningResult = warningResultForPrimary(options.primaryResult);
+  const softenFailure = (output: PullRequestResult): PullRequestResult => {
+    const warning = output.error && output.task.prNumber !== null
+      && !['PR_NOT_LINKED', 'PR_BIND_CONFLICT'].includes(output.error.code)
+      ? {
+        code: output.error.code,
+        message: output.error.message,
+        retryable: output.error.retryable,
+        step: 'pr-metadata',
+        target: `pull-request:${output.task.prNumber}`,
+        severity: 'ACTION_REQUIRED' as const
+      }
+      : null;
+    return warning
+      ? { ...output, status: 'applied', changed: false, error: null, result: warningResult, warnings: mergeOperationWarnings([warning]) }
+      : output;
+  };
   const base = resolvedContext(taskRef, options);
-  if (!base.ok) return base.output;
-  if (!base.prNumber) return result('failed', base.resolved.taskId, base.issueNumber, null, {
+  if (!base.ok) return softenFailure(base.output);
+  if (!base.prNumber) return softenFailure(result('failed', base.resolved.taskId, base.issueNumber, null, {
     error: { code: 'PR_NOT_LINKED', message: 'Task has no valid pr_number', retryable: false }
-  });
+  }));
   const fetched = inspectGitHubPullRequest(base.client, base.context.platform.repository!, base.prNumber, base.resolved.repoRoot);
-  if (!fetched.ok) return result(fetched.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { error: fetched.error });
-  if (!options.metadata && !options.closingIssue) return result('failed', base.resolved.taskId, base.issueNumber, base.prNumber, {
+  if (!fetched.ok) return softenFailure(result(fetched.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { error: fetched.error }));
+  if (!options.metadata && !options.closingIssue) return softenFailure(result('failed', base.resolved.taskId, base.issueNumber, base.prNumber, {
     error: { code: 'PR_PAYLOAD_INVALID', message: 'sync requires a desired-state option', retryable: false }
-  });
-  if (!base.issueNumber) return result('degraded', base.resolved.taskId, null, base.prNumber, {
+  }));
+  if (!base.issueNumber) return softenFailure(result('degraded', base.resolved.taskId, null, base.prNumber, {
     pullRequest: fetched.value, error: { code: 'ISSUE_NOT_LINKED', message: 'Task has no linked Issue to copy metadata from', retryable: false }
-  });
+  }));
   const issue = inspectPlatformIssue(taskRef, { cwd: base.resolved.repoRoot, client: base.client });
-  if (!issue.issue) return result(issue.status, base.resolved.taskId, base.issueNumber, base.prNumber, {
+  if (!issue.issue) return softenFailure(result(issue.status, base.resolved.taskId, base.issueNumber, base.prNumber, {
     platform: base.context.platform, capabilities: base.context.capabilities, pullRequest: fetched.value, error: issue.error
-  });
+  }));
   const planned = planPullRequestMetadata({
     pullRequest: fetched.value,
     issue: issue.issue,
@@ -886,9 +1055,9 @@ function syncPlatformPullRequest(taskRef: string, options: SyncOptions): PullReq
   }).operations.filter((operation) => options.metadata || operation.name === 'closing-issue')
     .filter((operation) => options.closingIssue || operation.name !== 'closing-issue');
   const operations: PlatformOperation[] = planned.map(({ name, status, reasonCode }) => ({ name, status, reasonCode }));
-  if (options.dryRun) return result(planned.some((operation) => operation.status === 'planned') ? 'planned' : 'no-op', base.resolved.taskId, base.issueNumber, base.prNumber, {
+  if (options.dryRun) return softenFailure(result(planned.some((operation) => operation.status === 'planned') ? 'planned' : 'no-op', base.resolved.taskId, base.issueNumber, base.prNumber, {
     platform: base.context.platform, capabilities: base.context.capabilities, pullRequest: fetched.value, operations, error: null
-  });
+  }));
   const payload: Record<string, unknown> = {};
   for (const operation of planned) {
     if (operation.status !== 'planned') continue;
@@ -897,26 +1066,26 @@ function syncPlatformPullRequest(taskRef: string, options: SyncOptions): PullReq
     if (operation.name === 'closing-issue') payload.body = operation.value;
     if (operation.name === 'milestone') {
       const milestones = base.client.json<unknown[]>(['api', '--paginate', '--slurp', `repos/${base.context.platform.repository}/milestones?state=open&per_page=100`], { cwd: base.resolved.repoRoot });
-      if (!milestones.ok) return result(milestones.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { pullRequest: fetched.value, operations, error: milestones.error });
+      if (!milestones.ok) return softenFailure(result(milestones.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { pullRequest: fetched.value, operations, error: milestones.error }));
       const flat = milestones.value.flatMap((entry) => Array.isArray(entry) ? entry : [entry]) as Array<{ title?: string; number?: number }>;
       payload.milestone = flat.find((entry) => entry.title === operation.value)?.number ?? null;
     }
   }
   if (Object.keys(payload).length === 0) {
     const degraded = planned.some((operation) => operation.status === 'skipped');
-    return result(degraded ? 'degraded' : 'no-op', base.resolved.taskId, base.issueNumber, base.prNumber, {
+    return softenFailure(result(degraded ? 'degraded' : 'no-op', base.resolved.taskId, base.issueNumber, base.prNumber, {
       platform: base.context.platform, capabilities: base.context.capabilities, resource: { kind: 'pull-request', number: base.prNumber }, pullRequest: fetched.value, operations, error: null
-    });
+    }));
   }
   const patched = base.client.json<RemotePullRequest>(['api', `repos/${base.context.platform.repository}/issues/${base.prNumber}`, '-X', 'PATCH', '--input', '-'], {
     cwd: base.resolved.repoRoot, method: 'PATCH', input: JSON.stringify(payload)
   });
-  if (!patched.ok) return result(patched.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { pullRequest: fetched.value, operations, error: patched.error });
-  return result(planned.some((operation) => operation.status === 'skipped') ? 'degraded' : 'applied', base.resolved.taskId, base.issueNumber, base.prNumber, {
+  if (!patched.ok) return softenFailure(result(patched.error.retryable ? 'blocked' : 'failed', base.resolved.taskId, base.issueNumber, base.prNumber, { pullRequest: fetched.value, operations, error: patched.error }));
+  return softenFailure(result(planned.some((operation) => operation.status === 'skipped') ? 'degraded' : 'applied', base.resolved.taskId, base.issueNumber, base.prNumber, {
     changed: true, platform: base.context.platform, capabilities: base.context.capabilities,
     resource: { kind: 'pull-request', number: base.prNumber }, pullRequest: fetched.value,
     operations: operations.map((operation) => operation.status === 'planned' ? { ...operation, status: 'applied' } : operation), error: null
-  });
+  }));
 }
 
 export {
@@ -933,4 +1102,5 @@ export {
   selectPullRequest,
   syncPlatformPullRequest
 };
-export type { BindOptions, CreateOptions, ExternalPullRequestResult, ExternalPullRequestSelection, PullRequestResult, PullRequestSnapshot, ResolveExternalOptions, SyncOptions };
+export type { BindOptions, CreateOptions, ExternalPullRequestResult, ExternalPullRequestSelection, PullRequestPrimaryResult, PullRequestResult, PullRequestSnapshot, ResolveExternalOptions, SyncOptions };
+export { warningResultForPrimary };

package/lib/run/tui.ts

@@ -2,14 +2,15 @@ import { renderAgentClientInvocation } from '../agent-clients/invocation.ts';
 import { getAgentClientAdapter } from '../agent-clients/registry.ts';
 import type { AgentClientId } from '../agent-clients/types.ts';
 
-export type TuiName = 'claude' | 'codex' | 'antigravity' | 'opencode';
+export type TuiName = 'claude' | 'codex' | 'antigravity' | 'opencode' | 'traecli';
 
-const TUI_NAMES = new Set(['claude', 'codex', 'antigravity', 'opencode']);
+const TUI_NAMES = new Set(['claude', 'codex', 'antigravity', 'opencode', 'traecli']);
 const TUI_AGENT_CLIENT_IDS: Readonly<Record<TuiName, AgentClientId>> = Object.freeze({
   claude: 'claude-code',
   codex: 'codex',
   antigravity: 'antigravity-cli',
-  opencode: 'opencode'
+  opencode: 'opencode',
+  traecli: 'traecli'
 });
 
 export type CommandConfig = {
@@ -46,5 +47,6 @@ export function buildTuiCommand(tui: TuiName, prompt: string): [string, string[]
   if (tui === 'claude') return ['claude', ['--dangerously-skip-permissions', '--print', prompt]];
   if (tui === 'antigravity') return ['agy', ['--dangerously-skip-permissions', '--print', prompt]];
   if (tui === 'opencode') return ['opencode', ['run', '--dangerously-skip-permissions', prompt]];
+  if (tui === 'traecli') return ['traecli', ['exec', '--dangerously-bypass-approvals-and-sandbox', prompt]];
   return ['codex', ['exec', '--dangerously-bypass-approvals-and-sandbox', prompt]];
 }