orchestrating 0.1.38 → 0.2.0

package/bin/orch

@@ -242,6 +242,50 @@ if (firstArg === "logout") {
   process.exit(0);
 }
 
+// --- Config subcommand: manage API key and settings ---
+const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
+
+function loadConfig() {
+  try {
+    return JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+
+function saveConfig(data) {
+  mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2) + "\n");
+}
+
+if (firstArg === "config") {
+  const configArgs = process.argv.slice(3);
+  if (configArgs[0] === "set" && configArgs[1] === "api-key" && configArgs[2]) {
+    const config = loadConfig();
+    config.anthropic_api_key = configArgs[2];
+    saveConfig(config);
+    console.log("Anthropic API key saved. Claude Code will use this key automatically.");
+  } else if (configArgs[0] === "get" && configArgs[1] === "api-key") {
+    const config = loadConfig();
+    if (config.anthropic_api_key) {
+      console.log(`API key: ${config.anthropic_api_key.slice(0, 10)}…${config.anthropic_api_key.slice(-4)}`);
+    } else {
+      console.log("No API key configured. Run: orch config set api-key <your-anthropic-key>");
+    }
+  } else if (configArgs[0] === "unset" && configArgs[1] === "api-key") {
+    const config = loadConfig();
+    delete config.anthropic_api_key;
+    saveConfig(config);
+    console.log("API key removed.");
+  } else {
+    console.error("Usage:");
+    console.error("  orch config set api-key <key>   Save your Anthropic API key");
+    console.error("  orch config get api-key          Show stored API key");
+    console.error("  orch config unset api-key        Remove stored API key");
+  }
+  process.exit(0);
+}
+
 if (firstArg === "daemon") {
   const daemonArgs = process.argv.slice(3);
   const pidFile = path.join(os.homedir(), ".orch-daemon.pid");
@@ -740,6 +784,7 @@ while (i < args.length) {
     console.error("Usage: orch [-l label] [-y] <command> [args...]");
     console.error("       orch login    — Authenticate with orchestrat.ing");
     console.error("       orch logout   — Clear stored credentials");
+    console.error("       orch config   — Manage settings (API keys, etc.)");
     console.error("       orch daemon   — Run background daemon for remote session launching");
     console.error("");
     console.error("  -l <label>          Optional human-readable session label");
@@ -763,6 +808,10 @@ while (i < args.length) {
     console.error("  orch daemon -b");
     console.error("  orch daemon --enable");
     console.error("");
+    console.error("Setup (one-time):");
+    console.error("  orch login");
+    console.error('  orch config set api-key sk-ant-...   # Your Anthropic API key');
+    console.error("");
     console.error("Environment:");
     console.error("  ORC_URL      WebSocket server URL (default: wss://api.orchestrat.ing/ws)");
     console.error("  ORC_TOKEN    Auth token (overrides stored credentials)");
@@ -779,7 +828,19 @@ if (commandArgs.length === 0) {
   process.exit(1);
 }
 
-const command = commandArgs[0];
+// Resolve claude binary: prefer bundled @anthropic-ai/claude-code, fall back to system PATH
+let command = commandArgs[0];
+let claudeBundled = false;
+if (command === "claude") {
+  try {
+    // The npm package has a bin entry that npm links globally; for local use, resolve directly
+    const bundledBin = path.join(__dirname, "..", "node_modules", ".bin", "claude");
+    if (existsSync(bundledBin)) {
+      command = bundledBin;
+      claudeBundled = true;
+    }
+  } catch {}
+}
 const spawnArgs = commandArgs.slice(1);
 let sessionId;
 const hostname = os.hostname().replace(/\.(lan|local|home|internal)$/i, "");
@@ -830,6 +891,7 @@ const eventHistory = []; // all agent events for replay on reconnect
 function sendToServer(msg) {
   // Track agent events for reconnect replay
   if (msg.type === "agent_event" && msg.event) {
+    if (!msg.event.ts) msg.event.ts = Date.now();
     eventHistory.push(msg.event);
     while (eventHistory.length > MAX_EVENT_HISTORY) {
       eventHistory.shift();
@@ -942,11 +1004,15 @@ if (adapter) {
   // Confirmation-type tools — these need "yes" response, not permission grants
   const CONFIRMATION_TOOLS = new Set(["ExitPlanMode", "EnterPlanMode"]);
 
-  // Build clean env for child processes (no nesting detection, no leaked keys)
+  // Build clean env for child processes
+  // Inject stored Anthropic API key if available (so users don't need separate `claude login`)
   const childEnv = (() => {
     const e = { ...process.env };
     delete e.CLAUDECODE;
-    delete e.ANTHROPIC_API_KEY;
+    const config = loadConfig();
+    if (config.anthropic_api_key && !e.ANTHROPIC_API_KEY) {
+      e.ANTHROPIC_API_KEY = config.anthropic_api_key;
+    }
     return e;
   })();
 
@@ -1083,20 +1149,21 @@ if (adapter) {
         for (const line of latest.split("\n").filter(Boolean)) {
           try {
             const record = JSON.parse(line);
+            const ts = record.timestamp ? new Date(record.timestamp).getTime() : undefined;
             if (record.type === "user" && record.message?.content) {
               const text = typeof record.message.content === "string"
                 ? record.message.content
                 : record.message.content.filter((b) => b.type === "text").map((b) => b.text).join("\n");
               if (text) {
-                historyEvents.push({ kind: "user_message", text });
+                historyEvents.push({ kind: "user_message", text, ...(ts ? { ts } : {}) });
               }
             } else if (record.message?.role === "assistant" && record.message?.content) {
               const msgId = `hist-${msgCounter++}`;
-              historyEvents.push({ kind: "message_start", messageId: msgId });
+              historyEvents.push({ kind: "message_start", messageId: msgId, ...(ts ? { ts } : {}) });
               for (const block of record.message.content) {
                 if (block.type === "text" && block.text) {
                   const blockId = `hist-text-${msgCounter++}`;
-                  historyEvents.push({ kind: "text_delta", blockId, text: block.text });
+                  historyEvents.push({ kind: "text_delta", blockId, text: block.text, ...(ts ? { ts } : {}) });
                 } else if (block.type === "tool_use") {
                   const blockId = `hist-tool-${msgCounter++}`;
                   historyEvents.push({
@@ -1104,10 +1171,11 @@ if (adapter) {
                     toolName: block.name || "unknown",
                     toolId: block.id || blockId,
                     input: typeof block.input === "string" ? block.input : JSON.stringify(block.input || {}),
+                    ...(ts ? { ts } : {}),
                   });
                 }
               }
-              historyEvents.push({ kind: "message_end", messageId: msgId });
+              historyEvents.push({ kind: "message_end", messageId: msgId, ...(ts ? { ts } : {}) });
             }
           } catch {}
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrating",
-  "version": "0.1.38",
+  "version": "0.2.0",
   "description": "Stream terminal sessions to the orchestrat.ing dashboard",
   "type": "module",
   "bin": {
@@ -30,6 +30,7 @@
     "dashboard"
   ],
   "dependencies": {
-    "ws": "^8.18.0"
+    "ws": "^8.18.0",
+    "@anthropic-ai/claude-code": "^2.1.0"
   }
 }