@adhdev/daemon-core 0.6.19 → 0.6.22

package/dist/index.d.ts

@@ -168,6 +168,7 @@ interface ADHDevConfig {
     recentWorkspaceActivity?: WorkspaceActivityEntry[];
     machineNickname: string | null;
     machineId?: string;
+    machineSecret?: string | null;
     cliHistory: CliHistoryEntry[];
     providerSettings: Record<string, Record<string, any>>;
     ideSettings: Record<string, {
@@ -175,6 +176,7 @@ interface ADHDevConfig {
             enabled: boolean;
         }>;
     }>;
+    disableUpstream?: boolean;
 }
 interface CliHistoryEntry {
     cliType: string;
@@ -957,6 +959,7 @@ declare class ProviderLoader {
     private builtinDirs;
     private userDir;
     private upstreamDir;
+    private disableUpstream;
     private watchers;
     private logFn;
     private versionArchive;
@@ -969,6 +972,8 @@ declare class ProviderLoader {
         builtinDir?: string | string[];
         userDir?: string;
         logFn?: (msg: string) => void;
+        /** Disable upstream auto-download (for dev/testing/OSS) */
+        disableUpstream?: boolean;
     });
     private log;
     /**
@@ -1720,6 +1725,9 @@ declare class DaemonCommandHandler implements CommandHelpers {
     private dispatch;
     private handleGetRecentWorkspaces;
     private handleRefreshScripts;
+    private proxyDevServerPost;
+    private proxyDevServerGet;
+    private proxyDevServerScaffold;
 }
 
 /**
@@ -2199,7 +2207,6 @@ interface StatusReporterDeps {
         connectedPeerCount: number;
         screenshotActive: boolean;
         sendStatus(data: any): void;
-        sendStatusEvent?(event: Record<string, unknown>): boolean;
     } | null;
     providerLoader: {
         resolve(type: string): any;
@@ -2219,6 +2226,11 @@ interface StatusReporterDeps {
         collectAllStates(): ProviderState[];
         collectStatesByCategory(cat: string): ProviderState[];
     };
+    getScreenshotUsage?: () => {
+        dailyUsedMinutes: number;
+        dailyBudgetMinutes: number;
+        budgetExhausted: boolean;
+    } | null;
 }
 declare class DaemonStatusReporter {
     private deps;

package/dist/index.js

@@ -361,9 +361,11 @@ var init_config = __esm({
       recentWorkspaceActivity: [],
       machineNickname: null,
       machineId: void 0,
+      machineSecret: null,
       cliHistory: [],
       providerSettings: {},
-      ideSettings: {}
+      ideSettings: {},
+      disableUpstream: false
     };
   }
 });
@@ -5573,6 +5575,15 @@ var DaemonCommandHandler = class {
         return handleExtensionScript(this, args, "listModes");
       case "set_extension_mode":
         return handleExtensionScript(this, args, "setMode");
+      // ─── Provider Auto-Fix / Clone (DevServer proxy) ──────────
+      case "provider_auto_fix":
+        return this.proxyDevServerPost(args, "auto-implement");
+      case "provider_auto_fix_cancel":
+        return this.proxyDevServerPost(args, "auto-implement/cancel");
+      case "provider_auto_fix_status":
+        return this.proxyDevServerGet(args, "auto-implement/status");
+      case "provider_clone":
+        return this.proxyDevServerScaffold(args);
       default:
         return { success: false, error: `Unknown command: ${cmd}` };
     }
@@ -5600,6 +5611,95 @@ var DaemonCommandHandler = class {
     }
     return { success: false, error: "ProviderLoader not initialized" };
   }
+  // ─── DevServer HTTP proxy helpers ─────────────────
+  // These bridge WS commands to the DevServer REST API (localhost:19280)
+  async proxyDevServerPost(args, endpoint) {
+    const { providerType, ...body } = args || {};
+    if (!providerType) return { success: false, error: "providerType required" };
+    try {
+      const http3 = await import("http");
+      const postData = JSON.stringify(body);
+      const result = await new Promise((resolve8, reject) => {
+        const req = http3.request({
+          hostname: "127.0.0.1",
+          port: 19280,
+          path: `/api/providers/${providerType}/${endpoint}`,
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+        }, (res) => {
+          let data = "";
+          res.on("data", (chunk) => data += chunk);
+          res.on("end", () => {
+            try {
+              resolve8(JSON.parse(data));
+            } catch {
+              resolve8({ raw: data });
+            }
+          });
+        });
+        req.on("error", reject);
+        req.write(postData);
+        req.end();
+      });
+      return { success: true, ...result };
+    } catch (e) {
+      return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+    }
+  }
+  async proxyDevServerGet(args, endpoint) {
+    const { providerType } = args || {};
+    if (!providerType) return { success: false, error: "providerType required" };
+    try {
+      const http3 = await import("http");
+      const result = await new Promise((resolve8, reject) => {
+        http3.get(`http://127.0.0.1:19280/api/providers/${providerType}/${endpoint}`, (res) => {
+          let data = "";
+          res.on("data", (chunk) => data += chunk);
+          res.on("end", () => {
+            try {
+              resolve8(JSON.parse(data));
+            } catch {
+              resolve8({ raw: data });
+            }
+          });
+        }).on("error", reject);
+      });
+      return { success: true, ...result };
+    } catch (e) {
+      return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+    }
+  }
+  async proxyDevServerScaffold(args) {
+    try {
+      const http3 = await import("http");
+      const postData = JSON.stringify(args || {});
+      const result = await new Promise((resolve8, reject) => {
+        const req = http3.request({
+          hostname: "127.0.0.1",
+          port: 19280,
+          path: "/api/scaffold",
+          method: "POST",
+          headers: { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(postData) }
+        }, (res) => {
+          let data = "";
+          res.on("data", (chunk) => data += chunk);
+          res.on("end", () => {
+            try {
+              resolve8(JSON.parse(data));
+            } catch {
+              resolve8({ raw: data });
+            }
+          });
+        });
+        req.on("error", reject);
+        req.write(postData);
+        req.end();
+      });
+      return { success: true, ...result };
+    } catch (e) {
+      return { success: false, error: `DevServer unreachable: ${e.message}. Start daemon with --dev flag.` };
+    }
+  }
 };
 
 // src/launch.ts
@@ -5618,6 +5718,7 @@ var ProviderLoader = class _ProviderLoader {
   builtinDirs;
   userDir;
   upstreamDir;
+  disableUpstream;
   watchers = [];
   logFn;
   versionArchive = null;
@@ -5636,6 +5737,7 @@ var ProviderLoader = class _ProviderLoader {
     }
     this.userDir = options?.userDir || path6.join(os7.homedir(), ".adhdev", "providers");
     this.upstreamDir = path6.join(this.userDir, ".upstream");
+    this.disableUpstream = options?.disableUpstream ?? false;
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
   }
   log(msg) {
@@ -5652,11 +5754,13 @@ var ProviderLoader = class _ProviderLoader {
   loadAll() {
     this.providers.clear();
     let upstreamCount = 0;
-    if (fs5.existsSync(this.upstreamDir)) {
+    if (!this.disableUpstream && fs5.existsSync(this.upstreamDir)) {
       upstreamCount = this.loadDir(this.upstreamDir);
       if (upstreamCount > 0) {
         this.log(`Loaded ${upstreamCount} upstream providers (auto-updated)`);
       }
+    } else if (this.disableUpstream) {
+      this.log("Upstream loading disabled (disableUpstream=true)");
     }
     if (fs5.existsSync(this.userDir)) {
       const userCount = this.loadDir(this.userDir, [".upstream"]);
@@ -6059,6 +6163,10 @@ var ProviderLoader = class _ProviderLoader {
   * @returns Whether an update occurred
   */
   async fetchLatest() {
+    if (this.disableUpstream) {
+      this.log("Upstream fetch skipped (disableUpstream=true)");
+      return { updated: false };
+    }
     const https = require("https");
     const { execSync: execSync7 } = require("child_process");
     const metaPath = path6.join(this.upstreamDir, _ProviderLoader.META_FILE);
@@ -7360,12 +7468,6 @@ var DaemonStatusReporter = class {
   emitStatusEvent(event) {
     LOG.info("StatusEvent", `${event.event} (${event.providerType || event.ideType || ""})`);
     this.deps.serverConn?.sendMessage("status_event", event);
-    if (this.deps.p2p?.isConnected) {
-      try {
-        this.deps.p2p.sendStatusEvent?.(event);
-      } catch {
-      }
-    }
   }
   removeAgentTracking(_key) {
   }
@@ -7443,6 +7545,7 @@ var DaemonStatusReporter = class {
         peers: p2p?.connectedPeerCount || 0,
         screenshotActive: p2p?.screenshotActive || false
       },
+      screenshotUsage: this.deps.getScreenshotUsage?.() || null,
       connectedExtensions: [],
       detectedIdes: this.deps.detectedIdes || [],
       availableProviders: this.deps.providerLoader.getAll().map((p) => ({
@@ -11926,7 +12029,7 @@ var DevServer = class _DevServer {
   // ─── Phase 2: Auto-Implement Backend ───
   async handleAutoImplement(type, req, res) {
     const body = await this.readBody(req);
-    const { agent = "claude-cli", functions, reference = "antigravity", model } = body;
+    const { agent = "claude-cli", functions, reference = "antigravity", model, comment } = body;
     if (!functions || !Array.isArray(functions) || functions.length === 0) {
       this.json(res, 400, { error: 'functions[] is required (e.g. ["readChat", "sendMessage"])' });
       return;
@@ -11975,7 +12078,7 @@ var DevServer = class _DevServer {
           }
         }
       }
-      const prompt = this.buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts);
+      const prompt = this.buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts, comment);
       const tmpDir = path12.join(os14.tmpdir(), "adhdev-autoimpl");
       if (!fs9.existsSync(tmpDir)) fs9.mkdirSync(tmpDir, { recursive: true });
       const promptFile = path12.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
@@ -12158,6 +12261,7 @@ var DevServer = class _DevServer {
       }
       this.sendAutoImplSSE({ event: "progress", data: { function: "_init", status: "spawning", message: `\uC5D0\uC774\uC804\uD2B8 \uC2E4\uD589 \uC911: ${shellCmd.substring(0, 200)}... (prompt: ${prompt.length} chars)` } });
       this.autoImplStatus = { running: true, type, progress: [] };
+      const spawnedAt = Date.now();
       let child;
       let isPty = false;
       const { spawn: spawnFn } = await import("child_process");
@@ -12210,8 +12314,9 @@ var DevServer = class _DevServer {
       const checkAutoApproval = (chunk, writeFn) => {
         const cleanData = chunk.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
         approvalBuffer = (approvalBuffer + cleanData).slice(-1500);
-        if (approvalBuffer.includes("AUTO_IMPLEMENT_FINISHED")) {
-          this.log("Agent finished task. Terminating interactive CLI session to unblock pipeline.");
+        const elapsed = Date.now() - spawnedAt;
+        if (elapsed > 15e3 && approvalBuffer.includes("AUTO_IMPLEMENT_FINISHED")) {
+          this.log(`Agent finished task after ${Math.round(elapsed / 1e3)}s. Terminating interactive CLI session to unblock pipeline.`);
           this.sendAutoImplSSE({ event: "output", data: { chunk: `
 [\u{1F916} ADHDev Pipeline] Completion token detected. Proceeding...
 `, stream: "stdout" } });
@@ -12313,7 +12418,7 @@ var DevServer = class _DevServer {
       this.json(res, 500, { error: `Auto-implement failed: ${e.message}` });
     }
   }
-  buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts) {
+  buildAutoImplPrompt(type, provider, providerDir, functions, domContext, referenceScripts, userComment) {
     const lines = [];
     lines.push("You are implementing browser automation scripts for an IDE provider.");
     lines.push("Be concise. Do NOT explain your reasoning. Just edit files directly.");
@@ -12425,6 +12530,22 @@ var DevServer = class _DevServer {
     lines.push("| focusEditor | `{ focused: true/false }` |");
     lines.push("| openPanel | `{ opened: true/false }` |");
     lines.push("");
+    lines.push("## \u{1F534} CRITICAL: readChat `status` Lifecycle");
+    lines.push("The `status` field in readChat controls how the dashboard and daemon auto-approve-loop behave.");
+    lines.push("Getting this wrong will break the entire automation pipeline. The status MUST reflect the ACTUAL current state:");
+    lines.push("");
+    lines.push("| Status | When to use | How to detect |");
+    lines.push("|---|---|---|");
+    lines.push("| `idle` | AI is NOT generating, no approval needed | Default state. No stop button, no spinners, no approval pills/buttons |");
+    lines.push("| `generating` | AI is actively streaming/thinking | ANY of: (1) Stop/Cancel button visible, (2) CSS animation (animate-spin/pulse/bounce), (3) floating state text like Thinking/Generating/Sailing, (4) streaming indicator class |");
+    lines.push("| `waiting_approval` | AI stopped and needs user action | Actionable buttons like Run/Skip/Accept/Reject are visible AND clickable |");
+    lines.push("");
+    lines.push("### \u26A0\uFE0F Status Detection Gotchas (MUST READ!)");
+    lines.push('1. **FALSE POSITIVES from old messages**: Chat history may contain text like "Command Awaiting Approval" from PAST turns. If you search the entire chat panel for this text, you will get false matches from parent divs whose innerText includes ALL child text. ONLY match small leaf elements (under 80 chars) or use explicit button/pill selectors.');
+    lines.push('2. **Awaiting Approval pill without actions**: Some IDEs show a floating pill/banner saying "Awaiting Approval" that is just a scroll-to indicator (not an actual approval dialog). If this pill exists but NO actionable buttons (Run/Skip/Accept/Reject) exist anywhere in the panel, the status should be `idle`, NOT `waiting_approval`.');
+    lines.push("3. **generating detection must be multi-signal**: Do NOT rely on just one indicator. Check ALL of: stop buttons, CSS animations, floating state labels, streaming classes. IDEs differ widely.");
+    lines.push("4. **activeModal must include actions**: When `status` is `waiting_approval`, the `activeModal` object MUST include a non-empty `actions` array listing the button labels. If you cannot find any action buttons, the status is NOT `waiting_approval`.");
+    lines.push("");
     lines.push("## Action");
     lines.push("1. Edit the script files to implement working code");
     lines.push("2. After editing, TEST each function using the DevConsole API (see below)");
@@ -12449,7 +12570,7 @@ var DevServer = class _DevServer {
     lines.push("Once you save the file, test it by running:");
     lines.push("```bash");
     lines.push(`curl -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/providers/reload`);
-    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/providers/${type}/scripts/run -H "Content-Type: application/json" -d '{"script": "readChat"}'`);
+    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "readChat", "type": "${type}", "ideType": "${type}"}'`);
     lines.push("```");
     lines.push("");
     lines.push("### Task Workflow");
@@ -12461,12 +12582,51 @@ var DevServer = class _DevServer {
     lines.push("### \u{1F525} Advanced UI Parsing (CRUCIAL for `readChat`)");
     lines.push("Your `readChat` must flawlessly parse complex UI elements (tables, code blocks, tool calls, and AI thoughts). The quality must match the `antigravity` reference.");
     lines.push("To achieve this, you MUST generate a live test scenario:");
-    lines.push("1. Early in your process, send a rich prompt to the IDE using the API:");
-    lines.push('   `curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/providers/${type}/scripts/run -H "Content-Type: application/json" -d \'{"script": "sendMessage", "params": {"text": "Write a python script, draw a markdown table, use a tool, and show your reasoning/thought process"}}\'`');
+    lines.push(`1. Early in your process, send a rich prompt to the IDE using the API:`);
+    lines.push(`   \`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "sendMessage", "type": "${type}", "ideType": "${type}", "args": {"message": "Write a python script, draw a markdown table, use a tool, and show your reasoning/thought process"}}'\``);
     lines.push("2. Wait a few seconds for the IDE AI to generate these elements in the UI.");
     lines.push("3. Use CDP evaluate to deeply inspect the DOM structure of the newly generated tables, code blocks, thought blocks, and tool calls.");
     lines.push("4. Ensure `readChat` extracts `content` with precise markdown formatting (especially for tables/code) and assigns correct `kind` tags (`thought`, `tool`, `terminal`).");
     lines.push("");
+    lines.push("## \u{1F9EA} MANDATORY: Status Integration Test");
+    lines.push("Before finishing, you MUST run this end-to-end test to verify readChat status transitions work:");
+    lines.push("");
+    lines.push("### Step 1: Baseline \u2014 confirm idle");
+    lines.push("```bash");
+    lines.push(`curl -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/providers/reload`);
+    lines.push(`RESULT=$(curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "readChat", "type": "${type}", "ideType": "${type}"}')`);
+    lines.push(`echo "$RESULT" | python3 -c "import sys,json; d=json.load(sys.stdin); r=d.get('result',d); r=json.loads(r) if isinstance(r,str) else r; assert r.get('status')=='idle', f'Expected idle, got {r.get(chr(34)+chr(115)+chr(116)+chr(97)+chr(116)+chr(117)+chr(115)+chr(34))}'; print('Step 1 PASS: status=idle')"`);
+    lines.push("```");
+    lines.push("");
+    lines.push("### Step 2: Send a message that triggers generation");
+    lines.push("```bash");
+    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "sendMessage", "type": "${type}", "ideType": "${type}", "args": {"message": "Say hello in one word"}}'`);
+    lines.push("sleep 2");
+    lines.push("```");
+    lines.push("");
+    lines.push("### Step 3: Check generating OR completed");
+    lines.push("The AI may still be generating OR may have finished already. Either generating or idle is acceptable:");
+    lines.push("```bash");
+    lines.push(`RESULT=$(curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "readChat", "type": "${type}", "ideType": "${type}"}')`);
+    lines.push(`echo "$RESULT" | python3 -c "import sys,json; d=json.load(sys.stdin); r=d.get('result',d); r=json.loads(r) if isinstance(r,str) else r; s=r.get('status'); assert s in ('generating','idle','waiting_approval'), f'Unexpected: {s}'; print(f'Step 3 PASS: status={s}')"`);
+    lines.push("```");
+    lines.push("");
+    lines.push("### Step 4: Wait for completion and verify new message");
+    lines.push("```bash");
+    lines.push("sleep 10");
+    lines.push(`RESULT=$(curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/scripts/run -H "Content-Type: application/json" -d '{"script": "readChat", "type": "${type}", "ideType": "${type}"}')`);
+    lines.push(`echo "$RESULT" | python3 -c "import sys,json; d=json.load(sys.stdin); r=d.get('result',d); r=json.loads(r) if isinstance(r,str) else r; s=r.get('status'); msgs=r.get('messages',[]); assert s=='idle', f'Expected idle, got {s}'; assert len(msgs)>0, 'No messages'; print(f'Step 4 PASS: status={s}, messages={len(msgs)}')"`);
+    lines.push("```");
+    lines.push("");
+    lines.push("If ANY step fails, fix your implementation and re-run the test. Do NOT finish until all 4 steps pass.");
+    lines.push("");
+    if (userComment) {
+      lines.push("## \u26A0\uFE0F User Instructions (HIGH PRIORITY)");
+      lines.push("The user has provided the following additional instructions. Follow them strictly:");
+      lines.push("");
+      lines.push(userComment);
+      lines.push("");
+    }
     lines.push("Start NOW. Do not ask for permission. Explore the DOM -> Code -> Test.");
     return lines.join("\n");
   }
@@ -12988,10 +13148,13 @@ init_logger();
 init_config();
 async function initDaemonComponents(config) {
   installGlobalInterceptor();
+  const appConfig = loadConfig();
+  const disableUpstream = appConfig.disableUpstream ?? false;
   const providerLoader = new ProviderLoader({
-    logFn: config.providerLogFn
+    logFn: config.providerLogFn,
+    disableUpstream
   });
-  if (!providerLoader.hasUpstream()) {
+  if (!disableUpstream && !providerLoader.hasUpstream()) {
     LOG.info("Provider", "No upstream providers found \u2014 downloading from GitHub...");
     try {
       await providerLoader.fetchLatest();