orchestrating 0.1.27 → 0.1.29

package/bin/orch

@@ -4,7 +4,7 @@ import os from "os";
 import http from "http";
 import path from "path";
 import readline from "readline";
-import { readFileSync, writeFileSync, mkdirSync, unlinkSync, existsSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, unlinkSync, existsSync, readdirSync, statSync } from "fs";
 import { spawn, execSync } from "child_process";
 import { randomUUID } from "crypto";
 import { fileURLToPath } from "url";
@@ -248,6 +248,7 @@ async function handleDaemon(projectsDir) {
   process.stderr.write(`${DIM}${PREFIX} Tip: Use 'nohup orch daemon &' to run in background${RESET}\n`);
 
   let reconnecting = false;
+  const recentRequests = new Set();
 
   function scheduleReconnect(delaySec) {
     if (reconnecting) return;
@@ -330,6 +331,11 @@ async function handleDaemon(projectsDir) {
 
       if (msg.type === "start_session") {
         const { requestId, command: cmd, args: cmdArgs, cwd, label: lbl, yolo } = msg;
+        // Dedup: ignore if we already handled this request
+        if (recentRequests.has(requestId)) return;
+        recentRequests.add(requestId);
+        setTimeout(() => recentRequests.delete(requestId), 30_000);
+
         const cmdStr = [cmd, ...cmdArgs].join(" ");
         process.stderr.write(`${GREEN}${PREFIX} Spawning: ${cmdStr}${RESET}\n`);
 
@@ -761,6 +767,61 @@ if (adapter) {
     broadcastPermissions();
   }
 
+  // Load and forward prior conversation history when resuming with -c
+  if (adapterFlags.continue) {
+    try {
+      const cwdPath = process.cwd().replace(/\//g, "-").replace(/^-/, "-");
+      const claudeProjectDir = path.join(os.homedir(), ".claude", "projects", cwdPath);
+      const jsonlFiles = readdirSync(claudeProjectDir)
+        .filter((f) => f.endsWith(".jsonl"))
+        .map((f) => ({ name: f, mtime: statSync(path.join(claudeProjectDir, f)).mtimeMs }))
+        .sort((a, b) => b.mtime - a.mtime);
+
+      if (jsonlFiles.length > 0) {
+        const latest = readFileSync(path.join(claudeProjectDir, jsonlFiles[0].name), "utf-8");
+        const historyEvents = [];
+        let msgCounter = 0;
+        for (const line of latest.split("\n").filter(Boolean)) {
+          try {
+            const record = JSON.parse(line);
+            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 });
+              }
+            } else if (record.message?.role === "assistant" && record.message?.content) {
+              const msgId = `hist-${msgCounter++}`;
+              historyEvents.push({ kind: "message_start", messageId: msgId });
+              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 });
+                } else if (block.type === "tool_use") {
+                  const blockId = `hist-tool-${msgCounter++}`;
+                  historyEvents.push({
+                    kind: "tool_start", blockId,
+                    toolName: block.name || "unknown",
+                    toolId: block.id || blockId,
+                    input: typeof block.input === "string" ? block.input : JSON.stringify(block.input || {}),
+                  });
+                }
+              }
+              historyEvents.push({ kind: "message_end", messageId: msgId });
+            }
+          } catch {}
+        }
+        if (historyEvents.length > 0) {
+          process.stderr.write(`${DIM}[orch] Forwarding ${historyEvents.length} history events to dashboard${RESET}\n`);
+          sendToServer({ type: "agent_history_replay", sessionId, events: historyEvents });
+        }
+      }
+    } catch (err) {
+      process.stderr.write(`${DIM}[orch] Could not load conversation history: ${err.message}${RESET}\n`);
+    }
+  }
+
   // Start the initial claude process
   const initialArgs = adapter.buildArgs(prompt, adapterFlags);
   if (yoloMode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrating",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Stream terminal sessions to the orchestrat.ing dashboard",
   "type": "module",
   "bin": {