@joshski/dust 0.1.44 → 0.1.45

package/dist/dust.js

@@ -18,129 +18,128 @@ var KNOWN_CHECK_KEYS = new Set([
   "hints",
   "timeoutMilliseconds"
 ]);
-function validateSettingsJson(content) {
+function validateCheckEntry(check, checkPath) {
   const violations = [];
-  let parsed;
-  try {
-    parsed = JSON.parse(content);
-  } catch (error) {
-    violations.push({
-      message: `Invalid JSON: ${error.message}`
-    });
+  if (typeof check === "string") {
     return violations;
   }
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    violations.push({
-      message: "settings.json must be a JSON object"
-    });
+  if (typeof check !== "object" || check === null || Array.isArray(check)) {
+    violations.push({ message: `${checkPath} must be a string or object` });
     return violations;
   }
-  const settings = parsed;
-  for (const key of Object.keys(settings)) {
-    if (!KNOWN_SETTINGS_KEYS.has(key)) {
+  const checkObj = check;
+  for (const key of Object.keys(checkObj)) {
+    if (!KNOWN_CHECK_KEYS.has(key)) {
       violations.push({
-        message: `Unknown key "${key}" in settings.json. Known keys: ${[...KNOWN_SETTINGS_KEYS].sort().join(", ")}`
+        message: `Unknown key "${key}" in ${checkPath}. Known keys: ${[...KNOWN_CHECK_KEYS].sort().join(", ")}`
       });
     }
   }
-  if ("checks" in settings) {
-    if (!Array.isArray(settings.checks)) {
+  if (!("name" in checkObj)) {
+    violations.push({
+      message: `${checkPath} is missing required field "name"`
+    });
+  } else if (typeof checkObj.name !== "string") {
+    violations.push({ message: `${checkPath}.name must be a string` });
+  }
+  if (!("command" in checkObj)) {
+    violations.push({
+      message: `${checkPath} is missing required field "command"`
+    });
+  } else if (typeof checkObj.command !== "string") {
+    violations.push({ message: `${checkPath}.command must be a string` });
+  }
+  if ("hints" in checkObj) {
+    if (!Array.isArray(checkObj.hints)) {
       violations.push({
-        message: '"checks" must be an array'
+        message: `${checkPath}.hints must be an array of strings`
       });
     } else {
-      for (let i = 0;i < settings.checks.length; i++) {
-        const check = settings.checks[i];
-        const checkPath = `checks[${i}]`;
-        if (typeof check === "string") {
-          continue;
-        }
-        if (typeof check !== "object" || check === null || Array.isArray(check)) {
-          violations.push({
-            message: `${checkPath} must be a string or object`
-          });
-          continue;
-        }
-        const checkObj = check;
-        for (const key of Object.keys(checkObj)) {
-          if (!KNOWN_CHECK_KEYS.has(key)) {
-            violations.push({
-              message: `Unknown key "${key}" in ${checkPath}. Known keys: ${[...KNOWN_CHECK_KEYS].sort().join(", ")}`
-            });
-          }
-        }
-        if (!("name" in checkObj)) {
-          violations.push({
-            message: `${checkPath} is missing required field "name"`
-          });
-        } else if (typeof checkObj.name !== "string") {
-          violations.push({
-            message: `${checkPath}.name must be a string`
-          });
-        }
-        if (!("command" in checkObj)) {
+      for (let j = 0;j < checkObj.hints.length; j++) {
+        if (typeof checkObj.hints[j] !== "string") {
           violations.push({
-            message: `${checkPath} is missing required field "command"`
-          });
-        } else if (typeof checkObj.command !== "string") {
-          violations.push({
-            message: `${checkPath}.command must be a string`
+            message: `${checkPath}.hints[${j}] must be a string`
           });
         }
-        if ("hints" in checkObj) {
-          if (!Array.isArray(checkObj.hints)) {
-            violations.push({
-              message: `${checkPath}.hints must be an array of strings`
-            });
-          } else {
-            for (let j = 0;j < checkObj.hints.length; j++) {
-              if (typeof checkObj.hints[j] !== "string") {
-                violations.push({
-                  message: `${checkPath}.hints[${j}] must be a string`
-                });
-              }
-            }
-          }
-        }
-        if ("timeoutMilliseconds" in checkObj) {
-          if (typeof checkObj.timeoutMilliseconds !== "number" || checkObj.timeoutMilliseconds <= 0) {
-            violations.push({
-              message: `${checkPath}.timeoutMilliseconds must be a positive number`
-            });
-          }
-        }
       }
     }
   }
-  if ("extraDirectories" in settings) {
-    if (!Array.isArray(settings.extraDirectories)) {
+  if ("timeoutMilliseconds" in checkObj) {
+    if (typeof checkObj.timeoutMilliseconds !== "number" || checkObj.timeoutMilliseconds <= 0) {
       violations.push({
-        message: '"extraDirectories" must be an array of strings'
+        message: `${checkPath}.timeoutMilliseconds must be a positive number`
       });
-    } else {
-      for (let i = 0;i < settings.extraDirectories.length; i++) {
-        if (typeof settings.extraDirectories[i] !== "string") {
-          violations.push({
-            message: `extraDirectories[${i}] must be a string`
-          });
-        }
-      }
     }
   }
-  if ("dustCommand" in settings && typeof settings.dustCommand !== "string") {
-    violations.push({
-      message: '"dustCommand" must be a string'
-    });
+  return violations;
+}
+function validateChecksConfig(settings) {
+  if (!("checks" in settings)) {
+    return [];
   }
-  if ("installCommand" in settings && typeof settings.installCommand !== "string") {
+  if (!Array.isArray(settings.checks)) {
+    return [{ message: '"checks" must be an array' }];
+  }
+  const violations = [];
+  for (let i = 0;i < settings.checks.length; i++) {
+    violations.push(...validateCheckEntry(settings.checks[i], `checks[${i}]`));
+  }
+  return violations;
+}
+function validateExtraDirectories(settings) {
+  if (!("extraDirectories" in settings)) {
+    return [];
+  }
+  if (!Array.isArray(settings.extraDirectories)) {
+    return [{ message: '"extraDirectories" must be an array of strings' }];
+  }
+  const violations = [];
+  for (let i = 0;i < settings.extraDirectories.length; i++) {
+    if (typeof settings.extraDirectories[i] !== "string") {
+      violations.push({ message: `extraDirectories[${i}] must be a string` });
+    }
+  }
+  return violations;
+}
+function validateDustEventsUrl(settings) {
+  if ("eventsUrl" in settings && typeof settings.eventsUrl !== "string") {
+    return [{ message: '"eventsUrl" must be a string' }];
+  }
+  return [];
+}
+function validateSettingsJson(content) {
+  const violations = [];
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch (error) {
     violations.push({
-      message: '"installCommand" must be a string'
+      message: `Invalid JSON: ${error.message}`
     });
+    return violations;
   }
-  if ("eventsUrl" in settings && typeof settings.eventsUrl !== "string") {
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
     violations.push({
-      message: '"eventsUrl" must be a string'
+      message: "settings.json must be a JSON object"
     });
+    return violations;
+  }
+  const settings = parsed;
+  for (const key of Object.keys(settings)) {
+    if (!KNOWN_SETTINGS_KEYS.has(key)) {
+      violations.push({
+        message: `Unknown key "${key}" in settings.json. Known keys: ${[...KNOWN_SETTINGS_KEYS].sort().join(", ")}`
+      });
+    }
+  }
+  violations.push(...validateChecksConfig(settings));
+  violations.push(...validateExtraDirectories(settings));
+  violations.push(...validateDustEventsUrl(settings));
+  if ("dustCommand" in settings && typeof settings.dustCommand !== "string") {
+    violations.push({ message: '"dustCommand" must be a string' });
+  }
+  if ("installCommand" in settings && typeof settings.installCommand !== "string") {
+    violations.push({ message: '"installCommand" must be a string' });
   }
   return violations;
 }
@@ -973,7 +972,7 @@ import { accessSync, statSync } from "node:fs";
 import { chmod, mkdir, readdir, readFile, writeFile } from "node:fs/promises";
 import { createServer as httpCreateServer } from "node:http";
 import { homedir } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 
 // lib/bucket/auth.ts
 import { join as join4 } from "node:path";
@@ -1046,7 +1045,29 @@ async function authenticate(authDeps) {
         if (code) {
           cleanup();
           exchange(code).then(resolve, reject);
-          return new Response("<html><body><p>Authentication successful! You can close this tab.</p></body></html>", { headers: { "Content-Type": "text/html" } });
+          return new Response(`<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Authorized</title>
+  <style>
+    body { font-family: system-ui, sans-serif; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; background: #0a0a0a; color: #fafafa; }
+    .card { text-align: center; padding: 2rem; border: 1px solid #333; border-radius: 8px; max-width: 400px; }
+    h1 { font-size: 1.25rem; margin-bottom: 1rem; }
+    p { color: #999; }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <svg width="64" height="64" viewBox="0 0 512 512" fill="#fafafa" xmlns="http://www.w3.org/2000/svg" style="margin-bottom: 1rem;">
+      <path d="M392.566 159.4c-.649-79.601-31.851-134.481-80.25-141.944l-1.443-10.127a8.52 8.52 0 0 0-3.339-5.619 8.52 8.52 0 0 0-6.327-1.622l-92.99 13.287c-4.671.666-7.916 4.995-7.25 9.666l1.605 11.229c-.709.179-1.417.307-2.075.692-52.122 30.126-68.688 71.677-77.346 122.859-34.293 13.773-55.008 33.157-55.008 55.316 0 11.997 6.242 23.149 17.24 33.072-.12.922 42.712 207.763 42.712 207.763.06.273.128.555.213.828 10.64 33.678 63.146 57.203 127.693 57.203 66.963 0 118.308-23.107 127.906-58.031 0 0 42.832-206.841 42.712-207.763 10.998-9.922 17.24-21.074 17.24-33.072.001-21.34-19.264-40.083-51.293-53.737m-276.281 51.072a2180 2180 0 0 1-4.022 33.712c-17.326-9.606-27.043-20.545-27.043-31.048 0-11.989 12.723-24.541 34.933-35.044-1.374 10.452-2.612 21.219-3.868 32.38m88.849-158.254.658 4.637a8.52 8.52 0 0 0 3.339 5.619 8.5 8.5 0 0 0 5.123 1.708c.401 0 .811-.026 1.213-.085l92.99-13.287c4.671-.666 7.916-4.995 7.25-9.666l-.837-5.858c35.497 9.077 58.509 53.642 60.482 117.634-32.021-10.477-73.214-16.634-119.35-16.634-43.797 0-83.051 5.593-114.312 15.123 8.205-41.8 23.439-74.573 63.444-99.191m50.867 220.691c-52.891 0-97.217-8.735-127.505-21.1 1.819-13.645 3.339-26.778 4.756-39.425 1.648-14.704 3.228-28.555 5.149-41.653 29.724-10.341 70.208-17.368 117.6-17.368 100.641 0 170.781 31.5 170.781 59.773s-70.14 59.773-170.781 59.773"/>
+    </svg>
+    <h1>Your agent is connected!</h1>
+    <p>You can close this tab.</p>
+  </div>
+</body>
+</html>`, { headers: { "Content-Type": "text/html" } });
         }
         return new Response("Missing code", { status: 400 });
       }
@@ -1120,26 +1141,7 @@ function getLogLines(buffer) {
 }
 
 // lib/bucket/repository.ts
-import { dirname as dirname2, join as join6 } from "node:path";
-
-// lib/agent-events.ts
-function rawEventToAgentEvent(rawEvent) {
-  if (typeof rawEvent.type === "string" && rawEvent.type === "stream_event") {
-    return { type: "agent-session-activity" };
-  }
-  return { type: "claude-event", rawEvent };
-}
-function formatAgentEvent(event) {
-  switch (event.type) {
-    case "agent-session-started":
-      return `\uD83E\uDD16 Starting Claude: ${event.title}`;
-    case "agent-session-ended":
-      return event.success ? "\uD83E\uDD16 Claude session ended (success)" : `\uD83E\uDD16 Claude session ended (error: ${event.error})`;
-    case "agent-session-activity":
-    case "claude-event":
-      return null;
-  }
-}
+import { dirname as dirname2, join as join7 } from "node:path";
 
 // lib/claude/spawn-claude-code.ts
 import { spawn as nodeSpawn } from "node:child_process";
@@ -1540,11 +1542,74 @@ async function run(prompt, options = {}, dependencies = defaultRunnerDependencie
   await dependencies.streamEvents(events, sink, onRawEvent);
 }
 
+// lib/bucket/repository-git.ts
+import { join as join5 } from "node:path";
+function getRepoPath(repoName, reposDir) {
+  const safeName = repoName.replace(/[^a-zA-Z0-9-_/]/g, "-");
+  return join5(reposDir, safeName);
+}
+async function cloneRepository(repository, targetPath, spawn, context) {
+  return new Promise((resolve) => {
+    const proc = spawn("git", ["clone", repository.gitUrl, targetPath], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stderr = "";
+    proc.stderr?.on("data", (data) => {
+      stderr += data.toString();
+    });
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve(true);
+      } else {
+        context.stderr(`Failed to clone ${repository.name}: ${stderr.trim()}`);
+        resolve(false);
+      }
+    });
+    proc.on("error", (error) => {
+      context.stderr(`Failed to clone ${repository.name}: ${error.message}`);
+      resolve(false);
+    });
+  });
+}
+async function removeRepository(path, spawn, context) {
+  return new Promise((resolve) => {
+    const proc = spawn("rm", ["-rf", path], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    proc.on("close", (code) => {
+      resolve(code === 0);
+    });
+    proc.on("error", (error) => {
+      context.stderr(`Failed to remove ${path}: ${error.message}`);
+      resolve(false);
+    });
+  });
+}
+
+// lib/agent-events.ts
+function rawEventToAgentEvent(rawEvent) {
+  if (typeof rawEvent.type === "string" && rawEvent.type === "stream_event") {
+    return { type: "agent-session-activity" };
+  }
+  return { type: "claude-event", rawEvent };
+}
+function formatAgentEvent(event) {
+  switch (event.type) {
+    case "agent-session-started":
+      return `\uD83E\uDD16 Starting Claude: ${event.title}`;
+    case "agent-session-ended":
+      return event.success ? "\uD83E\uDD16 Claude session ended (success)" : `\uD83E\uDD16 Claude session ended (error: ${event.error})`;
+    case "agent-session-activity":
+    case "claude-event":
+      return null;
+  }
+}
+
 // lib/cli/commands/loop.ts
 import { spawn as nodeSpawn2 } from "node:child_process";
 import { readFileSync } from "node:fs";
 import os from "node:os";
-import { dirname, join as join5 } from "node:path";
+import { dirname, join as join6 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // lib/workflow-tasks.ts
@@ -1688,8 +1753,8 @@ async function next(dependencies) {
 var __dirname2 = dirname(fileURLToPath(import.meta.url));
 function getDustVersion() {
   const candidates = [
-    join5(__dirname2, "../../../package.json"),
-    join5(__dirname2, "../package.json")
+    join6(__dirname2, "../../../package.json"),
+    join6(__dirname2, "../package.json")
   ];
   for (const candidate of candidates) {
     try {
@@ -1965,68 +2030,8 @@ async function loopClaude(dependencies, loopDependencies = createDefaultDependen
   return { exitCode: 0 };
 }
 
-// lib/bucket/repository.ts
-var SLEEP_INTERVAL_MS2 = 30000;
-function parseRepository(data) {
-  if (typeof data === "string") {
-    return { name: data, gitUrl: data };
-  }
-  if (typeof data === "object" && data !== null && "name" in data && "gitUrl" in data) {
-    const repositoryData = data;
-    if (typeof repositoryData.name === "string" && typeof repositoryData.gitUrl === "string") {
-      const repo = {
-        name: repositoryData.name,
-        gitUrl: repositoryData.gitUrl
-      };
-      if (typeof repositoryData.url === "string") {
-        repo.url = repositoryData.url;
-      }
-      return repo;
-    }
-  }
-  return null;
-}
-function getRepoPath(repoName, reposDir) {
-  const safeName = repoName.replace(/[^a-zA-Z0-9-_/]/g, "-");
-  return join6(reposDir, safeName);
-}
-async function cloneRepository(repository, targetPath, spawn, context) {
-  return new Promise((resolve) => {
-    const proc = spawn("git", ["clone", repository.gitUrl, targetPath], {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let stderr = "";
-    proc.stderr?.on("data", (data) => {
-      stderr += data.toString();
-    });
-    proc.on("close", (code) => {
-      if (code === 0) {
-        resolve(true);
-      } else {
-        context.stderr(`Failed to clone ${repository.name}: ${stderr.trim()}`);
-        resolve(false);
-      }
-    });
-    proc.on("error", (error) => {
-      context.stderr(`Failed to clone ${repository.name}: ${error.message}`);
-      resolve(false);
-    });
-  });
-}
-async function removeRepository(path, spawn, context) {
-  return new Promise((resolve) => {
-    const proc = spawn("rm", ["-rf", path], {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    proc.on("close", (code) => {
-      resolve(code === 0);
-    });
-    proc.on("error", (error) => {
-      context.stderr(`Failed to remove ${path}: ${error.message}`);
-      resolve(false);
-    });
-  });
-}
+// lib/bucket/repository-loop.ts
+var FALLBACK_TIMEOUT_MS = 300000;
 function createNoOpGlobScanner() {
   return {
     scan: async function* () {}
@@ -2120,11 +2125,42 @@ async function runRepositoryLoop(repoState, repoDeps, sendEvent, sessionId) {
       }
     });
     if (result === "no_tasks") {
-      await sleep(SLEEP_INTERVAL_MS2);
+      await new Promise((resolve) => {
+        repoState.wakeUp = () => {
+          repoState.wakeUp = undefined;
+          resolve();
+        };
+        sleep(FALLBACK_TIMEOUT_MS).then(() => {
+          if (repoState.wakeUp) {
+            repoState.wakeUp = undefined;
+            resolve();
+          }
+        });
+      });
     }
   }
   appendLogLine(repoState.logBuffer, createLogLine(`Stopped loop for ${repoName}`, "stdout"));
 }
+// lib/bucket/repository.ts
+function parseRepository(data) {
+  if (typeof data === "string") {
+    return { name: data, gitUrl: data };
+  }
+  if (typeof data === "object" && data !== null && "name" in data && "gitUrl" in data) {
+    const repositoryData = data;
+    if (typeof repositoryData.name === "string" && typeof repositoryData.gitUrl === "string") {
+      const repo = {
+        name: repositoryData.name,
+        gitUrl: repositoryData.gitUrl
+      };
+      if (typeof repositoryData.url === "string") {
+        repo.url = repositoryData.url;
+      }
+      return repo;
+    }
+  }
+  return null;
+}
 async function addRepository(repository, manager, repoDeps, context) {
   if (manager.repositories.has(repository.name)) {
     return;
@@ -2169,6 +2205,7 @@ async function removeRepositoryFromManager(repoName, manager, repoDeps, context)
     return;
   }
   repoState.stopRequested = true;
+  repoState.wakeUp?.();
   if (repoState.loopPromise) {
     await Promise.race([repoState.loopPromise, repoDeps.sleep(5000)]);
   }
@@ -2730,7 +2767,7 @@ function createDefaultBucketDependencies() {
     writeStdout: defaultWriteStdout,
     isTTY: process.stdout.isTTY ?? false,
     sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
-    getReposDir: () => process.env.DUST_REPOS_DIR || join7(homedir(), ".dust", "repos"),
+    getReposDir: () => process.env.DUST_REPOS_DIR || join8(homedir(), ".dust", "repos"),
     auth: {
       createServer: defaultCreateServer,
       openBrowser: defaultOpenBrowser,
@@ -2876,6 +2913,10 @@ function connectWebSocket(token, state, bucketDependencies, context, fileSystem,
     state.emit(disconnectEvent);
     logMessage(state, context, useTUI, formatBucketEvent(disconnectEvent));
     state.ws = null;
+    if (event.code === 4000) {
+      logMessage(state, context, useTUI, "Another connection replaced this one. Not reconnecting.");
+      return;
+    }
     if (!state.shuttingDown) {
       logMessage(state, context, useTUI, `Reconnecting in ${state.reconnectDelay / 1000} seconds...`);
       state.reconnectTimer = setTimeout(() => {
@@ -2896,9 +2937,23 @@ function connectWebSocket(token, state, bucketDependencies, context, fileSystem,
         syncUIWithRepoList(state, repos);
         const repoDeps = toRepositoryDependencies(bucketDependencies, fileSystem);
         const repoContext = createTUIContext(state, context, useTUI);
-        handleRepositoryList(repos, state, repoDeps, repoContext).then(() => syncTUI(state)).catch((error) => {
+        handleRepositoryList(repos, state, repoDeps, repoContext).then(() => {
+          syncTUI(state);
+          for (const repoData of repos) {
+            if (typeof repoData === "object" && repoData !== null && "name" in repoData && "hasTask" in repoData && repoData.hasTask) {
+              const repoState = state.repositories.get(repoData.name);
+              repoState?.wakeUp?.();
+            }
+          }
+        }).catch((error) => {
           logMessage(state, context, useTUI, `Failed to handle repository list: ${error.message}`, "stderr");
         });
+      } else if (message.type === "task-available") {
+        const repoName = message.repository;
+        if (typeof repoName === "string") {
+          const repoState = state.repositories.get(repoName);
+          repoState?.wakeUp?.();
+        }
       }
     } catch {
       logMessage(state, context, useTUI, `Failed to parse WebSocket message: ${event.data}`, "stderr");
@@ -2920,6 +2975,7 @@ async function shutdown(state, bucketDeps, context) {
   }
   for (const repoState of state.repositories.values()) {
     repoState.stopRequested = true;
+    repoState.wakeUp?.();
   }
   const loopPromises = Array.from(state.repositories.values()).map((rs) => rs.loopPromise).filter((p) => p !== null);
   await Promise.all(loopPromises.map((p) => p.catch(() => {})));
@@ -3099,7 +3155,7 @@ function runBufferedProcess(spawnFn, command, commandArguments, cwd, shell, time
 }
 
 // lib/cli/commands/lint-markdown.ts
-import { dirname as dirname3, join as join8, resolve } from "node:path";
+import { dirname as dirname3, join as join9, resolve } from "node:path";
 var REQUIRED_HEADINGS = ["## Goals", "## Blocked By", "## Definition of Done"];
 var REQUIRED_GOAL_HEADINGS = ["## Parent Goal", "## Sub-Goals"];
 var SLUG_PATTERN = /^[a-z0-9]+(-[a-z0-9]+)*\.md$/;
@@ -3636,7 +3692,7 @@ async function lintMarkdown(dependencies) {
   const violations = [];
   context.stdout("Validating directory structure...");
   violations.push(...await validateDirectoryStructure(dustPath, fileSystem, dependencies.settings.extraDirectories));
-  const settingsPath = join8(dustPath, "config", "settings.json");
+  const settingsPath = join9(dustPath, "config", "settings.json");
   if (fileSystem.exists(settingsPath)) {
     context.stdout("Validating settings.json...");
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joshski/dust",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "description": "Flow state for AI coding agents",
   "type": "module",
   "bin": {