@controlvector/cv-agent 1.9.2 → 1.10.1

package/dist/bundle.cjs

@@ -959,8 +959,8 @@ var require_command = __commonJS({
   "node_modules/commander/lib/command.js"(exports2) {
     var EventEmitter = require("node:events").EventEmitter;
     var childProcess = require("node:child_process");
-    var path = require("node:path");
-    var fs3 = require("node:fs");
+    var path3 = require("node:path");
+    var fs4 = require("node:fs");
     var process3 = require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1892,11 +1892,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path.resolve(baseDir, baseName);
-          if (fs3.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path.extname(baseName))) return void 0;
+          const localBin = path3.resolve(baseDir, baseName);
+          if (fs4.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path3.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs3.existsSync(`${localBin}${ext}`)
+            (ext) => fs4.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1908,21 +1908,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs3.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs4.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path.resolve(
-            path.dirname(resolvedScriptPath),
+          executableDir = path3.resolve(
+            path3.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path.basename(
+            const legacyName = path3.basename(
               this._scriptPath,
-              path.extname(this._scriptPath)
+              path3.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -1933,7 +1933,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path.extname(executableFile));
+        launchWithNode = sourceExt.includes(path3.extname(executableFile));
         let proc;
         if (process3.platform !== "win32") {
           if (launchWithNode) {
@@ -2773,7 +2773,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path.basename(filename, path.extname(filename));
+        this._name = path3.basename(filename, path3.extname(filename));
         return this;
       }
       /**
@@ -2787,9 +2787,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path2) {
-        if (path2 === void 0) return this._executableDir;
-        this._executableDir = path2;
+      executableDir(path4) {
+        if (path4 === void 0) return this._executableDir;
+        this._executableDir = path4;
         return this;
       }
       /**
@@ -4117,10 +4117,138 @@ function setupCommand() {
 
 // src/commands/agent.ts
 var import_node_child_process5 = require("node:child_process");
+var os3 = __toESM(require("node:os"));
+var path2 = __toESM(require("node:path"));
+
+// src/utils/event-queue.ts
+var import_node_fs2 = require("node:fs");
+var path = __toESM(require("node:path"));
+var EventQueue = class {
+  buffer = [];
+  sequence = 0;
+  drainPromise = null;
+  closed = false;
+  spillDirty = false;
+  spillPath;
+  poster;
+  maxRetries;
+  baseDelayMs;
+  onError;
+  constructor(opts) {
+    this.spillPath = opts.spillPath;
+    this.poster = opts.poster;
+    this.maxRetries = opts.maxRetries ?? 5;
+    this.baseDelayMs = opts.baseDelayMs ?? 1e3;
+    this.onError = opts.onError;
+  }
+  /** Load any events that were spilled to disk by a previous run. */
+  async loadSpill() {
+    try {
+      const raw = await import_node_fs2.promises.readFile(this.spillPath, "utf8");
+      const lines = raw.split("\n").filter((l) => l.trim().length > 0);
+      for (const line of lines) {
+        const ev = JSON.parse(line);
+        this.buffer.push(ev);
+        if (ev.sequence_number >= this.sequence) {
+          this.sequence = ev.sequence_number + 1;
+        }
+      }
+    } catch (err) {
+      if (err.code !== "ENOENT") throw err;
+    }
+  }
+  /** Assign the next sequence number. Callers that want to stamp manually can read this. */
+  nextSequence() {
+    return this.sequence++;
+  }
+  /** Enqueue an event. Returns the assigned sequence_number. */
+  enqueue(event) {
+    if (this.closed) {
+      throw new Error("EventQueue is closed");
+    }
+    const seq = event.sequence_number ?? this.nextSequence();
+    if (seq >= this.sequence) this.sequence = seq + 1;
+    this.buffer.push({ ...event, sequence_number: seq });
+    this.spillDirty = true;
+    this.drain().catch(() => {
+    });
+    return seq;
+  }
+  /** Drain the buffer, retrying transient failures. Serial — concurrent calls share the same promise. */
+  drain() {
+    if (this.drainPromise) return this.drainPromise;
+    this.drainPromise = this.drainInternal().finally(() => {
+      this.drainPromise = null;
+    });
+    return this.drainPromise;
+  }
+  async drainInternal() {
+    try {
+      while (this.buffer.length > 0) {
+        const ev = this.buffer[0];
+        let delivered = false;
+        for (let attempt = 0; attempt < this.maxRetries; attempt++) {
+          try {
+            await this.poster(ev);
+            delivered = true;
+            break;
+          } catch (err) {
+            this.onError?.(err instanceof Error ? err : new Error(String(err)), ev, attempt);
+            if (attempt < this.maxRetries - 1) {
+              await sleep(this.baseDelayMs * Math.pow(2, attempt));
+            }
+          }
+        }
+        if (delivered) {
+          this.buffer.shift();
+          this.spillDirty = true;
+        } else {
+          break;
+        }
+      }
+    } finally {
+      if (this.spillDirty) {
+        await this.writeSpill().catch(() => {
+        });
+      }
+    }
+  }
+  /** Flush: drain remaining events, then persist anything still pending to disk. */
+  async flush() {
+    await this.drain();
+    await this.writeSpill();
+  }
+  /** Mark the queue closed and flush. Safe to call multiple times. */
+  async close() {
+    if (this.closed) return;
+    this.closed = true;
+    await this.flush();
+  }
+  /** Number of events still pending delivery. */
+  size() {
+    return this.buffer.length;
+  }
+  async writeSpill() {
+    try {
+      if (this.buffer.length === 0) {
+        await import_node_fs2.promises.rm(this.spillPath, { force: true });
+      } else {
+        await import_node_fs2.promises.mkdir(path.dirname(this.spillPath), { recursive: true });
+        const body = this.buffer.map((e) => JSON.stringify(e)).join("\n") + "\n";
+        await import_node_fs2.promises.writeFile(this.spillPath, body, "utf8");
+      }
+      this.spillDirty = false;
+    } catch {
+    }
+  }
+};
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
 
 // src/utils/api.ts
-async function apiCall(creds, method, path, body) {
-  const url = `${creds.CV_HUB_API}${path}`;
+async function apiCall(creds, method, path3, body) {
+  const url = `${creds.CV_HUB_API}${path3}`;
   const headers = {
     "Authorization": `Bearer ${creds.CV_HUB_PAT}`,
     "Content-Type": "application/json"
@@ -4131,7 +4259,7 @@ async function apiCall(creds, method, path, body) {
     body: body ? JSON.stringify(body) : void 0
   });
 }
-async function registerExecutor(creds, machineName, workingDir, repositoryId, metadata) {
+async function registerExecutor(creds, machineName, workingDir, repositoryId, metadata, repoOwnerSlug) {
   const body = {
     name: `cva:${machineName}`,
     machine_name: machineName,
@@ -4150,7 +4278,23 @@ async function registerExecutor(creds, machineName, workingDir, repositoryId, me
   if (metadata?.tags) body.tags = metadata.tags;
   if (metadata?.owner_project) body.owner_project = metadata.owner_project;
   if (metadata?.integration) body.integration = metadata.integration;
-  const res = await apiCall(creds, "POST", "/api/v1/executors", body);
+  let res = await apiCall(creds, "POST", "/api/v1/executors", body);
+  if (res.status === 400 && repoOwnerSlug) {
+    try {
+      const errData = await res.json();
+      const orgs = errData.error?.organizations;
+      if (orgs && orgs.length > 0) {
+        const match = orgs.find(
+          (o) => o.slug.toLowerCase() === repoOwnerSlug.toLowerCase()
+        );
+        if (match) {
+          body.organization_id = match.id;
+          res = await apiCall(creds, "POST", "/api/v1/executors", body);
+        }
+      }
+    } catch {
+    }
+  }
   if (!res.ok) {
     const err = await res.text();
     throw new Error(`Failed to register executor: ${res.status} ${err}`);
@@ -4593,7 +4737,7 @@ async function writeConfig(config) {
 
 // src/commands/git-safety.ts
 var import_node_child_process3 = require("node:child_process");
-var import_node_fs2 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var import_node_path2 = require("node:path");
 var import_node_os3 = require("node:os");
 var DANGEROUS_PATTERNS = [
@@ -4629,7 +4773,7 @@ function checkWorkspaceSafety(workspaceRoot) {
   if (home.startsWith(resolved + "/")) {
     return `Workspace (${resolved}) is a parent of HOME. Refusing to auto-commit.`;
   }
-  if (!(0, import_node_fs2.existsSync)((0, import_node_path2.join)(resolved, ".git"))) {
+  if (!(0, import_node_fs3.existsSync)((0, import_node_path2.join)(resolved, ".git"))) {
     return `No .git directory in ${resolved}. Not a git repository.`;
   }
   return null;
@@ -4771,7 +4915,7 @@ Files: ${added} added, ${modified} modified, ${deleted} deleted`;
 
 // src/commands/deploy-manifest.ts
 var import_node_child_process4 = require("node:child_process");
-var import_node_fs3 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_node_path3 = require("node:path");
 function exec(cmd, cwd, timeoutMs = 3e5, env2) {
   try {
@@ -4816,9 +4960,9 @@ function getHeadCommit(cwd) {
 }
 function loadDeployManifest(workspaceRoot) {
   const manifestPath = (0, import_node_path3.join)(workspaceRoot, ".cva", "deploy.json");
-  if (!(0, import_node_fs3.existsSync)(manifestPath)) return null;
+  if (!(0, import_node_fs4.existsSync)(manifestPath)) return null;
   try {
-    const raw = (0, import_node_fs3.readFileSync)(manifestPath, "utf8");
+    const raw = (0, import_node_fs4.readFileSync)(manifestPath, "utf8");
     const manifest = JSON.parse(raw);
     if (!manifest.version || manifest.version < 1) {
       console.log("  [deploy] Invalid manifest version");
@@ -5185,6 +5329,7 @@ async function launchAutoApproveMode(prompt, options) {
   const pendingQuestionIds = [];
   let fullOutput = "";
   let lastProgressBytes = 0;
+  let totalBytesStreamed = 0;
   const runOnce = (inputPrompt, isContinue) => {
     return new Promise((resolve2, reject) => {
       const args = isContinue ? ["-p", inputPrompt, "--continue", "--allowedTools", ...ALLOWED_TOOLS] : ["-p", inputPrompt, "--allowedTools", ...ALLOWED_TOOLS];
@@ -5206,8 +5351,20 @@ async function launchAutoApproveMode(prompt, options) {
         process.stdout.write(data);
         fullOutput += text;
         if (fullOutput.length > MAX_OUTPUT_BYTES) {
+          const dropped = fullOutput.length - MAX_OUTPUT_BYTES;
           fullOutput = fullOutput.slice(-MAX_OUTPUT_BYTES);
+          options.eventQueue?.enqueue({
+            event_type: "output",
+            content: {
+              chunk: `
+[... ${dropped} bytes truncated from output buffer ...]
+`,
+              truncated_bytes: dropped,
+              byte_offset: totalBytesStreamed
+            }
+          });
         }
+        totalBytesStreamed += text.length;
         if (Date.now() - spawnTime < 1e4) {
           const authError = containsAuthError(fullOutput + stderr);
           if (authError) {
@@ -5258,10 +5415,9 @@ ${source_default.red("!")} Claude Code auth failure detected: "${authError}"`);
               ).catch(() => {
               });
             }
-            postTaskEvent(options.creds, options.taskId, {
+            options.eventQueue?.enqueue({
               event_type: "output",
-              content: { chunk, byte_offset: lastProgressBytes }
-            }).catch(() => {
+              content: { chunk, byte_offset: totalBytesStreamed }
             });
           }
         }
@@ -5337,6 +5493,7 @@ async function launchRelayMode(prompt, options) {
     let lastProgressBytes = 0;
     let authFailure = false;
     const spawnTime = Date.now();
+    let totalBytesStreamed = 0;
     child.stdin?.write(prompt + "\n");
     let lastRedirectCheck = Date.now();
     let lineBuffer = "";
@@ -5346,8 +5503,20 @@ async function launchRelayMode(prompt, options) {
       stdoutBuffer += text;
       fullOutput += text;
       if (fullOutput.length > MAX_OUTPUT_BYTES) {
+        const dropped = fullOutput.length - MAX_OUTPUT_BYTES;
         fullOutput = fullOutput.slice(-MAX_OUTPUT_BYTES);
+        options.eventQueue?.enqueue({
+          event_type: "output",
+          content: {
+            chunk: `
+[... ${dropped} bytes truncated from output buffer ...]
+`,
+            truncated_bytes: dropped,
+            byte_offset: totalBytesStreamed
+          }
+        });
       }
+      totalBytesStreamed += text.length;
       if (Date.now() - spawnTime < 1e4 && !authFailure) {
         const authError = containsAuthError(fullOutput + stderr);
         if (authError) {
@@ -5406,10 +5575,9 @@ ${source_default.red("!")} Claude Code auth failure detected: "${authError}"`);
           { output_chunk: chunk }
         ).catch(() => {
         });
-        postTaskEvent(options.creds, options.taskId, {
+        options.eventQueue?.enqueue({
           event_type: "output",
-          content: { chunk, byte_offset: lastProgressBytes }
-        }).catch(() => {
+          content: { chunk, byte_offset: totalBytesStreamed }
         });
       }
       if (Date.now() - lastRedirectCheck > 1e4) {
@@ -5727,16 +5895,16 @@ async function runAgent(options) {
     }
     const gitignorePath = require("path").join(workingDir, ".gitignore");
     try {
-      const fs3 = require("fs");
+      const fs4 = require("fs");
       const credPatterns = ".env\n.env.*\n.claude/\n.claude.json\n.credentials*\n*.pem\n*.key\n.ssh/\n.gnupg/\n.npm/\n.config/\n.zsh_history\n.bash_history\nnode_modules/\n.DS_Store\n";
       let existing = "";
       try {
-        existing = fs3.readFileSync(gitignorePath, "utf-8");
+        existing = fs4.readFileSync(gitignorePath, "utf-8");
       } catch {
       }
       if (!existing.includes(".claude/")) {
         const prefix = existing && !existing.endsWith("\n") ? "\n" : "";
-        fs3.writeFileSync(gitignorePath, existing + prefix + "# Credentials (auto-added by cv-agent)\n" + credPatterns);
+        fs4.writeFileSync(gitignorePath, existing + prefix + "# Credentials (auto-added by cv-agent)\n" + credPatterns);
         console.log(source_default.gray("   Bootstrap: .gitignore credential protection added"));
       }
     } catch {
@@ -5774,6 +5942,7 @@ async function runAgent(options) {
     }
   }
   let detectedRepoId;
+  let detectedOwnerSlug;
   try {
     const remoteUrl = (0, import_node_child_process5.execSync)("git remote get-url origin 2>/dev/null", {
       cwd: workingDir,
@@ -5785,6 +5954,7 @@ async function runAgent(options) {
     );
     if (cvHubMatch) {
       const [, repoOwner, repoSlug] = cvHubMatch;
+      detectedOwnerSlug = repoOwner;
       try {
         const repoData = await resolveRepoId(creds, repoOwner, repoSlug);
         if (repoData?.id) {
@@ -5796,6 +5966,9 @@ async function runAgent(options) {
     }
   } catch {
   }
+  if (options.org) {
+    detectedOwnerSlug = options.org;
+  }
   const wsConfig = await readWorkspaceConfig(workingDir);
   const globalConfig = await readConfig();
   const role = options.role || wsConfig.role || globalConfig.role || "development";
@@ -5836,7 +6009,7 @@ async function runAgent(options) {
     console.log(source_default.yellow(`   Guard:    ${guardIcon} ${dispatchGuard}`));
   }
   const executor = await withRetry(
-    () => registerExecutor(creds, machineName, workingDir, detectedRepoId, executorMeta),
+    () => registerExecutor(creds, machineName, workingDir, detectedRepoId, executorMeta, detectedOwnerSlug),
     "Executor registration"
   );
   const mode = options.autoApprove ? "auto-approve" : "relay";
@@ -5956,6 +6129,14 @@ ${source_default.red("Timeout")} Task timed out after ${formatDuration(timeoutMs
     console.log(source_default.gray(`   Git remote: ${remoteInfo.remoteName} -> ${remoteInfo.remoteUrl}`));
   }
   const prompt = buildClaudePrompt(task);
+  const spillPath = path2.join(os3.tmpdir(), "cva-event-queue", `${task.id}.ndjson`);
+  const eventQueue = new EventQueue({
+    spillPath,
+    poster: async (event) => {
+      await postTaskEvent(creds, task.id, event);
+    }
+  });
+  await eventQueue.loadSpill();
   try {
     const mode = options.autoApprove ? "auto-approve" : "relay";
     console.log(`\u{1F680} ${source_default.bold.green("RUNNING")}   \u2014 Launching Claude Code (${mode})...`);
@@ -5971,7 +6152,8 @@ ${source_default.red("Timeout")} Task timed out after ${formatDuration(timeoutMs
         taskId: task.id,
         executorId: state.executorId,
         spawnEnv: claudeEnv,
-        machineName: state.machineName
+        machineName: state.machineName,
+        eventQueue
       });
     } else {
       result = await launchRelayMode(prompt, {
@@ -5980,7 +6162,8 @@ ${source_default.red("Timeout")} Task timed out after ${formatDuration(timeoutMs
         executorId: state.executorId,
         taskId: task.id,
         spawnEnv: claudeEnv,
-        machineName: state.machineName
+        machineName: state.machineName,
+        eventQueue
       });
     }
     console.log(source_default.gray("\n" + "-".repeat(60)));
@@ -6041,14 +6224,13 @@ ${source_default.red("Timeout")} Task timed out after ${formatDuration(timeoutMs
         sendTaskLog(creds, state.executorId, task.id, "info", `Deploy manifest error: ${deployErr.message}`);
       }
     }
-    postTaskEvent(creds, task.id, {
+    eventQueue.enqueue({
       event_type: "completed",
       content: {
         exit_code: result.exitCode,
         duration_seconds: Math.round((Date.now() - startTime) / 1e3),
         files_changed: allChangedFiles.length
       }
-    }).catch(() => {
     });
     if (result.exitCode === 0) {
       if (allChangedFiles.length > 0) {
@@ -6073,14 +6255,13 @@ ${source_default.red("Timeout")} Task timed out after ${formatDuration(timeoutMs
       console.log();
       console.log(`\u2705 ${source_default.bold.green("COMPLETED")} \u2014 Duration: ${elapsed}`);
       printBanner("COMPLETED", elapsed, allChangedFiles, postGitState.headSha);
-      postTaskEvent(creds, task.id, {
+      eventQueue.enqueue({
         event_type: "output_final",
         content: {
           output: result.output.slice(-MAX_OUTPUT_FINAL_BYTES),
           exit_code: result.exitCode,
           duration_seconds: Math.round((Date.now() - startTime) / 1e3)
         }
-      }).catch(() => {
       });
       await withRetry(
         () => completeTask(creds, state.executorId, task.id, payload),
@@ -6169,6 +6350,10 @@ ${source_default.red("!")} Task error: ${err.message}`);
   } finally {
     clearInterval(heartbeatTimer);
     if (timeoutTimer) clearTimeout(timeoutTimer);
+    try {
+      await eventQueue.close();
+    } catch {
+    }
     state.currentTaskId = null;
     state.lastTaskEnd = Date.now();
   }
@@ -6192,6 +6377,7 @@ function agentCommand() {
   cmd.option("--dispatch-guard <guard>", "Dispatch guard: open, confirm, locked (default: open)");
   cmd.option("--tags <tags>", "Comma-separated tags for this executor");
   cmd.option("--owner-project <project>", "Project this executor belongs to");
+  cmd.option("--org <slug>", "Organization slug (auto-detected from repo owner if omitted)");
   cmd.action(async (opts) => {
     await runAgent(opts);
   });
@@ -6515,7 +6701,7 @@ function statusCommand() {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("cva").description('CV-Hub Agent \u2014 bridges Claude Code with CV-Hub task dispatch.\n\nRun "cva setup" to get started.').version(true ? "1.9.2" : "1.6.0");
+program2.name("cva").description('CV-Hub Agent \u2014 bridges Claude Code with CV-Hub task dispatch.\n\nRun "cva setup" to get started.').version(true ? "1.10.1" : "1.6.0");
 program2.addCommand(setupCommand());
 program2.addCommand(agentCommand());
 program2.addCommand(authCommand());