@ulpi/cli 0.1.2 → 0.1.4

package/dist/ci-STSL2LSP.js

@@ -0,0 +1,370 @@
+import {
+  buildPrompt
+} from "./chunk-B55DDP24.js";
+import {
+  external_exports
+} from "./chunk-KIKPIH6N.js";
+import "./chunk-4VNS5WPM.js";
+
+// src/commands/ci.ts
+import * as fs from "fs";
+import * as path from "path";
+import { spawn, execFileSync } from "child_process";
+import chalk from "chalk";
+
+// ../../packages/contracts-ci/dist/index.js
+var CiCommandTypeSchema = external_exports.enum(["run", "cancel", "fork", "status"]);
+var CiCommandSchema = external_exports.object({
+  type: CiCommandTypeSchema,
+  instruction: external_exports.string().optional(),
+  prNumber: external_exports.number().int().positive(),
+  repoFullName: external_exports.string(),
+  // "org/repo"
+  commentId: external_exports.number().int().positive(),
+  commentAuthor: external_exports.string(),
+  forkName: external_exports.string().optional()
+});
+var JobStatusSchema = external_exports.enum([
+  "queued",
+  "provisioning",
+  "running",
+  "completing",
+  "completed",
+  "failed",
+  "cancelled",
+  "timed_out"
+]);
+var JobConfigSchema = external_exports.object({
+  repoUrl: external_exports.string().url(),
+  ref: external_exports.string(),
+  baseBranch: external_exports.string(),
+  prNumber: external_exports.number().int().positive(),
+  repoFullName: external_exports.string(),
+  instruction: external_exports.string(),
+  jiraContext: external_exports.string().optional(),
+  timeoutMinutes: external_exports.number().int().positive().default(30),
+  envVars: external_exports.record(external_exports.string()).optional()
+});
+var JobResultSchema = external_exports.object({
+  jobId: external_exports.string(),
+  status: JobStatusSchema,
+  exitCode: external_exports.number().int().optional(),
+  diff: external_exports.string().optional(),
+  testOutput: external_exports.string().optional(),
+  summary: external_exports.string().optional(),
+  filesChanged: external_exports.array(external_exports.string()),
+  sessionEvents: external_exports.number().int().default(0),
+  durationMs: external_exports.number().int(),
+  error: external_exports.string().optional()
+});
+var JobSchema = external_exports.object({
+  id: external_exports.string(),
+  config: JobConfigSchema,
+  status: JobStatusSchema,
+  result: JobResultSchema.optional(),
+  containerId: external_exports.string().optional(),
+  workspaceDir: external_exports.string().optional(),
+  parentJobId: external_exports.string().optional(),
+  createdAt: external_exports.string().datetime(),
+  startedAt: external_exports.string().datetime().optional(),
+  completedAt: external_exports.string().datetime().optional(),
+  cancelledBy: external_exports.string().optional(),
+  commentId: external_exports.number().int().positive(),
+  commentAuthor: external_exports.string()
+});
+var GitHubAppAuthSchema = external_exports.object({
+  appId: external_exports.string(),
+  privateKeyPath: external_exports.string(),
+  webhookSecret: external_exports.string(),
+  installationId: external_exports.number().int().positive().optional()
+});
+var GitHubAuthConfigSchema = external_exports.discriminatedUnion("mode", [
+  external_exports.object({ mode: external_exports.literal("app"), config: GitHubAppAuthSchema }),
+  external_exports.object({ mode: external_exports.literal("pat"), token: external_exports.string() })
+]);
+var JiraConfigSchema = external_exports.object({
+  baseUrl: external_exports.string().url(),
+  email: external_exports.string().email(),
+  apiToken: external_exports.string(),
+  defaultProject: external_exports.string().optional()
+});
+var DockerConfigSchema = external_exports.object({
+  image: external_exports.string(),
+  network: external_exports.string().optional(),
+  memoryLimit: external_exports.string().optional(),
+  // e.g. "4g"
+  cpuLimit: external_exports.number().positive().optional(),
+  // e.g. 2.0
+  volumeBaseDir: external_exports.string(),
+  // Host path — used for Docker bind mounts
+  localVolumeBaseDir: external_exports.string().optional()
+  // Container-local path — used for fs ops (defaults to volumeBaseDir)
+});
+var SecurityConfigSchema = external_exports.object({
+  requireWriteAccess: external_exports.boolean().default(true),
+  allowedRepos: external_exports.array(external_exports.string()).optional(),
+  allowedAuthors: external_exports.array(external_exports.string()).optional(),
+  allowedOrgs: external_exports.array(external_exports.string()).optional(),
+  apiToken: external_exports.string(),
+  rateLimitWebhook: external_exports.number().int().positive().default(60),
+  rateLimitApi: external_exports.number().int().positive().default(200)
+});
+var OrchestratorConfigSchema = external_exports.object({
+  github: GitHubAuthConfigSchema,
+  jira: JiraConfigSchema.optional(),
+  docker: DockerConfigSchema,
+  jobs: external_exports.object({
+    maxConcurrent: external_exports.number().int().positive().default(3),
+    timeoutMinutes: external_exports.number().int().positive().default(30),
+    retainCompletedHours: external_exports.number().int().positive().default(72)
+  }),
+  security: SecurityConfigSchema,
+  port: external_exports.number().int().positive().default(3e3),
+  host: external_exports.string().default("0.0.0.0")
+});
+var ClaudeCredentialsSchema = external_exports.object({
+  blob: external_exports.string(),
+  // base64-encoded credentials directory contents
+  createdAt: external_exports.string().datetime(),
+  expiresAt: external_exports.string().datetime().optional()
+});
+var WorkerInputSchema = external_exports.object({
+  jobId: external_exports.string(),
+  config: JobConfigSchema,
+  claudeModel: external_exports.string().optional()
+});
+var WorkerOutputSchema = external_exports.object({
+  jobId: external_exports.string(),
+  result: JobResultSchema
+});
+var WorkerProgressSchema = external_exports.object({
+  phase: external_exports.string(),
+  message: external_exports.string(),
+  timestamp: external_exports.string().datetime()
+});
+var JiraTicketSchema = external_exports.object({
+  key: external_exports.string(),
+  // e.g. "ABC-123"
+  summary: external_exports.string(),
+  description: external_exports.string().optional(),
+  status: external_exports.string(),
+  assignee: external_exports.string().optional(),
+  priority: external_exports.string().optional(),
+  labels: external_exports.array(external_exports.string()),
+  acceptanceCriteria: external_exports.string().optional()
+});
+var JiraReferenceSchema = external_exports.object({
+  key: external_exports.string(),
+  url: external_exports.string().url()
+});
+
+// src/commands/ci.ts
+async function runCi(args, projectDir) {
+  const subcommand = args[0];
+  switch (subcommand) {
+    case "run":
+      return runCiJob(args.slice(1));
+    default:
+      console.log(`
+${chalk.bold("ulpi ci")} \u2014 CI/PR worker mode
+
+Usage: ulpi ci <command>
+
+Commands:
+  run     Execute a CI job (used inside worker containers)
+
+Options:
+  --job-id <id>       Job identifier
+  --config <json>     Job config (JSON string or from ULPI_JOB_CONFIG env)
+  --output <path>     Output file path for results
+  --model <model>     Claude model to use (default: claude-sonnet-4-20250514)
+`.trim());
+  }
+}
+async function runCiJob(args) {
+  let jobId = "";
+  let configJson = "";
+  let outputPath = "";
+  let model = "claude-sonnet-4-20250514";
+  for (let i = 0; i < args.length; i++) {
+    switch (args[i]) {
+      case "--job-id":
+        jobId = args[++i] ?? "";
+        break;
+      case "--config":
+        configJson = args[++i] ?? "";
+        break;
+      case "--output":
+        outputPath = args[++i] ?? "";
+        break;
+      case "--model":
+        model = args[++i] ?? model;
+        break;
+    }
+  }
+  jobId = jobId || process.env.ULPI_JOB_ID || "";
+  configJson = configJson || process.env.ULPI_JOB_CONFIG || "";
+  outputPath = outputPath || "/workspace/.ulpi-ci/output.json";
+  if (!jobId) {
+    console.error(chalk.red("Error: --job-id is required"));
+    process.exit(1);
+  }
+  if (!configJson) {
+    console.error(chalk.red("Error: --config is required (or set ULPI_JOB_CONFIG env)"));
+    process.exit(1);
+  }
+  let rawConfig;
+  try {
+    rawConfig = JSON.parse(configJson);
+  } catch {
+    console.error(chalk.red("Error: Invalid JSON in --config"));
+    process.exit(1);
+  }
+  const parseResult = JobConfigSchema.safeParse(rawConfig);
+  if (!parseResult.success) {
+    console.error(chalk.red("Error: Invalid job config:"));
+    console.error(parseResult.error.format());
+    process.exit(1);
+  }
+  const config = parseResult.data;
+  const startTime = Date.now();
+  console.log(chalk.blue(`[ulpi-ci] Job ${jobId} starting`));
+  console.log(chalk.blue(`[ulpi-ci] Instruction: ${config.instruction}`));
+  console.log(chalk.blue(`[ulpi-ci] Repo: ${config.repoFullName} PR#${config.prNumber}`));
+  const guardsPath = path.join(process.cwd(), ".ulpi", "guards.yml");
+  const hasGuards = fs.existsSync(guardsPath);
+  if (hasGuards) {
+    console.log(chalk.blue("[ulpi-ci] guards.yml found \u2014 rules will be enforced"));
+  }
+  const prompt = buildPrompt(config, {});
+  const claudePath = findClaudeBinary();
+  if (!claudePath) {
+    console.error(chalk.red("Error: claude binary not found in PATH"));
+    writeOutput(outputPath, {
+      jobId,
+      status: "failed",
+      filesChanged: [],
+      sessionEvents: 0,
+      durationMs: Date.now() - startTime,
+      error: "claude binary not found"
+    });
+    process.exit(1);
+  }
+  console.log(chalk.blue(`[ulpi-ci] Using claude at: ${claudePath}`));
+  const claudeArgs = [
+    "--print",
+    "--model",
+    model
+  ];
+  console.log(chalk.blue("[ulpi-ci] Spawning Claude Code..."));
+  const result = await spawnClaude(claudePath, claudeArgs, prompt, config.timeoutMinutes * 60 * 1e3);
+  const baseBranch = config.baseBranch;
+  let diff = "";
+  let filesChanged = [];
+  try {
+    diff = execFileSync("git", ["diff", `origin/${baseBranch}...HEAD`], {
+      cwd: process.cwd(),
+      encoding: "utf-8",
+      timeout: 3e4,
+      maxBuffer: 10 * 1024 * 1024
+    });
+  } catch {
+  }
+  try {
+    const output = execFileSync("git", ["diff", "--name-only", `origin/${baseBranch}...HEAD`], {
+      cwd: process.cwd(),
+      encoding: "utf-8",
+      timeout: 3e4
+    });
+    filesChanged = output.trim().split("\n").filter(Boolean);
+  } catch {
+  }
+  const jobResult = {
+    jobId,
+    status: result.exitCode === 0 ? "completed" : "failed",
+    exitCode: result.exitCode,
+    diff: diff || void 0,
+    summary: result.output.slice(0, 5e3) || void 0,
+    filesChanged,
+    sessionEvents: 0,
+    durationMs: Date.now() - startTime,
+    error: result.exitCode !== 0 ? `Claude exited with code ${result.exitCode}` : void 0
+  };
+  writeOutput(outputPath, jobResult);
+  console.log(chalk.blue(`[ulpi-ci] Job ${jobId} ${jobResult.status} in ${formatDuration(jobResult.durationMs)}`));
+  console.log(chalk.blue(`[ulpi-ci] Files changed: ${filesChanged.length}`));
+  process.exit(result.exitCode === 0 ? 0 : 1);
+}
+function findClaudeBinary() {
+  try {
+    const result = execFileSync("which", ["claude"], { encoding: "utf-8", timeout: 5e3 });
+    return result.trim();
+  } catch {
+  }
+  const commonPaths = ["/usr/local/bin/claude", "/usr/bin/claude"];
+  for (const p of commonPaths) {
+    if (fs.existsSync(p)) return p;
+  }
+  return null;
+}
+function spawnClaude(claudePath, args, prompt, timeoutMs) {
+  return new Promise((resolve) => {
+    const proc = spawn(claudePath, args, {
+      cwd: process.cwd(),
+      env: process.env,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (data) => {
+      const text = data.toString();
+      stdout += text;
+      process.stdout.write(text);
+    });
+    proc.stderr.on("data", (data) => {
+      const text = data.toString();
+      stderr += text;
+      process.stderr.write(text);
+    });
+    proc.stdin.write(prompt);
+    proc.stdin.end();
+    const timer = setTimeout(() => {
+      console.log(chalk.yellow("[ulpi-ci] Timeout reached, killing Claude process..."));
+      proc.kill("SIGTERM");
+      setTimeout(() => {
+        if (!proc.killed) proc.kill("SIGKILL");
+      }, 1e4);
+    }, timeoutMs);
+    proc.on("close", (code) => {
+      clearTimeout(timer);
+      resolve({ exitCode: code ?? 1, output: stdout });
+    });
+    const onSigterm = () => {
+      console.log(chalk.yellow("[ulpi-ci] Received SIGTERM, stopping Claude..."));
+      proc.kill("SIGTERM");
+    };
+    process.on("SIGTERM", onSigterm);
+    proc.on("close", () => {
+      process.removeListener("SIGTERM", onSigterm);
+    });
+  });
+}
+function writeOutput(outputPath, result) {
+  try {
+    const dir = path.dirname(outputPath);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(outputPath, JSON.stringify({ jobId: result.jobId, result }, null, 2), "utf-8");
+  } catch (err) {
+    console.error(chalk.red(`Error writing output: ${err instanceof Error ? err.message : String(err)}`));
+  }
+}
+function formatDuration(ms) {
+  const seconds = Math.floor(ms / 1e3);
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  const remainingSeconds = seconds % 60;
+  return `${minutes}m ${remainingSeconds}s`;
+}
+export {
+  runCi
+};

package/dist/{codemap-3BVYMMVM.js → codemap-RKSD4MIE.js}

@@ -69,7 +69,7 @@ async function initSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Index Project\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { runInitPipeline, loadCodemapConfig } = await import("./dist-MFFX7TZW.js");
+  const { runInitPipeline, loadCodemapConfig } = await import("./dist-CB5D5LMO.js");
   const config = loadCodemapConfig(projectDir);
   if (config.embedding.provider === "openai") {
     const { resolveApiKey } = await import("./dist-RKOGLK7R.js");
@@ -131,7 +131,7 @@ async function searchSubcommand(args, projectDir) {
   const noDocs = args.includes("--no-docs");
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { searchCode, getCodemapStatus } = await import("./dist-MFFX7TZW.js");
+  const { searchCode, getCodemapStatus } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   if (!status.initialized) {
     console.log(chalk.red("Error: CodeMap index not initialized."));
@@ -177,7 +177,7 @@ CodeMap Search \u2014 "${query}"
 async function statusSubcommand(projectDir) {
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { getCodemapStatus } = await import("./dist-MFFX7TZW.js");
+  const { getCodemapStatus } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   console.log(chalk.bold("\nCodeMap Status\n"));
   if (!status.initialized) {
@@ -208,7 +208,7 @@ async function reindexSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Re-index Project\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { getCodemapStatus } = await import("./dist-MFFX7TZW.js");
+  const { getCodemapStatus } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   if (!status.initialized) {
     console.log(chalk.yellow("Index not initialized. Running init instead..."));
@@ -219,7 +219,7 @@ async function depgraphSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Rebuild Dependency Graph\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { getCodemapStatus, rebuildDepgraph } = await import("./dist-MFFX7TZW.js");
+  const { getCodemapStatus, rebuildDepgraph } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   if (!status.initialized) {
     console.log(chalk.red("Error: CodeMap index not initialized. Run 'ulpi codemap init' first."));
@@ -245,7 +245,7 @@ async function depgraphSubcommand(projectDir) {
   }
 }
 async function configSubcommand(args, projectDir) {
-  const { loadCodemapConfig, saveCodemapConfig } = await import("./dist-MFFX7TZW.js");
+  const { loadCodemapConfig, saveCodemapConfig } = await import("./dist-CB5D5LMO.js");
   const config = loadCodemapConfig(projectDir);
   if (args.length === 0) {
     console.log(chalk.bold("\nCodeMap Configuration\n"));
@@ -318,7 +318,7 @@ async function watchSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Watch Mode\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { getCodemapStatus, CodemapWatcher } = await import("./dist-MFFX7TZW.js");
+  const { getCodemapStatus, CodemapWatcher } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   if (!status.initialized) {
     console.log(chalk.yellow("Index not initialized. Running init first..."));
@@ -349,7 +349,7 @@ async function exportSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Export Index\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { exportIndex } = await import("./dist-MFFX7TZW.js");
+  const { exportIndex } = await import("./dist-CB5D5LMO.js");
   try {
     const result = await exportIndex(projectDir, branch);
     console.log(chalk.green("\u2713 Export complete"));
@@ -368,7 +368,7 @@ async function importSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Import Index\n"));
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { importIndex } = await import("./dist-MFFX7TZW.js");
+  const { importIndex } = await import("./dist-CB5D5LMO.js");
   try {
     const result = await importIndex(projectDir, branch);
     if (!result.success) {
@@ -392,7 +392,7 @@ async function importSubcommand(projectDir) {
 async function serveSubcommand(projectDir) {
   const { getCurrentBranch } = await import("./dist-RKOGLK7R.js");
   const branch = getCurrentBranch(projectDir);
-  const { getCodemapStatus } = await import("./dist-MFFX7TZW.js");
+  const { getCodemapStatus } = await import("./dist-CB5D5LMO.js");
   const status = getCodemapStatus(projectDir, branch);
   if (!status.initialized) {
     console.error(chalk.red("Error: CodeMap index not initialized. Run 'ulpi codemap init' first."));
@@ -401,11 +401,11 @@ async function serveSubcommand(projectDir) {
   console.error(chalk.dim("[codemap-mcp] Starting MCP server..."));
   console.error(chalk.dim(`[codemap-mcp] Project: ${projectDir}`));
   console.error(chalk.dim(`[codemap-mcp] Index: ${status.totalFiles} files, ${status.totalChunks} chunks`));
-  const { startMcpServer } = await import("./dist-QYFQYSXP.js");
+  const { startMcpServer } = await import("./dist-UKMCJBB2.js");
   await startMcpServer({ projectDir, branch });
 }
 async function evalSubcommand(args, projectDir) {
-  const { runEvalHarness } = await import("./dist-MFFX7TZW.js");
+  const { runEvalHarness } = await import("./dist-CB5D5LMO.js");
   const path = await import("path");
   const datasetIdx = args.indexOf("--dataset");
   let datasetPath;
@@ -448,7 +448,7 @@ async function evalSubcommand(args, projectDir) {
 }
 async function migrateIndexSubcommand(projectDir) {
   console.log(chalk.bold("\nCodeMap \u2014 Migrate Legacy Index\n"));
-  const { migrateFromLegacy } = await import("./dist-MFFX7TZW.js");
+  const { migrateFromLegacy } = await import("./dist-CB5D5LMO.js");
   try {
     const result = await migrateFromLegacy(projectDir);
     if (!result.migrated) {

package/dist/{dist-MFFX7TZW.js → dist-CB5D5LMO.js}

@@ -61,8 +61,8 @@ import {
   searchCode,
   searchSymbols,
   tokenize
-} from "./chunk-VGZLMUNO.js";
-import "./chunk-NNUWU6CV.js";
+} from "./chunk-5J6NLQUN.js";
+import "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import "./chunk-74WVVWJ4.js";
 import "./chunk-KIKPIH6N.js";

package/dist/{dist-3SNTTNM3.js → dist-CS2VKNYS.js}

@@ -15,9 +15,9 @@ import {
   removeEntry,
   searchMemory,
   updateEntry
-} from "./chunk-FNPD3V2X.js";
-import "./chunk-VGZLMUNO.js";
-import "./chunk-NNUWU6CV.js";
+} from "./chunk-PDR55ZNW.js";
+import "./chunk-5J6NLQUN.js";
+import "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import "./chunk-74WVVWJ4.js";
 import "./chunk-KIKPIH6N.js";

package/dist/{dist-57UMTPGR.js → dist-GJYT2OQV.js}

@@ -10,6 +10,7 @@ import {
   classifySession,
   classifySinglePrompt,
   classifyWindow,
+  clearClassifyBatchProgress,
   deduplicateMemories,
   exportMemories,
   filterSignificantEvents,
@@ -34,6 +35,7 @@ import {
   parseClassifierOutput,
   readCapturedEvents,
   readCapturedTranscript,
+  readClassifyBatchProgress,
   redactContent,
   reindexMemories,
   releaseMemoryLock,
@@ -45,10 +47,11 @@ import {
   searchMemory,
   toClassificationEvent,
   updateEntry,
+  writeClassifyBatchProgress,
   writeMemoryStats
-} from "./chunk-FNPD3V2X.js";
-import "./chunk-VGZLMUNO.js";
-import "./chunk-NNUWU6CV.js";
+} from "./chunk-PDR55ZNW.js";
+import "./chunk-5J6NLQUN.js";
+import "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import "./chunk-74WVVWJ4.js";
 import "./chunk-KIKPIH6N.js";
@@ -69,6 +72,7 @@ export {
   classifySession,
   classifySinglePrompt,
   classifyWindow,
+  clearClassifyBatchProgress,
   deduplicateMemories,
   exportMemories,
   filterSignificantEvents,
@@ -93,6 +97,7 @@ export {
   parseClassifierOutput,
   readCapturedEvents,
   readCapturedTranscript,
+  readClassifyBatchProgress,
   redactContent,
   reindexMemories,
   releaseMemoryLock,
@@ -104,5 +109,6 @@ export {
   searchMemory,
   toClassificationEvent,
   updateEntry,
+  writeClassifyBatchProgress,
   writeMemoryStats
 };

package/dist/{dist-RJGCUS3L.js → dist-QAU3LGJN.js}

@@ -20,6 +20,7 @@ import {
   initHistoryBranch,
   installGitHooks,
   listBranchDir,
+  listBranchOnlyCommits,
   listCommitsBetween,
   listRecentCommits,
   loadActiveGuards,
@@ -39,7 +40,7 @@ import {
   withWorktree,
   writeAndStage,
   writeHistoryEntry
-} from "./chunk-NNUWU6CV.js";
+} from "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import "./chunk-7LXY5UVC.js";
 import "./chunk-4VNS5WPM.js";
@@ -65,6 +66,7 @@ export {
   initHistoryBranch,
   installGitHooks,
   listBranchDir,
+  listBranchOnlyCommits,
   listCommitsBetween,
   listRecentCommits,
   loadActiveGuards,

package/dist/{dist-QYFQYSXP.js → dist-UKMCJBB2.js}

@@ -12,8 +12,8 @@ import {
   runInitPipeline,
   searchCode,
   searchSymbols
-} from "./chunk-VGZLMUNO.js";
-import "./chunk-NNUWU6CV.js";
+} from "./chunk-5J6NLQUN.js";
+import "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import "./chunk-74WVVWJ4.js";
 import "./chunk-KIKPIH6N.js";

package/dist/{history-UG65BCO6.js → history-3MOBX4MA.js}

@@ -10,6 +10,7 @@ import {
   getCurrentHead,
   historyBranchExists,
   initHistoryBranch,
+  listBranchOnlyCommits,
   listRecentCommits,
   loadActiveGuards,
   readBranchMeta,
@@ -18,7 +19,7 @@ import {
   readTimeline,
   updateEntryEnrichment,
   writeHistoryEntry
-} from "./chunk-NNUWU6CV.js";
+} from "./chunk-JGBXM5NC.js";
 import "./chunk-YM2HV4IA.js";
 import {
   DEFAULT_AI_MODEL,
@@ -415,7 +416,7 @@ async function initSubcommand(projectDir) {
   }
   const projectName = path2.basename(projectDir);
   try {
-    initHistoryBranch(projectDir, projectName, "0.1.2");
+    initHistoryBranch(projectDir, projectName, "0.1.4");
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     console.log(chalk.red(`Error: ${message}`));
@@ -423,7 +424,7 @@ async function initSubcommand(projectDir) {
   }
   if (collectReviewPlans) {
     try {
-      const { withWorktree, writeAndStage, commitInWorktree } = await import("./dist-RJGCUS3L.js");
+      const { withWorktree, writeAndStage, commitInWorktree } = await import("./dist-QAU3LGJN.js");
       const meta = readBranchMeta(projectDir);
       if (meta) {
         meta.config.collectReviewPlans = true;
@@ -446,7 +447,7 @@ async function initSubcommand(projectDir) {
   );
   if (installHooksAnswer.trim().toLowerCase() !== "n") {
     try {
-      const { installGitHooks } = await import("./dist-RJGCUS3L.js");
+      const { installGitHooks } = await import("./dist-QAU3LGJN.js");
       const { getBinaryPath } = await import("./dist-RKOGLK7R.js");
       const binaryPath = getBinaryPath();
       const result = installGitHooks(projectDir, binaryPath);
@@ -531,10 +532,12 @@ async function backfillSubcommand(args, projectDir) {
   if (args[0] && !args[0].startsWith("--") && /^\d+$/.test(args[0])) {
     limit = parseInt(args[0], 10);
   }
+  const branchOnly = args.includes("--branch-only");
+  const label = branchOnly ? "branch-only commits" : `last ${limit} commits`;
   console.log(chalk.bold(`
-ULPI History \u2014 Backfill (last ${limit} commits)
+ULPI History \u2014 Backfill (${label})
 `));
-  const commits = listRecentCommits(projectDir, limit);
+  const commits = branchOnly ? listBranchOnlyCommits(projectDir, limit) : listRecentCommits(projectDir, limit);
   if (commits.length === 0) {
     console.log(chalk.yellow("No commits found."));
     return;