@eve-horizon/cli 0.2.36 → 0.2.38

package/dist/index.js

@@ -49613,7 +49613,14 @@ for cloud deployments. Credentials are stored globally per API URL.`,
           "--dry-run          Show what would be set without actually setting",
           "",
           "Scope priority: --project > --org > user (default)",
-          "Default scope is user-level, so credentials are available to all your jobs."
+          "Default scope is user-level, so credentials are available to all your jobs.",
+          "",
+          "Token type guidance:",
+          "  Tokens starting with sk-ant-oat01-* are long-lived setup-tokens (preferred).",
+          "  A warning is emitted when syncing any other Claude token (short-lived OAuth,",
+          "  ~15h). Generate a long-lived token with: claude setup-token",
+          "  Codex/Code tokens are automatically written back to their originating secret",
+          "  scope after each job when the CLI refreshes them during the session."
         ],
         examples: [
           "eve auth sync                    # Sync to user-level (default)",
@@ -49627,7 +49634,10 @@ for cloud deployments. Credentials are stored globally per API URL.`,
         usage: "eve auth creds [--claude] [--codex]",
         options: [
           "--claude           Only check Claude/Anthropic credentials",
-          "--codex            Only check Codex/OpenAI credentials"
+          "--codex            Only check Codex/OpenAI credentials",
+          "",
+          "Shows token type for Claude (setup-token = long-lived, oauth = short-lived ~15h)",
+          "and expiry for Codex/Code tokens."
         ],
         examples: [
           "eve auth creds",
@@ -58189,7 +58199,9 @@ var SecretResolveRequestSchema = external_exports.object({
 var SecretResolveItemSchema = external_exports.object({
   key: external_exports.string(),
   value: external_exports.string(),
-  type: SecretTypeSchema
+  type: SecretTypeSchema,
+  scope_type: external_exports.enum(["user", "org", "project", "system"]).optional(),
+  scope_id: external_exports.string().optional()
 });
 var SecretResolveResponseSchema = external_exports.object({
   data: external_exports.array(SecretResolveItemSchema)
@@ -62188,6 +62200,84 @@ var import_child_process = require("child_process");
 var import_util4 = require("util");
 var execFileAsync = (0, import_util4.promisify)(import_child_process.execFile);
 
+// src/lib/logs.ts
+function normalizeLogLine(line) {
+  const kind = line.kind;
+  const raw = line.raw;
+  if (!kind || !raw) {
+    return {
+      type: line.type || "log",
+      message: line.message || line.text || void 0,
+      tool: line.tool,
+      toolInput: line.tool_input,
+      raw: line
+    };
+  }
+  const rawType = raw.type;
+  const item = raw.item;
+  if (rawType === "item.completed" && item) {
+    const itemType = item.type;
+    if (itemType === "agent_message" && typeof item.text === "string") {
+      return { type: "assistant", message: item.text, raw: line };
+    }
+    if (itemType === "command_execution") {
+      const cmd = item.command;
+      const exitCode = item.exit_code;
+      const status = item.status;
+      if (status === "completed" || exitCode !== void 0) {
+        return { type: "tool_result", message: `exit ${exitCode ?? "?"}`, tool: "bash", toolInput: cmd, raw: line };
+      }
+      return { type: "tool_use", tool: "bash", toolInput: cmd, raw: line };
+    }
+    if (itemType === "file_change") {
+      const changes = item.changes;
+      if (changes?.length) {
+        const summary = changes.map((c) => {
+          const changeKind = c.kind || "?";
+          const filePath = c.path || "";
+          const shortPath = filePath.split("/").slice(-3).join("/");
+          return `${changeKind}: ${shortPath}`;
+        }).join(", ");
+        return { type: "tool_use", tool: "file_change", toolInput: summary, raw: line };
+      }
+    }
+  }
+  if (rawType === "item.started" && item) {
+    const itemType = item.type;
+    if (itemType === "command_execution") {
+      const cmd = item.command;
+      return { type: "tool_use", tool: "bash", toolInput: cmd, raw: line };
+    }
+  }
+  if (rawType === "turn.completed") {
+    return { type: "skip", raw: line };
+  }
+  if (rawType === "assistant") {
+    const message = raw.message;
+    const text = message?.content?.filter((c) => c.text).map((c) => c.text).join("\n");
+    return { type: "assistant", message: text || void 0, raw: line };
+  }
+  if (kind === "assistant") {
+    const msg = raw.msg;
+    const text = msg?.text || item?.text || void 0;
+    return { type: "assistant", message: text, raw: line };
+  }
+  if (kind === "tool_use") {
+    return { type: "tool_use", tool: line.tool || void 0, raw: line };
+  }
+  if (kind === "error") {
+    return { type: "error", message: raw.error || raw.content || void 0, raw: line };
+  }
+  if (rawType === "stderr") {
+    const content = raw.content;
+    return { type: "status", message: content, raw: line };
+  }
+  if (rawType === "harness_startup") {
+    return { type: "skip", raw: line };
+  }
+  return { type: kind || "log", raw: line };
+}
+
 // src/commands/job.ts
 async function handleJob(subcommand, positionals, flags, context2) {
   const json = Boolean(flags.json);
@@ -63720,30 +63810,46 @@ function formatLogEntry(log) {
     }
     return;
   }
-  const message = line.message || line.text || "";
-  const tool = line.tool;
-  const toolInput = line.tool_input;
+  const normalized = normalizeLogLine(line);
+  const nType = normalized.type;
+  if (nType === "skip") return;
+  const message = normalized.message || line.message || line.text || "";
+  const tool = normalized.tool || line.tool || void 0;
+  const toolInput = normalized.toolInput || line.tool_input || void 0;
   const toolResult = line.tool_result;
-  switch (type) {
+  switch (nType) {
     case "assistant":
     case "text":
-      console.log(`[${timestamp}] \u{1F916} ${message || JSON.stringify(line)}`);
+      if (message) {
+        console.log(`[${timestamp}] ${message}`);
+      }
       break;
     case "tool_use":
-      console.log(`[${timestamp}] \u{1F527} ${tool || "tool"}: ${toolInput || JSON.stringify(line)}`);
+      if (tool) {
+        const inputPreview = toolInput ? ` ${toolInput.substring(0, 80)}${toolInput.length > 80 ? "..." : ""}` : "";
+        console.log(`[${timestamp}]   ${tool}${inputPreview}`);
+      }
       break;
     case "tool_result":
-      const resultPreview = (toolResult || "").substring(0, 100);
-      console.log(`[${timestamp}]    \u2192 ${resultPreview}${(toolResult?.length || 0) > 100 ? "..." : ""}`);
+      const resultPreview = (toolResult || normalized.message || "").substring(0, 100);
+      if (resultPreview) {
+        console.log(`[${timestamp}]    -> ${resultPreview}${(toolResult?.length || 0) > 100 ? "..." : ""}`);
+      }
       break;
     case "error":
-      console.log(`[${timestamp}] \u274C ${message || JSON.stringify(line)}`);
+      console.log(`[${timestamp}] Error: ${message || JSON.stringify(line)}`);
       break;
     case "status":
-      console.log(`[${timestamp}] \u2139\uFE0F  ${message || JSON.stringify(line)}`);
+      if (message) {
+        console.log(`[${timestamp}]   > ${message}`);
+      }
       break;
     default:
-      console.log(`[${timestamp}] ${JSON.stringify(line)}`);
+      if (message) {
+        console.log(`[${timestamp}] ${message}`);
+      } else if (Object.keys(line).length > 0) {
+        console.log(`[${timestamp}] ${JSON.stringify(line)}`);
+      }
   }
 }
 function getLifecycleIcon(phase) {
@@ -64664,10 +64770,13 @@ function formatFollowLogLine(event) {
     );
     return;
   }
-  const message = line.message || line.text || "";
-  const tool = line.tool;
-  const toolInput = line.tool_input;
-  switch (type) {
+  const normalized = normalizeLogLine(line);
+  const nType = normalized.type;
+  if (nType === "skip") return;
+  const message = normalized.message || line.message || line.text || "";
+  const tool = normalized.tool || line.tool || void 0;
+  const toolInput = normalized.toolInput || line.tool_input || void 0;
+  switch (nType) {
     case "assistant":
     case "text":
       if (message) {
@@ -64676,14 +64785,16 @@ function formatFollowLogLine(event) {
       break;
     case "tool_use":
       if (tool) {
-        const inputPreview = toolInput ? ` ${toolInput.substring(0, 60)}${toolInput.length > 60 ? "..." : ""}` : "";
-        console.log(`[${timestamp}] Tool: ${tool}${inputPreview}`);
+        const inputPreview = toolInput ? ` ${toolInput.substring(0, 80)}${toolInput.length > 80 ? "..." : ""}` : "";
+        console.log(`[${timestamp}]   ${tool}${inputPreview}`);
       }
       break;
     case "tool_result":
       break;
     case "status":
-      console.log(`[${timestamp}] ${message || JSON.stringify(line)}`);
+      if (message) {
+        console.log(`[${timestamp}]   > ${message}`);
+      }
       break;
     case "error":
       console.log(`[${timestamp}] Error: ${message || JSON.stringify(line)}`);
@@ -65559,6 +65670,18 @@ Permissions (${data.permissions.length}):`);
         );
         return;
       }
+      const warnings = [];
+      const claudeToken = extractedTokens.CLAUDE_CODE_OAUTH_TOKEN;
+      if (claudeToken && !claudeToken.startsWith("sk-ant-oat01-")) {
+        warnings.push("Found short-lived Claude OAuth token (expires in ~15h). For reliable agent execution, generate a long-lived token: claude setup-token\nThen re-run: eve auth sync");
+        if (!json) {
+          process.stderr.write(`\u26A0  Found short-lived Claude OAuth token (expires in ~15h).
+   For reliable agent execution, generate a long-lived token: claude setup-token
+   Then re-run: eve auth sync
+
+`);
+        }
+      }
       const targetLabel = scope.type === "user" ? "user" : scope.type === "org" ? `org ${scope.orgId}` : `project ${scope.projectId}`;
       if (dryRun) {
         const tokenList = Object.keys(extractedTokens).map((key) => ({
@@ -65566,7 +65689,7 @@ Permissions (${data.permissions.length}):`);
           value: `${extractedTokens[key].substring(0, 10)}...`
         }));
         outputJson(
-          { dry_run: true, would_set: tokenList, target: targetLabel, scope },
+          { dry_run: true, would_set: tokenList, target: targetLabel, scope, warnings },
           json,
           `Would set ${tokenList.length} token(s) on ${targetLabel}:
 ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
@@ -65601,7 +65724,8 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
           scope,
           results,
           success: successCount,
-          failed: failCount
+          failed: failCount,
+          warnings
         },
         json,
         `\u2713 Set ${successCount} secret(s) on ${targetLabel}${failCount > 0 ? ` (${failCount} failed)` : ""}`
@@ -65620,6 +65744,7 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
         let claudeSource = "";
         let claudePreview = "";
         let claudeExpires;
+        let claudeTokenType;
         if (plat === "darwin" && !claudeFound) {
           for (const service of ["Claude Code-credentials", "anthropic.claude"]) {
             try {
@@ -65630,7 +65755,15 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
               if (output) {
                 claudeFound = true;
                 claudeSource = `macOS Keychain (${service})`;
-                claudePreview = output.substring(0, 15) + "...";
+                let tokenStr = output;
+                try {
+                  const parsed = JSON.parse(output);
+                  const claudeOauth = parsed.claudeAiOauth;
+                  if (typeof claudeOauth?.accessToken === "string") tokenStr = claudeOauth.accessToken;
+                } catch {
+                }
+                claudeTokenType = tokenStr.startsWith("sk-ant-oat01-") ? "setup-token" : "oauth";
+                claudePreview = tokenStr.substring(0, 15) + "...";
                 break;
               }
             } catch {
@@ -65652,7 +65785,9 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
                 if (claudeOauth?.accessToken) {
                   claudeFound = true;
                   claudeSource = credPath.replace((0, import_node_os3.homedir)(), "~");
-                  claudePreview = claudeOauth.accessToken.substring(0, 15) + "...";
+                  const tokenStr = claudeOauth.accessToken;
+                  claudePreview = tokenStr.substring(0, 15) + "...";
+                  claudeTokenType = tokenStr.startsWith("sk-ant-oat01-") ? "setup-token" : "oauth";
                   if (claudeOauth.expiresAt) {
                     const expDate = new Date(claudeOauth.expiresAt);
                     claudeExpires = expDate.toISOString();
@@ -65664,6 +65799,7 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
                   claudeSource = credPath.replace((0, import_node_os3.homedir)(), "~");
                   const token = creds.oauth_token || creds.access_token;
                   claudePreview = token.substring(0, 15) + "...";
+                  claudeTokenType = token.startsWith("sk-ant-oat01-") ? "setup-token" : "oauth";
                   break;
                 }
               } catch {
@@ -65676,7 +65812,8 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
           source: claudeFound ? claudeSource : "not found",
           found: claudeFound,
           preview: claudePreview || void 0,
-          expiresAt: claudeExpires
+          expiresAt: claudeExpires,
+          tokenType: claudeTokenType
         });
       }
       if (checkCodex) {
@@ -65700,6 +65837,7 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
             }
           }
         }
+        let codexExpires;
         if (!codexFound) {
           const freshest = pickFreshestCodeAuth();
           if (freshest) {
@@ -65711,13 +65849,17 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
               codexSource += " (API key)";
               codexPreview = freshest.apiKey.substring(0, 10) + "...";
             }
+            if (freshest.expiresAt > 0) {
+              codexExpires = new Date(freshest.expiresAt * 1e3).toISOString();
+            }
           }
         }
         credentials2.push({
           name: "Codex/Code OAuth",
           source: codexFound ? codexSource : "not found",
           found: codexFound,
-          preview: codexPreview || void 0
+          preview: codexPreview || void 0,
+          expiresAt: codexExpires
         });
       }
       const foundCount = credentials2.filter((c) => c.found).length;
@@ -65731,6 +65873,10 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
         const status = cred.found ? "\u2713" : "\u2717";
         console.log(`  ${status} ${cred.name}`);
         console.log(`    Source: ${cred.source}`);
+        if (cred.tokenType) {
+          const typeLabel = cred.tokenType === "setup-token" ? "setup-token (long-lived)" : "oauth (short-lived, ~15h)";
+          console.log(`    Type:   ${typeLabel}`);
+        }
         if (cred.preview) {
           console.log(`    Token:  ${cred.preview}`);
         }
@@ -65738,8 +65884,8 @@ ${tokenList.map((t) => `  - ${t.name}`).join("\n")}`
           const expDate = new Date(cred.expiresAt);
           const now = /* @__PURE__ */ new Date();
           const isExpired = expDate < now;
-          const expLabel = isExpired ? "(expired)" : "";
-          console.log(`    Expires: ${cred.expiresAt} ${expLabel}`);
+          const expLabel = isExpired ? " (expired)" : "";
+          console.log(`    Expires: ${cred.expiresAt}${expLabel}`);
         }
         console.log("");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eve-horizon/cli",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "description": "Eve Horizon CLI",
   "license": "MIT",
   "repository": {
@@ -18,9 +18,6 @@
     "assets",
     "README.md"
   ],
-  "scripts": {
-    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node22 --outfile=dist/index.js --format=cjs --external:yaml"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -31,11 +28,14 @@
     "yaml": "^2.5.1"
   },
   "devDependencies": {
-    "@eve/migrate": "workspace:*",
-    "@eve/shared": "workspace:*",
     "@types/node": "^22.0.0",
     "esbuild": "^0.27.3",
     "postgres": "^3.4.0",
-    "typescript": "^5.7.0"
+    "typescript": "^5.7.0",
+    "@eve/migrate": "0.0.1",
+    "@eve/shared": "0.0.1"
+  },
+  "scripts": {
+    "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node22 --outfile=dist/index.js --format=cjs --external:yaml"
   }
-}
+}