@open330/oac 2026.221.2 → 2026.222.2

package/dist/{chunk-VK33A5L4.js → chunk-ATVWSG75.js}

@@ -1,7 +1,7 @@
 import {
   cloneRepo,
   resolveRepo
-} from "./chunk-OS3XDHOJ.js";
+} from "./chunk-UCYK4Z6O.js";
 import {
   CompositeScanner,
   GitHubIssuesScanner,
@@ -20,39 +20,39 @@ import {
   persistContext,
   rankTasks,
   updateBacklog
-} from "./chunk-OCCMKAJI.js";
+} from "./chunk-ZJBLRKCV.js";
 import {
   buildEpicExecutionPlan,
   buildExecutionPlan,
   estimateEpicTokens,
   estimateTokens
-} from "./chunk-5GAUWC3L.js";
+} from "./chunk-ALBVUNUY.js";
 import {
   adapterRegistry,
   createSandbox,
   epicAsTask,
   executeTask
-} from "./chunk-EYUQMPVO.js";
+} from "./chunk-27FEE5KS.js";
 import {
   UNLIMITED_BUDGET,
   createEventBus,
   loadConfig
-} from "./chunk-7C7SC4TZ.js";
+} from "./chunk-I3TKNT4M.js";
 import {
   isRecord,
   truncate
-} from "./chunk-6A37SKAJ.js";
+} from "./chunk-JDFAJP45.js";
 import {
   contributionLogSchema,
   writeContributionLog
 } from "./chunk-LQC5DLT7.js";
 
 // src/cli/cli.ts
-import { Command as Command13 } from "commander";
+import { Command as Command12 } from "commander";
 
 // src/cli/commands/analyze.ts
 import Table from "cli-table3";
-import { Command as Command2 } from "commander";
+import { Command } from "commander";
 
 // src/cli/github-auth.ts
 import { execFileSync, spawnSync } from "child_process";
@@ -100,7 +100,6 @@ function checkGitHubScopes(required = ["repo"]) {
 
 // src/cli/helpers.ts
 import chalk, { Chalk } from "chalk";
-import "commander";
 import ora from "ora";
 import PQueue from "p-queue";
 
@@ -269,10 +268,8 @@ async function estimateTaskMap(tasks, providerId, onProgress) {
 
 // src/cli/commands/analyze.ts
 function createAnalyzeCommand() {
-  const command = new Command2("analyze");
-  command.description(
-    "Deep codebase analysis \u2014 build module graph and group findings into epics"
-  ).option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--force", "Force re-analysis even if context is fresh", false).option("--format <format>", "Output format: table|json", "table").action(async (options, cmd) => {
+  const command = new Command("analyze");
+  command.description("Deep codebase analysis \u2014 build module graph and group findings into epics").option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--force", "Force re-analysis even if context is fresh", false).option("--format <format>", "Output format: table|json", "table").action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
     const outputJson = globalOptions.json || normalizeOutputFormat(options.format) === "json";
@@ -379,7 +376,7 @@ function buildScannerList(config, hasGitHubAuth) {
 }
 
 // src/cli/commands/completion.ts
-import { Command as Command3 } from "commander";
+import { Command as Command2 } from "commander";
 var SUBCOMMANDS = [
   "init",
   "analyze",
@@ -392,7 +389,15 @@ var SUBCOMMANDS = [
   "status",
   "completion"
 ];
-var GLOBAL_OPTIONS = ["--config", "--verbose", "--quiet", "--json", "--no-color", "--help", "--version"];
+var GLOBAL_OPTIONS = [
+  "--config",
+  "--verbose",
+  "--quiet",
+  "--json",
+  "--no-color",
+  "--help",
+  "--version"
+];
 var COMMAND_OPTIONS = {
   run: [
     "--repo",
@@ -477,17 +482,19 @@ function generateFish() {
   for (const [cmd, opts] of Object.entries(COMMAND_OPTIONS)) {
     for (const opt of opts) {
       const long = opt.replace(/^--/, "");
-      lines.push(
-        `complete -c oac -n '__fish_seen_subcommand_from ${cmd}' -l '${long}'`
-      );
+      lines.push(`complete -c oac -n '__fish_seen_subcommand_from ${cmd}' -l '${long}'`);
     }
   }
   return lines.join("\n");
 }
 function createCompletionCommand() {
-  const command = new Command3("completion");
+  const command = new Command2("completion");
   command.description("Generate shell completion scripts").argument("<shell>", "Shell type: bash, zsh, or fish").action((shell) => {
-    const generators = { bash: generateBash, zsh: generateZsh, fish: generateFish };
+    const generators = {
+      bash: generateBash,
+      zsh: generateZsh,
+      fish: generateFish
+    };
     const gen = generators[shell];
     if (!gen) {
       throw new Error(`Unsupported shell "${shell}". Supported: bash, zsh, fish`);
@@ -506,10 +513,10 @@ Examples:
 }
 
 // src/cli/commands/doctor.ts
-import { Command as Command4 } from "commander";
+import { Command as Command3 } from "commander";
 var MINIMUM_NODE_VERSION = "24.0.0";
 function createDoctorCommand() {
-  const command = new Command4("doctor");
+  const command = new Command3("doctor");
   command.description("Check local environment readiness").action(async (_options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
@@ -722,8 +729,8 @@ function isVersionAtLeast(version, minimum) {
 }
 async function runCommand(command, args) {
   try {
-    const { execa: execa3 } = await import("execa");
-    const result = await execa3(command, args, {
+    const { execa: execa4 } = await import("execa");
+    const result = await execa4(command, args, {
       reject: false,
       timeout: 1e4,
       stdin: "ignore"
@@ -749,9 +756,9 @@ async function runCommand(command, args) {
 
 // src/cli/commands/explain.ts
 import { resolve as resolve2 } from "path";
-import { Command as Command5 } from "commander";
+import { Command as Command4 } from "commander";
 function createExplainCommand() {
-  const command = new Command5("explain");
+  const command = new Command4("explain");
   command.description("Explain why a task or epic was selected and what the agent would do").argument("<id>", "Task or epic ID (from scan / analyze / run --dry-run output)").action(async (id, _options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
@@ -833,11 +840,13 @@ function createExplainCommand() {
       console.log(`  ${finding.description}`);
       console.log("");
       console.log(ui.dim("What the agent would do:"));
-      console.log(`  1. Check out a clean branch for this task`);
-      console.log(`  2. Open ${finding.filePath}${finding.line ? ` at line ${finding.line}` : ""}`);
-      console.log(`  3. Apply the fix described above`);
-      console.log(`  4. Run tests and linters to verify`);
-      console.log(`  5. Create a PR with the changes`);
+      console.log("  1. Check out a clean branch for this task");
+      console.log(
+        `  2. Open ${finding.filePath}${finding.line ? ` at line ${finding.line}` : ""}`
+      );
+      console.log("  3. Apply the fix described above");
+      console.log("  4. Run tests and linters to verify");
+      console.log("  5. Create a PR with the changes");
     }
   });
   command.addHelpText(
@@ -878,7 +887,7 @@ import { constants as fsConstants2 } from "fs";
 import { access as access2, mkdir, readFile as readFile2, writeFile } from "fs/promises";
 import { resolve as resolve3 } from "path";
 import { checkbox, confirm, input } from "@inquirer/prompts";
-import { Command as Command6 } from "commander";
+import { Command as Command5 } from "commander";
 var OAC_LOGO = [
   "  ___   _   ___",
   " / _ \\ /_\\ / __|",
@@ -887,7 +896,7 @@ var OAC_LOGO = [
 ].join("\n");
 var OWNER_REPO_PATTERN = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(?:\.git)?$/;
 function createInitCommand() {
-  const command = new Command6("init");
+  const command = new Command5("init");
   command.description("Initialize OAC in the current directory").option("--minimal", "Generate a bare-bones config without the interactive wizard").option("--repo <owner/repo>", "Repository in owner/repo format (required with --minimal)").action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
@@ -1124,9 +1133,9 @@ async function ensureGitignoreEntry(dir, entry) {
 import { readFile as readFile3, readdir } from "fs/promises";
 import { resolve as resolve4 } from "path";
 import Table2 from "cli-table3";
-import { Command as Command7 } from "commander";
+import { Command as Command6 } from "commander";
 function createLeaderboardCommand() {
-  const command = new Command7("leaderboard");
+  const command = new Command6("leaderboard");
   command.description("Show contribution rankings").option("--limit <number>", "Max entries to show", parseInteger, 10).option("--sort <field>", "Sort by: runs, tasks, tokens, prs", "tasks").action(async (options, cmd) => {
     if (options.limit <= 0) {
       throw new Error("--limit must be a positive integer.");
@@ -1318,9 +1327,9 @@ function isFileNotFoundError(error) {
 import { readFile as readFile4, readdir as readdir2 } from "fs/promises";
 import { resolve as resolve5 } from "path";
 import Table3 from "cli-table3";
-import { Command as Command8 } from "commander";
+import { Command as Command7 } from "commander";
 function createLogCommand() {
-  const command = new Command8("log");
+  const command = new Command7("log");
   command.description("View contribution history").option("--limit <number>", "Max entries to show", parseInteger, 20).option("--repo <name>", "Filter by repo name").option("--source <type>", "Filter by task source").option("--since <date>", "Filter contributions after date (ISO string)").action(async (options, cmd) => {
     if (options.limit <= 0) {
       throw new Error("--limit must be a positive integer.");
@@ -1438,9 +1447,9 @@ function isFileNotFoundError2(error) {
 
 // src/cli/commands/plan.ts
 import Table4 from "cli-table3";
-import { Command as Command9 } from "commander";
+import { Command as Command8 } from "commander";
 function createPlanCommand() {
-  const command = new Command9("plan");
+  const command = new Command8("plan");
   command.description("Build an execution plan from discovered tasks").option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--tokens <number>", "Token budget for planning", parseInteger).option("--provider <id>", "Agent provider id").action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
@@ -1575,17 +1584,15 @@ function renderPlan(ui, data) {
 }
 
 // src/cli/commands/run/index.ts
-import { Command as Command10 } from "commander";
+import { Command as Command9 } from "commander";
 
 // src/cli/commands/run/pipeline.ts
 import { randomUUID } from "crypto";
 
-// src/cli/commands/run/epic.ts
-import Table6 from "cli-table3";
-import PQueue3 from "p-queue";
-
-// src/cli/commands/run/pr.ts
-import { execa } from "execa";
+// src/cli/commands/run/context-policy.ts
+import { createHash } from "crypto";
+import { readFile as readFile5, readdir as readdir3, stat } from "fs/promises";
+import { join, relative, resolve as resolve6 } from "path";
 
 // src/cli/commands/run/types.ts
 var DEFAULT_TIMEOUT_SECONDS = 300;
@@ -1627,7 +1634,140 @@ function formatDuration(seconds) {
   return `${minutes}m ${remainingSeconds}s`;
 }
 
+// src/cli/commands/run/context-policy.ts
+async function resolveContextAck(repoPath, config, ui, suppressOutput) {
+  const mode = config?.context.mode ?? "off";
+  if (mode === "off") {
+    return void 0;
+  }
+  const requiredGlobs = (config?.context.requiredGlobs ?? []).filter(
+    (item) => item.trim().length > 0
+  );
+  if (requiredGlobs.length === 0) {
+    return void 0;
+  }
+  const files = await collectFilesForGlobs(repoPath, requiredGlobs);
+  if (files.length === 0) {
+    const message = `Missing required context files for run policy (${requiredGlobs.join(
+      ", "
+    )}). Create repository-owned markdown plans under .context/plans and retry.`;
+    if (mode === "enforce") {
+      throw new ConfigError(message);
+    }
+    if (!suppressOutput) {
+      console.warn(ui.yellow(`[oac] Context policy warning: ${message}`));
+    }
+    return void 0;
+  }
+  const maxItems = config?.context.maxAckItems ?? 3;
+  const summary = await summarizeContextFiles(repoPath, files.slice(0, maxItems));
+  const digest = await hashContextFiles(repoPath, files);
+  if (!suppressOutput) {
+    console.log(
+      ui.blue(
+        `[oac] Context policy loaded ${files.length} file(s): ${files.slice(0, maxItems).join(", ")}`
+      )
+    );
+  }
+  return {
+    mode,
+    requiredGlobs,
+    files,
+    summary,
+    digest
+  };
+}
+async function collectFilesForGlobs(repoPath, globs) {
+  const files = /* @__PURE__ */ new Set();
+  for (const pattern of globs) {
+    const root = resolveSearchRoot(repoPath, pattern);
+    const rootStat = await safeStat(root);
+    if (!rootStat?.isDirectory()) continue;
+    const candidates = await listFilesRecursively(root);
+    const matcher = createSimpleGlobMatcher(pattern);
+    for (const candidate of candidates) {
+      const relPath = toPosixPath(relative(repoPath, candidate));
+      if (matcher(relPath)) {
+        files.add(relPath);
+      }
+    }
+  }
+  return [...files].sort((a, b) => a.localeCompare(b));
+}
+function resolveSearchRoot(repoPath, pattern) {
+  const normalized = toPosixPath(pattern);
+  const wildcardIndex = normalized.search(/[\[*?]/);
+  const prefix = wildcardIndex === -1 ? normalized : normalized.slice(0, wildcardIndex);
+  const cleanedPrefix = prefix.replace(/\/+$|\/+$/g, "");
+  const fallback = ".";
+  return resolve6(repoPath, cleanedPrefix.length > 0 ? cleanedPrefix : fallback);
+}
+function createSimpleGlobMatcher(pattern) {
+  const tokenized = toPosixPath(pattern).replaceAll("**/", "::DOUBLE_STAR_DIR::").replaceAll("**", "::DOUBLE_STAR::").replaceAll("*", "::STAR::").replaceAll("?", "::QUESTION::");
+  const escaped = tokenized.replace(/[\\.^$+{}()|[\]]/g, "\\$&").replaceAll("::DOUBLE_STAR_DIR::", "(?:.*/)?").replaceAll("::DOUBLE_STAR::", ".*").replaceAll("::STAR::", "[^/]*").replaceAll("::QUESTION::", "[^/]");
+  const regex = new RegExp(`^${escaped}$`);
+  return (path) => regex.test(toPosixPath(path));
+}
+async function listFilesRecursively(rootDir) {
+  const output = [];
+  const queue = [rootDir];
+  while (queue.length > 0) {
+    const current = queue.pop();
+    if (!current) continue;
+    const entries = await readdir3(current, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(current, entry.name);
+      if (entry.isDirectory()) {
+        queue.push(fullPath);
+      } else if (entry.isFile()) {
+        output.push(fullPath);
+      }
+    }
+  }
+  return output;
+}
+async function summarizeContextFiles(repoPath, relPaths) {
+  const lines = [];
+  for (const relPath of relPaths) {
+    const fullPath = resolve6(repoPath, relPath);
+    const content = await readFile5(fullPath, "utf8");
+    const condensed = content.split(/\r?\n/u).map((line) => line.trim()).filter((line) => line.length > 0).filter((line) => line.startsWith("#") || line.startsWith("-") || line.startsWith("*"));
+    const selected = condensed.slice(0, 3);
+    if (selected.length > 0) {
+      lines.push(`${relPath}: ${selected.join(" | ")}`);
+    }
+  }
+  return lines;
+}
+async function hashContextFiles(repoPath, relPaths) {
+  const hash = createHash("sha256");
+  for (const relPath of relPaths) {
+    const fullPath = resolve6(repoPath, relPath);
+    const content = await readFile5(fullPath, "utf8");
+    hash.update(relPath);
+    hash.update("\n");
+    hash.update(content);
+    hash.update("\n");
+  }
+  return hash.digest("hex");
+}
+async function safeStat(path) {
+  try {
+    return await stat(path);
+  } catch {
+    return void 0;
+  }
+}
+function toPosixPath(value) {
+  return value.replaceAll("\\", "/");
+}
+
+// src/cli/commands/run/epic.ts
+import Table6 from "cli-table3";
+import PQueue3 from "p-queue";
+
 // src/cli/commands/run/pr.ts
+import { execa } from "execa";
 var GITHUB_API_BASE_URL = "https://api.github.com";
 var OAC_PR_TITLE_PREFIX = "[OAC]";
 async function createPullRequest(input2) {
@@ -1680,6 +1820,23 @@ async function createPullRequest(input2) {
     if (input2.task.linkedIssue) {
       prBodyLines.push(`- **Resolves:** #${input2.task.linkedIssue.number}`);
     }
+    const contextAck = readContextAck(input2.task);
+    if (contextAck) {
+      prBodyLines.push("", "## Repository Policy Acknowledgement", "");
+      prBodyLines.push("- **Context files read:**");
+      for (const file of contextAck.files.slice(0, 5)) {
+        prBodyLines.push(`  - \`${file}\``);
+      }
+      if (contextAck.summary.length > 0) {
+        prBodyLines.push("", "- **Policy summary used:**");
+        for (const line of contextAck.summary.slice(0, 5)) {
+          prBodyLines.push(`  - ${line}`);
+        }
+      }
+      if (contextAck.digest) {
+        prBodyLines.push("", `- **Context digest:** \`${contextAck.digest}\``);
+      }
+    }
     prBodyLines.push(
       "",
       "---",
@@ -1718,6 +1875,23 @@ async function createPullRequest(input2) {
     return void 0;
   }
 }
+function readContextAck(task) {
+  if (!task.metadata || typeof task.metadata !== "object" || task.metadata === null) {
+    return void 0;
+  }
+  const raw = task.metadata.contextAck;
+  if (!raw || typeof raw !== "object") return void 0;
+  const record = raw;
+  const files = Array.isArray(record.files) ? record.files.filter(
+    (item) => typeof item === "string" && item.trim().length > 0
+  ) : [];
+  if (files.length === 0) return void 0;
+  const summary = Array.isArray(record.summary) ? record.summary.filter(
+    (item) => typeof item === "string" && item.trim().length > 0
+  ) : [];
+  const digest = typeof record.digest === "string" && record.digest.trim().length > 0 ? record.digest : void 0;
+  return { files, summary, digest };
+}
 async function findExistingOacPR(repoFullName, issueNumber, token) {
   const url = `${GITHUB_API_BASE_URL}/repos/${repoFullName}/pulls?state=open&per_page=100&sort=updated&direction=desc`;
   try {
@@ -1759,8 +1933,186 @@ async function findExistingOacPR(repoFullName, issueNumber, token) {
 
 // src/cli/commands/run/task.ts
 import Table5 from "cli-table3";
-import { execa as execa2 } from "execa";
+import { execa as execa3 } from "execa";
 import PQueue2 from "p-queue";
+
+// src/cli/commands/run/tracking.ts
+import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
+import { join as join2, resolve as resolve7 } from "path";
+import { execa as execa2 } from "execa";
+async function writeTracking(ctx, params) {
+  const { resolvedRepo, providerId, totalBudget, candidateTasks, completedTasks } = params;
+  const runDurationSeconds = (Date.now() - ctx.runStartedAt) / 1e3;
+  const contributionLog = buildContributionLog({
+    runId: ctx.runId,
+    repoFullName: resolvedRepo.fullName,
+    repoHeadSha: resolvedRepo.git.headSha,
+    defaultBranch: resolvedRepo.meta.defaultBranch,
+    repoOwner: resolvedRepo.owner,
+    providerId,
+    totalBudget,
+    runDurationSeconds,
+    discoveredTasks: candidateTasks.length,
+    taskResults: completedTasks
+  });
+  const trackingSpinner = createSpinner(ctx.suppressOutput, "Writing contribution log...");
+  try {
+    const logPath = await writeContributionLog(contributionLog, resolvedRepo.localPath);
+    trackingSpinner?.succeed(`Contribution log written: ${logPath}`);
+    return logPath;
+  } catch (error) {
+    trackingSpinner?.fail("Failed to write contribution log");
+    if (ctx.globalOptions.verbose && !ctx.suppressOutput) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(ctx.ui.yellow(`[oac] Tracking failed: ${message}`));
+    }
+    return void 0;
+  }
+}
+function buildContributionLog(input2) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  const contributor = resolveGithubUsername(input2.repoOwner);
+  const contributionTasks = input2.taskResults.map((result) => ({
+    taskId: result.task.id,
+    title: result.task.title,
+    source: result.task.source,
+    complexity: result.task.complexity,
+    status: deriveTaskStatus(result.execution),
+    tokensUsed: Math.max(0, Math.floor(result.execution.totalTokensUsed)),
+    duration: Math.max(0, result.execution.duration),
+    filesChanged: result.execution.filesChanged,
+    pr: result.pr,
+    linkedIssue: result.task.linkedIssue ? {
+      number: result.task.linkedIssue.number,
+      url: result.task.linkedIssue.url
+    } : void 0,
+    error: result.execution.error
+  }));
+  const tasksSucceeded = contributionTasks.filter((task) => task.status !== "failed").length;
+  const tasksFailed = contributionTasks.length - tasksSucceeded;
+  const totalTokensUsed = contributionTasks.reduce((sum, task) => sum + task.tokensUsed, 0);
+  const totalFilesChanged = contributionTasks.reduce(
+    (sum, task) => sum + task.filesChanged.length,
+    0
+  );
+  return {
+    version: "1.0",
+    runId: input2.runId,
+    timestamp,
+    contributor: {
+      githubUsername: contributor,
+      email: process.env.GIT_AUTHOR_EMAIL ?? void 0
+    },
+    repo: {
+      fullName: input2.repoFullName,
+      headSha: input2.repoHeadSha,
+      defaultBranch: input2.defaultBranch
+    },
+    budget: {
+      provider: input2.providerId,
+      totalTokensBudgeted: input2.totalBudget,
+      totalTokensUsed
+    },
+    tasks: contributionTasks,
+    metrics: {
+      tasksDiscovered: input2.discoveredTasks,
+      tasksAttempted: contributionTasks.length,
+      tasksSucceeded,
+      tasksFailed,
+      totalDuration: Math.max(0, input2.runDurationSeconds),
+      totalFilesChanged,
+      totalLinesAdded: 0,
+      totalLinesRemoved: 0
+    }
+  };
+}
+function deriveTaskStatus(execution) {
+  if (execution.success) {
+    return "success";
+  }
+  if (execution.filesChanged.length > 0) {
+    return "partial";
+  }
+  return "failed";
+}
+function resolveGithubUsername(fallback) {
+  const candidates = [
+    process.env.GITHUB_USER,
+    process.env.GITHUB_USERNAME,
+    process.env.USER,
+    process.env.LOGNAME,
+    fallback,
+    "oac-user"
+  ];
+  for (const candidate of candidates) {
+    const normalized = sanitizeGithubUsername(candidate ?? "");
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return "oac-user";
+}
+function sanitizeGithubUsername(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const cleaned = trimmed.replace(/[^A-Za-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  if (cleaned.length === 0 || cleaned.length > 39) {
+    return null;
+  }
+  if (!/^(?!-)[A-Za-z0-9-]+(?<!-)$/.test(cleaned)) {
+    return null;
+  }
+  return cleaned;
+}
+async function writeContributionToSandbox(input2) {
+  const { sandboxPath, task, execution, runId, repoOwner } = input2;
+  const contributionsDir = resolve7(sandboxPath, ".oac", "contributions");
+  await mkdir2(contributionsDir, { recursive: true });
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  const contributor = resolveGithubUsername(repoOwner);
+  const datePrefix = timestamp.replace(/[:.]/g, "").replace("T", "-").slice(0, 15);
+  const safeTaskId = task.id.replace(/[^A-Za-z0-9-]/g, "-").replace(/-+/g, "-").slice(0, 40);
+  const filename = `${datePrefix}-${safeTaskId}.json`;
+  const metadata = {
+    version: "1.0",
+    runId,
+    timestamp,
+    contributor,
+    task: {
+      id: task.id,
+      title: task.title,
+      source: task.source,
+      complexity: task.complexity,
+      contextAck: isRecord2(task.metadata.contextAck) && Array.isArray(task.metadata.contextAck.files) ? {
+        files: task.metadata.contextAck.files,
+        summary: Array.isArray(task.metadata.contextAck.summary) ? task.metadata.contextAck.summary : [],
+        digest: typeof task.metadata.contextAck.digest === "string" ? task.metadata.contextAck.digest : void 0
+      } : void 0,
+      linkedIssue: task.linkedIssue ? { number: task.linkedIssue.number, url: task.linkedIssue.url } : void 0
+    },
+    execution: {
+      success: execution.success,
+      tokensUsed: execution.totalTokensUsed,
+      duration: execution.duration,
+      filesChanged: execution.filesChanged
+    }
+  };
+  const filePath = join2(contributionsDir, filename);
+  await writeFile2(filePath, `${JSON.stringify(metadata, null, 2)}
+`, "utf8");
+  try {
+    await execa2("git", ["add", filePath], { cwd: sandboxPath });
+    await execa2("git", ["commit", "-m", "[OAC] Add contribution metadata"], { cwd: sandboxPath });
+  } catch {
+  }
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null;
+}
+
+// src/cli/commands/run/task.ts
 async function discoverTasks(ctx, options, config, ghToken, resolvedRepo) {
   const scannerSelection = selectScannersFromConfig2(config, Boolean(ghToken));
   const minPriority = config?.discovery.minPriority ?? 20;
@@ -1854,7 +2206,9 @@ function renderDryRunDiff(ui, plan) {
     const sourceLabel = task.source.replace(/-/g, " ");
     const complexityColor = task.complexity === "trivial" || task.complexity === "simple" ? ui.green : task.complexity === "moderate" ? ui.yellow : ui.red;
     console.log(`${ui.green("+")} ${ui.bold(task.title)}`);
-    console.log(`  ${ui.dim(`source: ${sourceLabel}  complexity: `)}${complexityColor(task.complexity)}`);
+    console.log(
+      `  ${ui.dim(`source: ${sourceLabel}  complexity: `)}${complexityColor(task.complexity)}`
+    );
     if (task.targetFiles.length > 0) {
       for (const file of task.targetFiles.slice(0, 5)) {
         console.log(`  ${ui.yellow("~")} ${file}`);
@@ -1888,8 +2242,9 @@ async function executePlan(ctx, params) {
   const executedTasks = await Promise.all(
     plan.selectedTasks.map(
       (entry) => taskQueue.add(async () => {
+        const taskForExecution = withContextAck(entry.task, ctx.contextAck);
         const result = await executeWithAgent({
-          task: entry.task,
+          task: taskForExecution,
           estimate: entry.estimate,
           adapter,
           repoPath: resolvedRepo.localPath,
@@ -1903,7 +2258,7 @@ async function executePlan(ctx, params) {
           const pct = Math.round(completedCount / total * 100);
           executionSpinner.text = `Executing tasks... (${completedCount}/${total} \u2014 ${pct}%)`;
         }
-        return { task: entry.task, estimate: entry.estimate, execution, sandbox };
+        return { task: taskForExecution, estimate: entry.estimate, execution, sandbox };
       })
     )
   );
@@ -1914,6 +2269,16 @@ async function executePlan(ctx, params) {
     executedTasks.map(
       (result) => completionQueue.add(async () => {
         if (mode === "direct-commit" || !result.execution.success) return result;
+        if (result.sandbox) {
+          await writeContributionToSandbox({
+            sandboxPath: result.sandbox.sandboxPath,
+            task: result.task,
+            execution: result.execution,
+            runId: ctx.runId,
+            repoFullName: resolvedRepo.fullName,
+            repoOwner: resolvedRepo.owner
+          });
+        }
         const pr = await createPullRequest({
           task: result.task,
           execution: result.execution,
@@ -1983,6 +2348,18 @@ function selectScannersFromConfig2(config, hasGitHubAuth) {
   const { names, composite } = buildScanners(config, hasGitHubAuth);
   return { enabled: names, scanner: composite };
 }
+function withContextAck(task, contextAck) {
+  if (!contextAck) {
+    return task;
+  }
+  return {
+    ...task,
+    metadata: {
+      ...task.metadata,
+      contextAck
+    }
+  };
+}
 async function executeWithAgent(input2) {
   const startedAt = Date.now();
   const taskSlug = input2.task.id.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-").slice(0, 30);
@@ -1999,7 +2376,7 @@ async function executeWithAgent(input2) {
       tokenBudget: input2.estimate.totalEstimatedTokens,
       timeoutMs: input2.timeoutSeconds * 1e3
     });
-    const commitResult = await commitSandboxChanges(sandbox.path, input2.task);
+    const commitResult = await commitSandboxChanges(sandbox.path, input2.task, input2.baseBranch);
     const filesChanged = commitResult.filesChanged.length > 0 ? commitResult.filesChanged : result.filesChanged.length > 0 ? result.filesChanged : [];
     return {
       execution: {
@@ -2013,7 +2390,7 @@ async function executeWithAgent(input2) {
       sandbox: sandboxInfo
     };
   } catch (error) {
-    const commitResult = await commitSandboxChanges(sandbox.path, input2.task);
+    const commitResult = await commitSandboxChanges(sandbox.path, input2.task, input2.baseBranch);
     if (commitResult.hasChanges) {
       return {
         execution: {
@@ -2040,25 +2417,24 @@ async function executeWithAgent(input2) {
     };
   }
 }
-async function commitSandboxChanges(sandboxPath, task) {
+async function commitSandboxChanges(sandboxPath, task, baseBranch) {
   try {
-    const statusResult = await execa2("git", ["status", "--porcelain"], { cwd: sandboxPath });
-    if (!statusResult.stdout.trim()) {
-      return { hasChanges: false, filesChanged: [] };
-    }
-    await execa2("git", ["add", "-A"], { cwd: sandboxPath });
-    await execa2(
-      "git",
-      ["commit", "-m", `[OAC] ${task.title}
+    const statusResult = await execa3("git", ["status", "--porcelain"], { cwd: sandboxPath });
+    if (statusResult.stdout.trim()) {
+      await execa3("git", ["add", "-A"], { cwd: sandboxPath });
+      await execa3(
+        "git",
+        ["commit", "-m", `[OAC] ${task.title}
 
-Automated contribution by OAC using Codex CLI.`],
-      { cwd: sandboxPath }
-    );
-    const diffResult = await execa2("git", ["diff", "--name-only", "HEAD~1", "HEAD"], {
+Automated contribution by OAC.`],
+        { cwd: sandboxPath }
+      );
+    }
+    const diffResult = await execa3("git", ["diff", "--name-only", `origin/${baseBranch}`, "HEAD"], {
       cwd: sandboxPath
     });
     const changedFiles = diffResult.stdout.trim().split("\n").filter(Boolean);
-    return { hasChanges: true, filesChanged: changedFiles };
+    return { hasChanges: changedFiles.length > 0, filesChanged: changedFiles };
   } catch {
     return { hasChanges: false, filesChanged: [] };
   }
@@ -2143,134 +2519,6 @@ function renderTaskResults(ui, taskResults) {
   }
 }
 
-// src/cli/commands/run/tracking.ts
-async function writeTracking(ctx, params) {
-  const { resolvedRepo, providerId, totalBudget, candidateTasks, completedTasks } = params;
-  const runDurationSeconds = (Date.now() - ctx.runStartedAt) / 1e3;
-  const contributionLog = buildContributionLog({
-    runId: ctx.runId,
-    repoFullName: resolvedRepo.fullName,
-    repoHeadSha: resolvedRepo.git.headSha,
-    defaultBranch: resolvedRepo.meta.defaultBranch,
-    repoOwner: resolvedRepo.owner,
-    providerId,
-    totalBudget,
-    runDurationSeconds,
-    discoveredTasks: candidateTasks.length,
-    taskResults: completedTasks
-  });
-  const trackingSpinner = createSpinner(ctx.suppressOutput, "Writing contribution log...");
-  try {
-    const logPath = await writeContributionLog(contributionLog, resolvedRepo.localPath);
-    trackingSpinner?.succeed(`Contribution log written: ${logPath}`);
-    return logPath;
-  } catch (error) {
-    trackingSpinner?.fail("Failed to write contribution log");
-    if (ctx.globalOptions.verbose && !ctx.suppressOutput) {
-      const message = error instanceof Error ? error.message : String(error);
-      console.warn(ctx.ui.yellow(`[oac] Tracking failed: ${message}`));
-    }
-    return void 0;
-  }
-}
-function buildContributionLog(input2) {
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-  const contributor = resolveGithubUsername(input2.repoOwner);
-  const contributionTasks = input2.taskResults.map((result) => ({
-    taskId: result.task.id,
-    title: result.task.title,
-    source: result.task.source,
-    complexity: result.task.complexity,
-    status: deriveTaskStatus(result.execution),
-    tokensUsed: Math.max(0, Math.floor(result.execution.totalTokensUsed)),
-    duration: Math.max(0, result.execution.duration),
-    filesChanged: result.execution.filesChanged,
-    pr: result.pr,
-    linkedIssue: result.task.linkedIssue ? {
-      number: result.task.linkedIssue.number,
-      url: result.task.linkedIssue.url
-    } : void 0,
-    error: result.execution.error
-  }));
-  const tasksSucceeded = contributionTasks.filter((task) => task.status !== "failed").length;
-  const tasksFailed = contributionTasks.length - tasksSucceeded;
-  const totalTokensUsed = contributionTasks.reduce((sum, task) => sum + task.tokensUsed, 0);
-  const totalFilesChanged = contributionTasks.reduce(
-    (sum, task) => sum + task.filesChanged.length,
-    0
-  );
-  return {
-    version: "1.0",
-    runId: input2.runId,
-    timestamp,
-    contributor: {
-      githubUsername: contributor,
-      email: process.env.GIT_AUTHOR_EMAIL ?? void 0
-    },
-    repo: {
-      fullName: input2.repoFullName,
-      headSha: input2.repoHeadSha,
-      defaultBranch: input2.defaultBranch
-    },
-    budget: {
-      provider: input2.providerId,
-      totalTokensBudgeted: input2.totalBudget,
-      totalTokensUsed
-    },
-    tasks: contributionTasks,
-    metrics: {
-      tasksDiscovered: input2.discoveredTasks,
-      tasksAttempted: contributionTasks.length,
-      tasksSucceeded,
-      tasksFailed,
-      totalDuration: Math.max(0, input2.runDurationSeconds),
-      totalFilesChanged,
-      totalLinesAdded: 0,
-      totalLinesRemoved: 0
-    }
-  };
-}
-function deriveTaskStatus(execution) {
-  if (execution.success) {
-    return "success";
-  }
-  if (execution.filesChanged.length > 0) {
-    return "partial";
-  }
-  return "failed";
-}
-function resolveGithubUsername(fallback) {
-  const candidates = [
-    process.env.GITHUB_USER,
-    process.env.GITHUB_USERNAME,
-    process.env.USER,
-    process.env.LOGNAME,
-    fallback,
-    "oac-user"
-  ];
-  for (const candidate of candidates) {
-    const normalized = sanitizeGithubUsername(candidate ?? "");
-    if (normalized) {
-      return normalized;
-    }
-  }
-  return "oac-user";
-}
-function sanitizeGithubUsername(value) {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return null;
-  }
-  const cleaned = trimmed.replace(/[^A-Za-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
-  if (cleaned.length === 0 || cleaned.length > 39) {
-    return null;
-  }
-  if (!/^(?!-)[A-Za-z0-9-]+(?<!-)$/.test(cleaned)) {
-    return null;
-  }
-  return cleaned;
-}
-
 // src/cli/commands/run/epic.ts
 async function tryLoadOrAnalyzeEpics(ctx, params) {
   const { resolvedRepo, config, ghToken, contextDir, staleAfterMs } = params;
@@ -2330,8 +2578,8 @@ function makeStubEstimate(taskId, providerId, tokens) {
   };
 }
 async function executeEpicEntry(entry, params) {
-  const { adapter, resolvedRepo, providerId, timeoutSeconds, mode, ghToken } = params;
-  const task = epicAsTask(entry.epic);
+  const { adapter, resolvedRepo, providerId, timeoutSeconds, mode, ghToken, contextAck } = params;
+  const task = withContextAck2(epicAsTask(entry.epic), contextAck);
   const estimate = makeStubEstimate(task.id, providerId, entry.estimatedTokens);
   const result = await executeWithAgent({
     task,
@@ -2398,10 +2646,7 @@ async function runEpicPipeline(ctx, params) {
   const { adapter } = await resolveAdapter(providerId);
   let epicCompletedCount = 0;
   const epicTotal = epicPlan.selectedEpics.length;
-  const executionSpinner = createSpinner(
-    ctx.suppressOutput,
-    `Executing ${epicTotal} epic(s)...`
-  );
+  const executionSpinner = createSpinner(ctx.suppressOutput, `Executing ${epicTotal} epic(s)...`);
   const epicQueue = new PQueue3({ concurrency });
   const allTaskResults = await Promise.all(
     epicPlan.selectedEpics.map(
@@ -2420,7 +2665,8 @@ async function runEpicPipeline(ctx, params) {
           providerId,
           timeoutSeconds,
           mode,
-          ghToken
+          ghToken,
+          contextAck: ctx.contextAck
         });
         epicCompletedCount += 1;
         if (executionSpinner) {
@@ -2548,26 +2794,35 @@ function renderEpicPlanTable(ui, plan, budget) {
     }
   }
 }
+function withContextAck2(task, contextAck) {
+  if (!contextAck) return task;
+  return {
+    ...task,
+    metadata: {
+      ...task.metadata,
+      contextAck
+    }
+  };
+}
 
 // src/cli/commands/run/retry.ts
-import { readFile as readFile5, readdir as readdir3 } from "fs/promises";
-import { resolve as resolve6 } from "path";
+import { readFile as readFile6, readdir as readdir4 } from "fs/promises";
+import { resolve as resolve8 } from "path";
 async function readMostRecentContributionLog(repoPath) {
-  const contributionsPath = resolve6(repoPath, ".oac", "contributions");
+  const contributionsPath = resolve8(repoPath, ".oac", "contributions");
   let entries;
   try {
-    const dirEntries = await readdir3(contributionsPath, { withFileTypes: true, encoding: "utf8" });
+    const dirEntries = await readdir4(contributionsPath, { withFileTypes: true, encoding: "utf8" });
     entries = dirEntries.filter((e) => e.isFile() && e.name.endsWith(".json")).map((e) => e.name).sort((a, b) => b.localeCompare(a));
   } catch {
     return void 0;
   }
   for (const fileName of entries) {
     try {
-      const content = await readFile5(resolve6(contributionsPath, fileName), "utf8");
+      const content = await readFile6(resolve8(contributionsPath, fileName), "utf8");
       const parsed = contributionLogSchema.safeParse(JSON.parse(content));
       if (parsed.success) return parsed.data;
     } catch {
-      continue;
     }
   }
   return void 0;
@@ -2594,7 +2849,9 @@ async function runRetryPipeline(ctx, params) {
   if (!log) {
     retrySpinner?.fail("No contribution logs found in .oac/contributions/");
     if (!ctx.suppressOutput) {
-      console.log(ctx.ui.yellow("[oac] Run the pipeline at least once before using --retry-failed."));
+      console.log(
+        ctx.ui.yellow("[oac] Run the pipeline at least once before using --retry-failed.")
+      );
     }
     return [];
   }
@@ -2676,6 +2933,7 @@ async function runPipeline(options, globalOptions, ui) {
   const cloneSpinner = createSpinner(ctx.suppressOutput, "Preparing local clone...");
   await cloneRepo(resolvedRepo);
   cloneSpinner?.succeed(`Repository ready at ${resolvedRepo.localPath}`);
+  ctx.contextAck = await resolveContextAck(resolvedRepo.localPath, config, ui, ctx.suppressOutput);
   if (options.retryFailed) {
     const retryResults = await runRetryPipeline(ctx, {
       resolvedRepo,
@@ -2820,10 +3078,8 @@ function parseTokens(value) {
   return parseInteger(value);
 }
 function createRunCommand() {
-  const command = new Command10("run");
-  command.alias("r").description(
-    "Run the full OAC pipeline \u2014 analyze, plan, and execute in one command"
-  ).option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--tokens <value>", 'Token budget (number or "unlimited")', parseTokens).option("--provider <id>", "Agent provider id").option("--concurrency <number>", "Maximum parallel task executions", parseInteger).option("--dry-run", "Show plan without executing tasks", false).option("--mode <mode>", "Execution mode: new-pr|update-pr|direct-commit").option("--max-tasks <number>", "Maximum number of discovered tasks to consider", parseInteger).option("--timeout <seconds>", "Per-task timeout in seconds", parseInteger).option("--source <source>", "Filter tasks by source: lint, todo, github-issue, test-gap").option("--retry-failed", "Re-run only failed tasks from the most recent run", false).action(async (options, cmd) => {
+  const command = new Command9("run");
+  command.alias("r").description("Run the full OAC pipeline \u2014 analyze, plan, and execute in one command").option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--tokens <value>", 'Token budget (number or "unlimited")', parseTokens).option("--provider <id>", "Agent provider id").option("--concurrency <number>", "Maximum parallel task executions", parseInteger).option("--dry-run", "Show plan without executing tasks", false).option("--mode <mode>", "Execution mode: new-pr|update-pr|direct-commit").option("--max-tasks <number>", "Maximum number of discovered tasks to consider", parseInteger).option("--timeout <seconds>", "Per-task timeout in seconds", parseInteger).option("--source <source>", "Filter tasks by source: lint, todo, github-issue, test-gap").option("--retry-failed", "Re-run only failed tasks from the most recent run", false).action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
     validateRunOptions(options);
@@ -2857,10 +3113,10 @@ Exit Codes:
 
 // src/cli/commands/scan.ts
 import Table7 from "cli-table3";
-import { Command as Command11 } from "commander";
+import { Command as Command10 } from "commander";
 var SUPPORTED_SCANNERS = ["lint", "todo", "github-issues", "test-gap"];
 function createScanCommand() {
-  const command = new Command11("scan");
+  const command = new Command10("scan");
   command.description("Quick task discovery \u2014 list individual issues ranked by priority").option("--repo <owner/repo>", "Target repository (owner/repo or GitHub URL)").option("--scanners <names>", "Comma-separated scanner filter (lint,todo)").option("--min-priority <number>", "Minimum priority threshold (0-100)", parseInteger, 20).option("--format <format>", "Output format: table|json", "table").action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const ui = createUi(globalOptions);
@@ -3022,12 +3278,12 @@ function parseCsv(value) {
 }
 
 // src/cli/commands/status.ts
-import { readFile as readFile6 } from "fs/promises";
-import { resolve as resolve7 } from "path";
-import { Command as Command12 } from "commander";
+import { readFile as readFile7 } from "fs/promises";
+import { resolve as resolve9 } from "path";
+import { Command as Command11 } from "commander";
 var WATCH_INTERVAL_MS = 2e3;
 function createStatusCommand() {
-  const command = new Command12("status");
+  const command = new Command11("status");
   command.description("Show current job status").option("--watch", "Poll every 2 seconds", false).action(async (options, cmd) => {
     const globalOptions = getGlobalOptions(cmd);
     const render = async () => {
@@ -3062,9 +3318,9 @@ Examples:
   return command;
 }
 async function readRunStatus(repoPath) {
-  const statusPath = resolve7(repoPath, ".oac", "status.json");
+  const statusPath = resolve9(repoPath, ".oac", "status.json");
   try {
-    const raw = await readFile6(statusPath, "utf8");
+    const raw = await readFile7(statusPath, "utf8");
     const payload = JSON.parse(raw);
     return parseRunStatus(payload);
   } catch (error) {
@@ -3203,21 +3459,13 @@ function registerCommands(program) {
   program.addCommand(createExplainCommand());
 }
 async function createCliProgram() {
-  const version = true ? "2026.221.2" : "0.0.0";
-  const program = new Command13();
+  const version = true ? "2026.222.2" : "0.0.0";
+  const program = new Command12();
   program.name("oac").description("Open Agent Contribution CLI").version(version).option("--config <path>", "Config file path", "oac.config.ts").option("--verbose", "Enable verbose logging", false).option("--quiet", "Suppress non-error output", false).option("--json", "Output machine-readable JSON", false).option("--no-color", "Disable ANSI colors");
   registerCommands(program);
   program.addHelpText(
     "after",
-    `
-Getting Started:
-  $ oac init          Set up your project configuration
-  $ oac doctor        Verify your environment is ready
-  $ oac analyze       Analyze codebase for contribution opportunities
-  $ oac run           Run the full contribution pipeline
-
-Documentation: https://github.com/Open330/open-agent-contribution
-`
+    "\nGetting Started:\n  $ oac init          Set up your project configuration\n  $ oac doctor        Verify your environment is ready\n  $ oac analyze       Analyze codebase for contribution opportunities\n  $ oac run           Run the full contribution pipeline\n\nDocumentation: https://github.com/Open330/open-agent-contribution\n"
   );
   return program;
 }
@@ -3233,4 +3481,4 @@ export {
   createCliProgram,
   runCli
 };
-//# sourceMappingURL=chunk-VK33A5L4.js.map
+//# sourceMappingURL=chunk-ATVWSG75.js.map