adhdev 0.6.21 → 0.6.22

package/dist/cli/index.js

@@ -362,9 +362,11 @@ var init_config = __esm({
       recentWorkspaceActivity: [],
       machineNickname: null,
       machineId: void 0,
+      machineSecret: null,
       cliHistory: [],
       providerSettings: {},
-      ideSettings: {}
+      ideSettings: {},
+      disableUpstream: false
     };
   }
 });
@@ -5134,6 +5136,7 @@ var init_provider_loader = __esm({
       builtinDirs;
       userDir;
       upstreamDir;
+      disableUpstream;
       watchers = [];
       logFn;
       versionArchive = null;
@@ -5152,6 +5155,7 @@ var init_provider_loader = __esm({
         }
         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) {
@@ -5168,11 +5172,13 @@ var init_provider_loader = __esm({
       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"]);
@@ -5575,6 +5581,10 @@ var init_provider_loader = __esm({
       * @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);
@@ -6913,12 +6923,6 @@ var init_reporter = __esm({
       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) {
       }
@@ -6996,6 +7000,7 @@ var init_reporter = __esm({
             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) => ({
@@ -29010,6 +29015,22 @@ var init_dev_server = __esm({
         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)");
@@ -29034,7 +29055,7 @@ var init_dev_server = __esm({
         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");
@@ -29046,12 +29067,44 @@ var init_dev_server = __esm({
         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:");
@@ -29583,10 +29636,13 @@ var init_installer = __esm({
 // ../daemon-core/src/boot/daemon-lifecycle.ts
 async function initDaemonComponents(config2) {
   installGlobalInterceptor();
+  const appConfig = loadConfig();
+  const disableUpstream = appConfig.disableUpstream ?? false;
   const providerLoader = new ProviderLoader({
-    logFn: config2.providerLogFn
+    logFn: config2.providerLogFn,
+    disableUpstream
   });
-  if (!providerLoader.hasUpstream()) {
+  if (!disableUpstream && !providerLoader.hasUpstream()) {
     LOG.info("Provider", "No upstream providers found \u2014 downloading from GitHub...");
     try {
       await providerLoader.fetchLatest();
@@ -30621,24 +30677,6 @@ ${e?.stack || ""}`);
         }
         return sentAny;
       }
-      /** Send status_event directly via P2P (generating_started/completed etc.) */
-      sendStatusEvent(event) {
-        const payload = JSON.stringify({
-          type: "status_event",
-          payload: event,
-          timestamp: Date.now()
-        });
-        let sentAny = false;
-        for (const peer of this.peers.values()) {
-          if (peer.state !== "connected" || !peer.dataChannel) continue;
-          try {
-            peer.dataChannel.sendMessage(payload);
-            sentAny = true;
-          } catch {
-          }
-        }
-        return sentAny;
-      }
       /** Broadcast PTY output to all connected peers */
       broadcastPtyOutput(cliType, data) {
         const prev = this.ptyScrollback.get(cliType) || "";
@@ -31047,6 +31085,15 @@ var init_screenshot_controller = __esm({
           LOG.info("Screenshot", `Daily budget reset (${this.dailyBudgetMinutes}min for today)`);
         }
       }
+      /** Returns current usage stats for reporting to server/dashboard */
+      getUsageStats() {
+        this.checkBudgetReset();
+        return {
+          dailyUsedMinutes: Math.round(this.dailyUsedMs / 6e4),
+          dailyBudgetMinutes: this.dailyBudgetMinutes,
+          budgetExhausted: this.budgetExhausted
+        };
+      }
       // ─── Hash ─────────────────────────────────────
       /** FNV-1a hash of first 1KB + last 1KB for fast delta detection */
       static fnvHash(buf) {
@@ -31127,7 +31174,7 @@ var init_adhdev_daemon = __esm({
     fs11 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.21";
+    pkgVersion = "0.6.22";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -31194,8 +31241,9 @@ ${err?.stack || ""}`);
         }
         writeDaemonPid(process.pid);
         const config2 = loadConfig();
-        if (!config2.connectionToken) {
-          console.log(import_chalk2.default.red("\n\u2717 No connection token found."));
+        const authToken = config2.machineSecret || config2.connectionToken;
+        if (!authToken) {
+          console.log(import_chalk2.default.red("\n\u2717 No credentials found."));
           console.log(import_chalk2.default.gray("  Run `adhdev setup` first.\n"));
           process.exit(1);
         }
@@ -31245,7 +31293,7 @@ ${err?.stack || ""}`);
         const instanceId = `daemon_${config2.machineId}`;
         this.serverConn = new ServerConnection({
           serverUrl: options.serverUrl || config2.serverUrl,
-          token: config2.connectionToken,
+          token: authToken,
           daemonVersion: pkgVersion,
           cliInfo: {
             type: "adhdev-daemon",
@@ -31337,7 +31385,8 @@ ${err?.stack || ""}`);
           detectedIdes: this.components.detectedIdes.value,
           ideType: this.ideType,
           daemonVersion: pkgVersion,
-          instanceManager: this.components.instanceManager
+          instanceManager: this.components.instanceManager,
+          getScreenshotUsage: () => this.screenshotController?.getUsageStats() || null
         });
         this.statusReporter.startReporting();
         this.components.instanceManager.onEvent((event) => {
@@ -31615,11 +31664,17 @@ async function quickSetup() {
   }
   markSetupComplete(["daemon"], ["adhdev"]);
   if (loginResult) {
-    updateConfig({
+    const configUpdate = {
       connectionToken: loginResult.connectionToken,
       userEmail: loginResult.email,
       userName: loginResult.name
-    });
+    };
+    if (loginResult.machineId && loginResult.machineSecret) {
+      configUpdate.machineId = loginResult.machineId;
+      configUpdate.machineSecret = loginResult.machineSecret;
+      console.log(import_chalk3.default.green(`  \u2713 Machine registered`));
+    }
+    updateConfig(configUpdate);
   }
   await installCliOnly();
   await startDaemonFlow();
@@ -31655,7 +31710,16 @@ async function loginFlow() {
   let userCode;
   let verificationUrl;
   try {
-    const res = await fetch(`${SERVER_URL}/auth/cli/init`, { method: "POST" });
+    const os17 = await import("os");
+    const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        hostname: os17.hostname(),
+        platform: os17.platform(),
+        arch: os17.arch()
+      })
+    });
     if (!res.ok) {
       spinner.fail("Failed to connect to server");
       return null;
@@ -31702,10 +31766,27 @@ async function loginFlow() {
         pollSpinner.succeed(`Authenticated as ${import_chalk3.default.bold(data.user?.email || "user")}`);
         return {
           connectionToken: data.connectionToken,
+          machineId: data.machineId || void 0,
+          machineSecret: data.machineSecret || void 0,
           email: data.user?.email,
           name: data.user?.name
         };
       }
+      if (data.status === "limit_reached") {
+        pollSpinner.fail("Machine limit reached");
+        console.log();
+        console.log(import_chalk3.default.red(`  \u2717 Your ${import_chalk3.default.bold(data.plan || "free")} plan allows ${data.limit} machine(s), and you have ${data.current} registered.`));
+        console.log();
+        console.log(import_chalk3.default.yellow("  To fix this, do one of the following:"));
+        console.log(import_chalk3.default.gray("    1. Remove an unused machine from the dashboard:"));
+        console.log(import_chalk3.default.gray("       https://adhf.dev/account \u2192 Registered Machines \u2192 \u2715 Remove"));
+        console.log(import_chalk3.default.gray("    2. Upgrade your plan:"));
+        console.log(import_chalk3.default.gray("       https://adhf.dev/account?tab=billing"));
+        console.log();
+        console.log(import_chalk3.default.gray("  Then run `adhdev setup` again."));
+        console.log();
+        return null;
+      }
     } catch {
     }
   }