@joshski/dust 0.1.81 → 0.1.83

package/dist/bucket/repository.d.ts

@@ -7,6 +7,7 @@
 import { spawn as nodeSpawn } from 'node:child_process';
 import { run as claudeRun } from '../claude/run';
 import type { CommandDependencies, FileSystem } from '../cli/types';
+import type { DockerDependencies } from '../docker/docker-agent';
 import { type BucketEmitFn, type SendEventFn } from './events';
 import { type LogBuffer } from './log-buffer';
 export { cloneRepository, getRepoPath, removeRepository, } from './repository-git';
@@ -47,6 +48,8 @@ export interface RepositoryDependencies {
     fileSystem: FileSystem;
     sleep: (ms: number) => Promise<void>;
     getReposDir: () => string;
+    /** Optional overrides for Docker dependency functions (for testing) */
+    dockerDeps?: Partial<DockerDependencies>;
 }
 /**
  * Start (or restart) the per-repository loop and keep loopPromise state accurate.

package/dist/dust.js

@@ -318,7 +318,7 @@ async function loadSettings(cwd, fileSystem) {
 }
 
 // lib/version.ts
-var DUST_VERSION = "0.1.81";
+var DUST_VERSION = "0.1.83";
 
 // lib/session.ts
 var DUST_UNATTENDED = "DUST_UNATTENDED";
@@ -2043,16 +2043,25 @@ function buildDockerRunArguments(docker, claudeArguments, env) {
     "-w",
     "/workspace",
     "-v",
-    `${docker.homeDir}/.claude:/root/.claude:ro`,
+    `${docker.homeDir}/.claude:/home/user/.claude`,
     "-v",
-    `${docker.homeDir}/.ssh:/root/.ssh:ro`
+    `${docker.homeDir}/.claude.json:/home/user/.claude.json`,
+    "-v",
+    `${docker.homeDir}/.ssh:/home/user/.ssh:ro`,
+    "-e",
+    "HOME=/home/user"
   ];
   if (docker.hasGitconfig) {
-    dockerArguments.push("-v", `${docker.homeDir}/.gitconfig:/root/.gitconfig:ro`);
+    dockerArguments.push("-v", `${docker.homeDir}/.gitconfig:/home/user/.gitconfig:ro`);
   }
   for (const [key, value] of Object.entries(env)) {
     dockerArguments.push("-e", `${key}=${value}`);
   }
+  for (const key of ["CLAUDE_CODE_OAUTH_TOKEN", "OPENAI_API_KEY"]) {
+    if (process.env[key] && !(key in env)) {
+      dockerArguments.push("-e", `${key}=${process.env[key]}`);
+    }
+  }
   dockerArguments.push(docker.imageTag);
   dockerArguments.push("claude");
   dockerArguments.push(...claudeArguments);
@@ -2535,6 +2544,11 @@ async function removeRepository(path, spawn, context) {
   });
 }
 
+// lib/bucket/repository-loop.ts
+import { existsSync as fsExistsSync } from "node:fs";
+import os2 from "node:os";
+import path3 from "node:path";
+
 // lib/agent-events.ts
 function rawEventToAgentEvent(rawEvent) {
   if (typeof rawEvent.type === "string" && rawEvent.type === "stream_event") {
@@ -3166,8 +3180,10 @@ async function loopClaude(dependencies, loopDependencies = createDefaultDependen
     homedir: loopDependencies.dockerDeps?.homedir ?? os.homedir,
     existsSync: loopDependencies.dockerDeps?.existsSync ?? existsSync
   };
+  log2(`checking for .dust/Dockerfile in ${context.cwd}`);
   if (hasDockerfile(context.cwd, dockerDeps)) {
     const imageTag = generateImageTag(context.cwd);
+    log2(`Dockerfile found, image tag: ${imageTag}`);
     onLoopEvent({ type: "loop.docker_detected", imageTag });
     if (!await isDockerAvailable(dockerDeps)) {
       context.stderr("Docker not available. Install Docker or remove .dust/Dockerfile to run without Docker.");
@@ -3188,6 +3204,12 @@ async function loopClaude(dependencies, loopDependencies = createDefaultDependen
       homeDir,
       hasGitconfig: existsSync(path2.join(homeDir, ".gitconfig"))
     };
+    if (!process.env.CLAUDE_CODE_OAUTH_TOKEN) {
+      context.stderr("Docker mode requires CLAUDE_CODE_OAUTH_TOKEN. Run `claude setup-token` and export the token.");
+      return { exitCode: 1 };
+    }
+  } else {
+    log2("no .dust/Dockerfile found, running without Docker");
   }
   log2(`starting loop, maxIterations=${maxIterations}, sessionId=${sessionId}`);
   onLoopEvent({ type: "loop.warning" });
@@ -3518,6 +3540,46 @@ async function runRepositoryLoop(repoState, repoDeps, sendEvent, sessionId) {
     loopState
   });
   const hooksInstalled = await manageGitHooks(commandDeps);
+  let dockerConfig;
+  const dockerDeps = {
+    spawn: repoDeps.dockerDeps?.spawn ?? spawn,
+    homedir: repoDeps.dockerDeps?.homedir ?? os2.homedir,
+    existsSync: repoDeps.dockerDeps?.existsSync ?? fsExistsSync
+  };
+  log3(`checking for .dust/Dockerfile in ${repoState.path}`);
+  if (hasDockerfile(repoState.path, dockerDeps)) {
+    const imageTag = generateImageTag(repoState.path);
+    log3(`Dockerfile found, image tag: ${imageTag}`);
+    onLoopEvent({ type: "loop.docker_detected", imageTag });
+    if (!await isDockerAvailable(dockerDeps)) {
+      log3("Docker not available");
+      appendLogLine(repoState.logBuffer, createLogLine("Docker not available. Install Docker or remove .dust/Dockerfile.", "stderr"));
+    } else {
+      onLoopEvent({ type: "loop.docker_building", imageTag });
+      const buildResult = await buildDockerImage({ repoPath: repoState.path, imageTag }, dockerDeps);
+      if (!buildResult.success) {
+        onLoopEvent({ type: "loop.docker_error", error: buildResult.error });
+        log3(`Docker build failed: ${buildResult.error}`);
+      } else {
+        onLoopEvent({ type: "loop.docker_built", imageTag });
+        const homeDir = dockerDeps.homedir();
+        dockerConfig = {
+          imageTag,
+          repoPath: repoState.path,
+          homeDir,
+          hasGitconfig: dockerDeps.existsSync(path3.join(homeDir, ".gitconfig"))
+        };
+        log3(`Docker config ready: ${JSON.stringify(dockerConfig)}`);
+        if (!process.env.CLAUDE_CODE_OAUTH_TOKEN) {
+          log3("CLAUDE_CODE_OAUTH_TOKEN is not set, cannot run in Docker mode");
+          appendLogLine(repoState.logBuffer, createLogLine("Docker mode requires CLAUDE_CODE_OAUTH_TOKEN. Run `claude setup-token` and export the token.", "stderr"));
+          return;
+        }
+      }
+    }
+  } else {
+    log3("no .dust/Dockerfile found, running without Docker");
+  }
   log3(`loop started for ${repoName} at ${repoState.path}`);
   while (!repoState.stopRequested) {
     loopState.agentSessionId = crypto.randomUUID();
@@ -3530,7 +3592,8 @@ async function runRepositoryLoop(repoState, repoDeps, sendEvent, sessionId) {
         hooksInstalled,
         signal: abortController.signal,
         repositoryId: repoState.repository.id.toString(),
-        onRawEvent: createHeartbeatThrottler(onAgentEvent)
+        onRawEvent: createHeartbeatThrottler(onAgentEvent),
+        docker: dockerConfig
       });
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -3587,6 +3650,7 @@ function parseRepository(data) {
       return {
         name: repositoryData.name,
         gitUrl: repositoryData.gitUrl,
+        gitSshUrl: typeof repositoryData.gitSshUrl === "string" ? repositoryData.gitSshUrl : undefined,
         url: repositoryData.url,
         id: repositoryData.id
       };
@@ -4211,27 +4275,27 @@ function defaultWriteStdout(data) {
 }
 function createAuthFileSystem(dependencies) {
   return {
-    exists: (path3) => {
+    exists: (path4) => {
       try {
-        dependencies.accessSync(path3);
+        dependencies.accessSync(path4);
         return true;
       } catch {
         return false;
       }
     },
-    isDirectory: (path3) => {
+    isDirectory: (path4) => {
       try {
-        return dependencies.statSync(path3).isDirectory();
+        return dependencies.statSync(path4).isDirectory();
       } catch {
         return false;
       }
     },
-    getFileCreationTime: (path3) => dependencies.statSync(path3).birthtimeMs,
-    readFile: (path3) => dependencies.readFile(path3, "utf8"),
-    writeFile: (path3, content) => dependencies.writeFile(path3, content, "utf8"),
-    mkdir: (path3, options) => dependencies.mkdir(path3, options).then(() => {}),
-    readdir: (path3) => dependencies.readdir(path3),
-    chmod: (path3, mode) => dependencies.chmod(path3, mode),
+    getFileCreationTime: (path4) => dependencies.statSync(path4).birthtimeMs,
+    readFile: (path4) => dependencies.readFile(path4, "utf8"),
+    writeFile: (path4, content) => dependencies.writeFile(path4, content, "utf8"),
+    mkdir: (path4, options) => dependencies.mkdir(path4, options).then(() => {}),
+    readdir: (path4) => dependencies.readdir(path4),
+    chmod: (path4, mode) => dependencies.chmod(path4, mode),
     rename: (oldPath, newPath) => dependencies.rename(oldPath, newPath)
   };
 }
@@ -4454,13 +4518,12 @@ function connectWebSocket(token, state, bucketDependencies, context, fileSystem,
         logMessage(state, context, useTUI, "  (empty)");
       } else {
         for (const r of repos) {
-          const attrs = [];
-          attrs.push(`name=${r.name}`);
-          attrs.push(`id=${r.id}`);
-          attrs.push(`gitUrl=${r.gitUrl}`);
-          attrs.push(`url=${r.url}`);
-          attrs.push(`hasTask=${r.hasTask}`);
-          logMessage(state, context, useTUI, `  - ${attrs.join(", ")}`);
+          logMessage(state, context, useTUI, `  - name=${r.name}`);
+          logMessage(state, context, useTUI, `    id=${r.id}`);
+          logMessage(state, context, useTUI, `    gitUrl=${r.gitUrl}`);
+          logMessage(state, context, useTUI, `    gitSshUrl=${r.gitSshUrl ?? "(none)"}`);
+          logMessage(state, context, useTUI, `    url=${r.url}`);
+          logMessage(state, context, useTUI, `    hasTask=${r.hasTask}`);
         }
       }
       syncUIWithRepoList(state, repos);
@@ -4699,16 +4762,16 @@ function createDefaultUploadDependencies() {
       getHomeDir: () => homedir2(),
       fileSystem: authFileSystem
     },
-    readFileBytes: async (path3) => {
-      const buffer = await Bun.file(path3).arrayBuffer();
+    readFileBytes: async (path4) => {
+      const buffer = await Bun.file(path4).arrayBuffer();
       return new Uint8Array(buffer);
     },
-    getFileSize: async (path3) => {
-      const file = Bun.file(path3);
+    getFileSize: async (path4) => {
+      const file = Bun.file(path4);
       return file.size;
     },
-    fileExists: async (path3) => {
-      const file = Bun.file(path3);
+    fileExists: async (path4) => {
+      const file = Bun.file(path4);
       return file.exists();
     },
     uploadFile: async (url, token, fileBytes, contentType, fileName) => {
@@ -5502,12 +5565,12 @@ function validateNoCycles(allPrincipleRelationships) {
   }
   for (const rel of allPrincipleRelationships) {
     const visited = new Set;
-    const path3 = [];
+    const path4 = [];
     let current = rel.filePath;
     while (current) {
       if (visited.has(current)) {
-        const cycleStart = path3.indexOf(current);
-        const cyclePath = path3.slice(cycleStart).concat(current);
+        const cycleStart = path4.indexOf(current);
+        const cyclePath = path4.slice(cycleStart).concat(current);
         violations.push({
           file: rel.filePath,
           message: `Cycle detected in principle hierarchy: ${cyclePath.join(" -> ")}`
@@ -5515,7 +5578,7 @@ function validateNoCycles(allPrincipleRelationships) {
         break;
       }
       visited.add(current);
-      path3.push(current);
+      path4.push(current);
       const currentRel = relationshipMap.get(current);
       if (currentRel && currentRel.parentPrinciples.length > 0) {
         current = currentRel.parentPrinciples[0];
@@ -6502,8 +6565,8 @@ function parseGitDiffNameStatus(output) {
     const parts = line.split("\t");
     if (parts.length >= 2) {
       const statusChar = parts[0].charAt(0);
-      const path3 = parts.length > 2 ? parts[2] : parts[1];
-      changes.push({ status: statusChar, path: path3 });
+      const path4 = parts.length > 2 ? parts[2] : parts[1];
+      changes.push({ status: statusChar, path: path4 });
     }
   }
   return changes;
@@ -6564,12 +6627,12 @@ async function getUncommittedFiles(cwd, gitRunner) {
 `).filter((line) => line.length > 0);
   for (const line of lines) {
     if (line.length > 3) {
-      const path3 = line.substring(3);
-      const arrowIndex = path3.indexOf(" -> ");
+      const path4 = line.substring(3);
+      const arrowIndex = path4.indexOf(" -> ");
       if (arrowIndex !== -1) {
-        files.push(path3.substring(arrowIndex + 4));
+        files.push(path4.substring(arrowIndex + 4));
       } else {
-        files.push(path3);
+        files.push(path4);
       }
     }
   }
@@ -6720,24 +6783,24 @@ async function main(options) {
 function createFileSystem(primitives) {
   return {
     exists: primitives.existsSync,
-    isDirectory: (path3) => {
+    isDirectory: (path4) => {
       try {
-        return primitives.statSync(path3).isDirectory();
+        return primitives.statSync(path4).isDirectory();
       } catch {
         return false;
       }
     },
-    readFile: (path3) => primitives.readFile(path3, "utf-8"),
-    writeFile: (path3, content, options) => primitives.writeFile(path3, content, {
+    readFile: (path4) => primitives.readFile(path4, "utf-8"),
+    writeFile: (path4, content, options) => primitives.writeFile(path4, content, {
       encoding: "utf-8",
       flag: options?.flag
     }),
-    mkdir: async (path3, options) => {
-      await primitives.mkdir(path3, options);
+    mkdir: async (path4, options) => {
+      await primitives.mkdir(path4, options);
     },
-    getFileCreationTime: (path3) => primitives.statSync(path3).birthtimeMs,
-    readdir: (path3) => primitives.readdir(path3),
-    chmod: (path3, mode) => primitives.chmod(path3, mode),
+    getFileCreationTime: (path4) => primitives.statSync(path4).birthtimeMs,
+    readdir: (path4) => primitives.readdir(path4),
+    chmod: (path4, mode) => primitives.chmod(path4, mode),
     rename: (oldPath, newPath) => primitives.rename(oldPath, newPath)
   };
 }

package/package.json

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