@fitlab-ai/agent-infra 0.9.8 → 0.9.10

package/lib/{task/commands/validate.ts → internal/task-validate.ts}

@@ -3,28 +3,28 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { loadConfig } from '../../sandbox/config.ts';
-import { detectEngine } from '../../sandbox/engine.ts';
-import { runEngine } from '../../sandbox/shell.ts';
-import { sandboxBranchLabel, sandboxLabel } from '../../sandbox/constants.ts';
-import { fetchSandboxRows, selectSandboxContainer } from '../../sandbox/commands/list-running.ts';
-import { containerNameCandidates } from '../../sandbox/constants.ts';
-import { resolveSandboxTarget } from '../../sandbox/workspace-identity.ts';
-import { sandboxControlPaths } from '../../sandbox/workspace-view.ts';
+import { loadConfig } from '../sandbox/config.ts';
+import { detectEngine } from '../sandbox/engine.ts';
+import { runEngine } from '../sandbox/shell.ts';
+import { sandboxBranchLabel, sandboxLabel } from '../sandbox/constants.ts';
+import { fetchSandboxRows, selectSandboxContainer } from '../sandbox/commands/list-running.ts';
+import { containerNameCandidates } from '../sandbox/constants.ts';
+import { resolveSandboxTarget } from '../sandbox/workspace-identity.ts';
+import { sandboxControlPaths } from '../sandbox/workspace-view.ts';
 import {
   appendSandboxControlAudit,
   readActiveLease,
   readSandboxControlStatus
-} from '../../sandbox/control/state.ts';
-import type { SandboxControlLease, SandboxControlManifest } from '../../sandbox/control/protocol.ts';
+} from '../sandbox/control/state.ts';
+import type { SandboxControlLease, SandboxControlManifest } from '../sandbox/control/protocol.ts';
 import {
   SANDBOX_CONTROL_FUTURE_SKEW_MS,
   SANDBOX_CONTROL_STATUS_STALE_MS
-} from '../../sandbox/control/protocol.ts';
-import { getProcessStartTime } from '../../server/process-state.ts';
-import { assertGitWorktreeBinding } from '../../git/worktree-identity.ts';
+} from '../sandbox/control/protocol.ts';
+import { getProcessStartTime } from '../server/process-state.ts';
+import { assertGitWorktreeBinding } from '../git/worktree-identity.ts';
 
-const USAGE = `Usage: ai task validate <branch | TASK-id | N> [--scope snapshot|inplace] [--timeout <ms>] [--format text|json] -- <command> [args...]`;
+const USAGE = `Usage: agent-infra-internal task-validate <branch | TASK-id | N> [--scope snapshot|inplace] [--timeout <ms>] [--format text|json] -- <command> [args...]`;
 const MAX_TIMEOUT_MS = 60 * 60 * 1000;
 const RECOVERY_GRACE_MS = 30_000;
 
@@ -250,33 +250,68 @@ function inplaceValidation(config: ReturnType<typeof loadConfig>, target: Return
   }
 }
 
-export async function validate(args: string[]): Promise<number> {
-  const options = parseValidateArgs(args);
+function errorCode(message: string): string {
+  const match = message.match(/^([A-Z][A-Z0-9_]*)/);
+  return match && match[1]!.length >= 3 ? match[1]! : 'TASK_VALIDATE_FAILED';
+}
+
+function fail(format: 'text' | 'json', code: string, message: string): void {
+  if (format === 'json') {
+    process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code, message } })}\n`);
+  } else {
+    process.stderr.write(`${message}\n`);
+  }
+  process.exitCode = 1;
+}
+
+function sniffFormat(args: string[]): 'text' | 'json' {
+  const index = args.indexOf('--format');
+  return index >= 0 && args[index + 1] === 'json' ? 'json' : 'text';
+}
+
+function taskValidate(args: string[]): void {
+  let options: ValidateOptions;
+  try {
+    options = parseValidateArgs(args);
+  } catch (error) {
+    fail(sniffFormat(args), 'TASK_VALIDATE_ARGS_INVALID', error instanceof Error ? error.message : String(error));
+    return;
+  }
   if (options.help) {
     process.stdout.write(`${USAGE}\n`);
-    return 0;
+    return;
+  }
+  try {
+    const config = loadConfig();
+    const target = resolveSandboxTarget(options.target, config.repoRoot);
+    const commit = git(config.repoRoot, ['rev-parse', target.branch]);
+    const startedAt = new Date().toISOString();
+    const result = options.scope === 'snapshot'
+      ? snapshotValidation(config.repoRoot, commit, options)
+      : inplaceValidation(config, target, options);
+    const evidence = {
+      version: 1,
+      taskId: target.workspace.mode === 'task-bound' ? target.workspace.taskId : null,
+      branch: target.branch,
+      scope: options.scope,
+      commit,
+      command: path.basename(options.command[0]!),
+      startedAt,
+      completedAt: new Date().toISOString(),
+      exitCode: result.exitCode,
+      signal: result.signal,
+      cleanup: result.cleanup()
+    };
+    if (options.format === 'json') {
+      process.stdout.write(`${JSON.stringify({ status: 'applied', changed: false, evidence, error: null })}\n`);
+    } else {
+      process.stdout.write(`Validation ${result.exitCode === 0 ? 'passed' : 'failed'} (${options.scope}, ${evidence.command}, cleanup=${evidence.cleanup}).\n`);
+    }
+    process.exitCode = result.exitCode;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    fail(options.format, errorCode(message), message);
   }
-  const config = loadConfig();
-  const target = resolveSandboxTarget(options.target, config.repoRoot);
-  const commit = git(config.repoRoot, ['rev-parse', target.branch]);
-  const startedAt = new Date().toISOString();
-  const result = options.scope === 'snapshot'
-    ? snapshotValidation(config.repoRoot, commit, options)
-    : inplaceValidation(config, target, options);
-  const evidence = {
-    version: 1,
-    taskId: target.workspace.mode === 'task-bound' ? target.workspace.taskId : null,
-    branch: target.branch,
-    scope: options.scope,
-    commit,
-    command: path.basename(options.command[0]!),
-    startedAt,
-    completedAt: new Date().toISOString(),
-    exitCode: result.exitCode,
-    signal: result.signal,
-    cleanup: result.cleanup()
-  };
-  if (options.format === 'json') process.stdout.write(`${JSON.stringify(evidence)}\n`);
-  else process.stdout.write(`Validation ${result.exitCode === 0 ? 'passed' : 'failed'} (${options.scope}, ${evidence.command}, cleanup=${evidence.cleanup}).\n`);
-  return result.exitCode;
 }
+
+export { taskValidate };

package/lib/platform/pr-summary.ts

@@ -11,12 +11,24 @@ import type { GitHubClient } from './github-client.ts';
 import { listRemoteComments, normalizeCommentContent, writeComment } from './issue-comments.ts';
 import { platformResult } from './types.ts';
 import type { PlatformResult } from './types.ts';
+import type { OperationWarning } from '../task/operation-outcome.ts';
 
 type SummaryComment = { id: number; body: string };
 type SummaryContextResult = PlatformResult & {
   task: { id: string | null; prNumber: number | null };
   artifacts: Array<{ family: string; name: string; path: string }>;
 };
+type PullRequestSummaryResult = PlatformResult & {
+  result: 'pr_created_with_warnings' | 'pr_reused_with_warnings' | 'no_op_with_warnings' | null;
+  warnings: readonly OperationWarning[];
+};
+type PullRequestPrimaryResult = 'pr_created' | 'pr_reused' | 'no_op';
+
+function warningResultForPrimary(primaryResult: PullRequestPrimaryResult): NonNullable<PullRequestSummaryResult['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 summaryMarker(taskId: string): string {
   return `<!-- sync-pr:${taskId}:summary -->`;
@@ -61,20 +73,50 @@ function summaryContext(taskRef: string, options: { cwd?: string; client?: GitHu
   return { ...platformResult('no-op'), task: { id: resolved.taskId, prNumber }, artifacts: canonicalArtifacts(resolved.taskDir) };
 }
 
-function syncPullRequestSummary(taskRef: string, options: { agent: string; body: string; cwd?: string; client?: GitHubClient; dryRun?: boolean }): PlatformResult {
+function syncPullRequestSummary(taskRef: string, options: { agent: string; body: string; cwd?: string; client?: GitHubClient; dryRun?: boolean; primaryResult: PullRequestPrimaryResult }): PullRequestSummaryResult {
+  const warningResult = warningResultForPrimary(options.primaryResult);
+  let knownPrNumber: number | null = null;
+  const softenFailure = (output: PlatformResult): PullRequestSummaryResult => {
+    const prNumber = output.resource.kind === 'pull-request' && output.resource.number
+      ? output.resource.number
+      : knownPrNumber;
+    const warning = output.error && prNumber
+      && output.error.code !== 'PR_NOT_LINKED'
+      ? {
+        code: output.error.code,
+        message: output.error.message,
+        retryable: output.error.retryable,
+        step: 'pr-summary',
+        target: `pull-request:${prNumber}`,
+        severity: 'ACTION_REQUIRED' as const
+      }
+      : null;
+    return warning
+      ? {
+        ...output,
+        status: 'applied',
+        changed: false,
+        resource: { kind: 'pull-request', number: prNumber },
+        error: null,
+        result: warningResult,
+        warnings: [warning]
+      }
+      : { ...output, result: null, warnings: [] };
+  };
   const resolved = resolveTaskRef(taskRef, options.cwd ? { repoRoot: options.cwd } : {});
-  if (!resolved.ok) return platformResult('failed', { error: { code: resolved.code, message: resolved.message, retryable: false } });
+  if (!resolved.ok) return softenFailure(platformResult('failed', { error: { code: resolved.code, message: resolved.message, retryable: false } }));
   const frontmatter = parseTaskFrontmatter(fs.readFileSync(resolved.taskMdPath, 'utf8'));
   const prNumber = Number(frontmatter.pr_number);
-  if (!Number.isInteger(prNumber) || prNumber <= 0) return platformResult('failed', { error: { code: 'PR_NOT_LINKED', message: 'Task has no valid pr_number', retryable: false } });
+  if (!Number.isInteger(prNumber) || prNumber <= 0) return softenFailure(platformResult('failed', { error: { code: 'PR_NOT_LINKED', message: 'Task has no valid pr_number', retryable: false } }));
+  knownPrNumber = prNumber;
   const client = options.client || createGitHubClient();
   const context = resolvePlatformContext({ cwd: resolved.repoRoot, client });
-  if (!context.platform.repository || !['no-op', 'degraded'].includes(context.status)) return context;
+  if (!context.platform.repository || !['no-op', 'degraded'].includes(context.status)) return softenFailure(context);
   let headSha: string;
   try {
     headSha = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: resolved.repoRoot, encoding: 'utf8' }).trim();
   } catch (error) {
-    return platformResult('failed', { platform: context.platform, capabilities: context.capabilities, error: { code: 'GIT_HEAD_UNRESOLVED', message: error instanceof Error ? error.message : String(error), retryable: false } });
+    return softenFailure(platformResult('failed', { platform: context.platform, capabilities: context.capabilities, error: { code: 'GIT_HEAD_UNRESOLVED', message: error instanceof Error ? error.message : String(error), retryable: false } }));
   }
   const desired = buildPullRequestSummary(
     resolved.taskId,
@@ -83,15 +125,17 @@ function syncPullRequestSummary(taskRef: string, options: { agent: string; body:
     renderHumanOverrideAudit(fs.readFileSync(resolved.taskMdPath, 'utf8'))
   );
   const listed = listRemoteComments(client, context.platform.repository, prNumber, resolved.repoRoot);
-  if (!listed.ok) return platformResult(listed.error.retryable ? 'blocked' : 'failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: listed.error });
+  if (!listed.ok) return softenFailure(platformResult(listed.error.retryable ? 'blocked' : 'failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: listed.error }));
   const reconciliation = reconcileSummaryComment(listed.value, resolved.taskId, desired);
-  if (reconciliation.action === 'conflict') return platformResult('failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: { code: 'PR_SUMMARY_MARKER_AMBIGUOUS', message: 'Multiple PR comments contain the summary marker', retryable: false } });
-  if (reconciliation.action === 'no-op') return platformResult('no-op', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, comment: { kind: 'summary', marker: summaryMarker(resolved.taskId), ids: [reconciliation.commentId!], parts: 1 }, error: null });
-  if (options.dryRun) return platformResult('planned', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, operations: [{ name: `summary:${reconciliation.action}`, status: 'planned', reasonCode: null }], error: null });
+  if (reconciliation.action === 'conflict') return softenFailure(platformResult('failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: { code: 'PR_SUMMARY_MARKER_AMBIGUOUS', message: 'Multiple PR comments contain the summary marker', retryable: false } }));
+  if (reconciliation.action === 'no-op') return softenFailure(platformResult('no-op', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, comment: { kind: 'summary', marker: summaryMarker(resolved.taskId), ids: [reconciliation.commentId!], parts: 1 }, error: null }));
+  if (options.dryRun) return softenFailure(platformResult('planned', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, operations: [{ name: `summary:${reconciliation.action}`, status: 'planned', reasonCode: null }], error: null }));
   const written = writeComment(client, context.platform.repository, prNumber, resolved.repoRoot, desired, reconciliation.commentId || undefined);
-  if (!written.ok) return platformResult(written.error.retryable ? 'blocked' : 'failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: written.error });
+  if (!written.ok) return softenFailure(platformResult(written.error.retryable ? 'blocked' : 'failed', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, error: written.error }));
   const id = Number(written.value.id || reconciliation.commentId);
-  return platformResult('applied', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, comment: { kind: 'summary', marker: summaryMarker(resolved.taskId), ids: Number.isInteger(id) ? [id] : [], parts: 1 }, operations: [{ name: `summary:${reconciliation.action}`, status: 'applied', reasonCode: null }], error: null });
+  return softenFailure(platformResult('applied', { platform: context.platform, capabilities: context.capabilities, resource: { kind: 'pull-request', number: prNumber }, comment: { kind: 'summary', marker: summaryMarker(resolved.taskId), ids: Number.isInteger(id) ? [id] : [], parts: 1 }, operations: [{ name: `summary:${reconciliation.action}`, status: 'applied', reasonCode: null }], error: null }));
 }
 
 export { buildPullRequestSummary, reconcileSummaryComment, summaryContext, summaryMarker, syncPullRequestSummary };
+export type { PullRequestSummaryResult, SummaryContextResult };
+export { warningResultForPrimary };