omniagent 0.1.8 → 0.1.9

package/dist/cli.js

@@ -1402,7 +1402,7 @@ const codexTarget = {
       timeoutMs: 6e4
     },
     extract: async (context) => {
-      const { extractCodexUsage } = await import("./codex-Cl1dWwMk.js");
+      const { extractCodexUsage } = await import("./codex-D1RuzsY6.js");
       return extractCodexUsage(context);
     }
   }
@@ -8376,7 +8376,7 @@ function getTargetCliCommands(target) {
   add(target.cli?.modes?.oneShot?.command);
   return commands;
 }
-async function checkCliOnPath(command) {
+async function checkCliOnPath(command, options = {}) {
   const normalized = normalizeCommand(command);
   if (!normalized) {
     return { command: command ?? "", result: "unavailable" };
@@ -8387,7 +8387,7 @@ async function checkCliOnPath(command) {
   if (hasPathSeparator(normalized)) {
     for (const candidate of candidates) {
       const check = await checkExecutable(candidate);
-      if (check.status === "available") {
+      if (check.status === "available" && await isValidCandidate(check.resolvedPath, options.validateCandidate)) {
         return { command: normalized, result: "available", resolvedPath: check.resolvedPath };
       }
       if (check.status === "inconclusive") {
@@ -8415,7 +8415,7 @@ async function checkCliOnPath(command) {
     for (const candidate of candidates) {
       const fullPath = path.join(entry2, candidate);
       const check = await checkExecutable(fullPath);
-      if (check.status === "available") {
+      if (check.status === "available" && await isValidCandidate(check.resolvedPath, options.validateCandidate)) {
         return { command: normalized, result: "available", resolvedPath: check.resolvedPath };
       }
       if (check.status === "inconclusive") {
@@ -8432,6 +8432,16 @@ async function checkCliOnPath(command) {
   }
   return { command: normalized, result: "unavailable" };
 }
+async function isValidCandidate(resolvedPath, validateCandidate) {
+  if (!validateCandidate) {
+    return true;
+  }
+  try {
+    return await validateCandidate(resolvedPath);
+  } catch {
+    return false;
+  }
+}
 async function checkTargetAvailability(target) {
   const commands = getTargetCliCommands(target);
   if (commands.length === 0) {
@@ -10666,7 +10676,9 @@ async function checkUsageCommandAvailability(target) {
       warnings: []
     };
   }
-  const check = await checkCliOnPath(command);
+  const check = await checkCliOnPath(command, {
+    validateCandidate: target.id === "codex" && command === "codex" ? validateCodexCommand : void 0
+  });
   if (check.result === "available") {
     return {
       status: "available",
@@ -10688,6 +10700,29 @@ async function checkUsageCommandAvailability(target) {
     warnings: []
   };
 }
+function validateCodexCommand(candidate) {
+  return new Promise((resolve) => {
+    const child = spawn(candidate, ["--version"], {
+      stdio: "ignore"
+    });
+    let settled = false;
+    let timeout;
+    const finish = (valid) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearTimeout(timeout);
+      resolve(valid);
+    };
+    timeout = setTimeout(() => {
+      child.kill();
+      finish(false);
+    }, 2e3);
+    child.on("error", () => finish(false));
+    child.on("exit", (code) => finish(code === 0));
+  });
+}
 function buildContext(options) {
   const windows = uniqueNormalizedWindows(options.target.usage?.windows ?? []);
   const launch = {
@@ -10988,16 +11023,20 @@ function formatWindowLabel(window) {
   }
   return window;
 }
+function formatUsageAgentName(targetId, displayName) {
+  return targetId === "codex" && displayName === "OpenAI Codex" ? "Codex CLI" : displayName;
+}
 function formatUsageTable(envelope, sortKey) {
   const useColor = shouldUseColor();
   const generatedAt = parseDate(envelope.generatedAt) ?? /* @__PURE__ */ new Date();
   const rows = [];
   for (const target of envelope.targets) {
     const limitLabels = formatLimitLabels(target.limits);
+    const agentName = formatUsageAgentName(target.targetId, target.displayName);
     target.limits.forEach((limit, index) => {
       rows.push({
         status: "ok",
-        agent: sortKey == null && index > 0 ? "" : target.displayName,
+        agent: sortKey == null && index > 0 ? "" : agentName,
         limitLabel: limitLabels[index] ?? formatLimitLabel(limit),
         reset: formatResetValue(limit, generatedAt),
         limit
@@ -11007,7 +11046,7 @@ function formatUsageTable(envelope, sortKey) {
   for (const error of envelope.errors) {
     rows.push({
       status: "error",
-      agent: error.displayName,
+      agent: formatUsageAgentName(error.targetId, error.displayName),
       limitLabel: "error",
       message: error.message
     });
@@ -11262,16 +11301,7 @@ async function runUsageCommand(argv) {
     return null;
   }
   const startDir = process.cwd();
-  const repoRoot = await findRepoRoot(startDir);
-  if (!repoRoot) {
-    printError({
-      json: jsonOutput,
-      code: "repo_not_found",
-      message: `Repository root not found starting from ${startDir}. Looked for .git or package.json.`,
-      exitCode: 1
-    });
-    return null;
-  }
+  const repoRoot = await findRepoRoot(startDir) ?? startDir;
   const agentsDirResolution = resolveAgentsDir(repoRoot, argv.agentsDir);
   if (agentsDirResolution.source === "override") {
     const validation2 = await validateAgentsDir(repoRoot, argv.agentsDir, { requireWrite: false });
@@ -11535,7 +11565,7 @@ const usageCommand = {
     describe: "Per-agent extraction timeout. Bare numbers are seconds; units include ms, s, and m."
   }).option("agentsDir", {
     type: "string",
-    describe: "Override the agents directory (relative paths resolve from the project root)",
+    describe: "Override the agents directory (relative paths resolve from the project root, or the current directory outside a repo)",
     defaultDescription: DEFAULT_AGENTS_DIR,
     coerce: (value) => {
       if (typeof value !== "string") {

package/dist/{codex-Cl1dWwMk.js → codex-D1RuzsY6.js}

@@ -1,5 +1,5 @@
 import { c as cleanControlOutput, b as parsePercentRemaining, m as makeUsageLimit, d as parseResetText } from "./cli.js";
-import { r as runPtyScenario, t as typeTextSteps, e as enterKey } from "./pty-CZBSAJzE.js";
+import { r as runPtyScenario, e as enterKey, t as typeTextSteps } from "./pty-CZBSAJzE.js";
 const CODEX_WINDOWS = [
   ["main", "5h", "main5hLimit"],
   ["main", "weekly", "mainWeeklyLimit"],
@@ -12,13 +12,15 @@ async function extractCodexUsage(context) {
   const ptyResult = await runPtyScenario({
     command,
     args: context.launch?.args ?? ["--no-alt-screen"],
-    cwd: context.repoRoot,
+    cwd: context.homeDir,
     cols: 100,
     rows: 40,
     timeoutMs: context.launch?.timeoutMs ?? 6e4,
     signal: context.signal,
     debug: context.debug,
     steps: [
+      { waitFor: isCodexPromptReadyOrTrustPrompt, waitForTimeoutMs: 1e4 },
+      { write: enterKey(), skipIf: isCodexPromptReady },
       { waitFor: isCodexPromptReady, waitForTimeoutMs: 1e4 },
       ...typeTextSteps("/status", 20),
       { write: enterKey() },
@@ -81,6 +83,14 @@ function isCodexPromptReady(snapshot) {
 ${snapshot.raw}`);
   return /(?:\u203a|>)\s/.test(cleanedOutput) && /\bContext\b/i.test(cleanedOutput);
 }
+function isCodexPromptReadyOrTrustPrompt(snapshot) {
+  return isCodexPromptReady(snapshot) || isCodexTrustPrompt(snapshot);
+}
+function isCodexTrustPrompt(snapshot) {
+  const cleanedOutput = cleanControlOutput(`${snapshot.screen}
+${snapshot.raw}`);
+  return /do you trust the contents of this directory/i.test(cleanedOutput);
+}
 function hasCodexStatusLimits(snapshot) {
   const cleanedOutput = cleanControlOutput(`${snapshot.screen}
 ${snapshot.raw}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omniagent",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Unified agent configuration CLI that compiles canonical agent configs to multiple runtimes.",
   "type": "module",
   "bin": {