@joshski/dust 0.1.85 → 0.1.86

package/dist/bucket/repository-loop.d.ts

@@ -8,6 +8,7 @@ import type { AgentSessionEvent, EventMessage } from '../agent-events';
 import { type run as claudeRun, type RunnerDependencies } from '../claude/run';
 import type { OutputSink } from '../claude/types';
 import { type LoopEmitFn, type SendAgentEventFn } from '../cli/commands/loop';
+import { type RunnerDependencies as CodexRunnerDependencies, run as codexRun } from '../codex/run';
 import type { SendEventFn } from './events';
 import { type LogBuffer } from './log-buffer';
 import type { RepositoryDependencies, RepositoryState } from './repository';
@@ -53,10 +54,20 @@ export interface LoopState {
  * Create an OutputSink that buffers stdout and logs complete lines.
  */
 export declare function createBufferStdoutSink(loopState: LoopState, logBuffer: LogBuffer): OutputSink;
+/**
+ * Create a factory function that produces OutputSinks for agent runners.
+ * This factory captures loopState and logBuffer, returning a function
+ * that can be passed to RunnerDependencies.createStdoutSink.
+ */
+export declare function createStdoutSinkFactory(loopState: LoopState, logBuffer: LogBuffer): () => OutputSink;
 /**
  * Create a run function that redirects Claude output to a log buffer.
  */
 export declare function createBufferRun(run: RepositoryDependencies['run'], bufferSinkDeps: RunnerDependencies): typeof claudeRun;
+/**
+ * Create a run function that redirects Codex output to a log buffer.
+ */
+export declare function createCodexBufferRun(run: typeof codexRun, codexBufferSinkDeps: CodexRunnerDependencies): typeof claudeRun;
 /** No-op postEvent for LoopDependencies. */
 export declare function noOpPostEvent(): Promise<void>;
 /**

package/dist/docker/docker-agent.d.ts

@@ -41,4 +41,40 @@ export declare function buildDockerImage(config: DockerConfig, dependencies: Doc
  * Check if a Dockerfile exists at .dust/Dockerfile in the repository.
  */
 export declare function hasDockerfile(repoPath: string, dependencies: DockerDependencies): boolean;
+type DockerPrepareEvent = {
+    type: 'loop.docker_detected';
+    imageTag: string;
+} | {
+    type: 'loop.docker_building';
+    imageTag: string;
+} | {
+    type: 'loop.docker_built';
+    imageTag: string;
+} | {
+    type: 'loop.docker_error';
+    error: string;
+};
+interface DockerSpawnConfig {
+    imageTag: string;
+    repoPath: string;
+    homeDir: string;
+    hasGitconfig: boolean;
+}
+type PrepareDockerConfigResult = {
+    config: DockerSpawnConfig;
+} | {
+    error: string;
+} | Record<string, never>;
+/**
+ * Prepare Docker configuration for agent execution.
+ *
+ * Checks for a .dust/Dockerfile, verifies Docker availability, builds the image,
+ * and returns the spawn configuration. Emits events throughout the process.
+ *
+ * Returns:
+ * - `{ config: DockerSpawnConfig }` on success
+ * - `{ error: string }` on failure (Docker not available or build failed)
+ * - `{}` if no Dockerfile exists
+ */
+export declare function prepareDockerConfig(repoPath: string, dependencies: DockerDependencies, onEvent: (event: DockerPrepareEvent) => void): Promise<PrepareDockerConfigResult>;
 export {};

package/dist/dust.js

@@ -319,7 +319,7 @@ async function loadSettings(cwd, fileSystem) {
 }
 
 // lib/version.ts
-var DUST_VERSION = "0.1.85";
+var DUST_VERSION = "0.1.86";
 
 // lib/session.ts
 var DUST_UNATTENDED = "DUST_UNATTENDED";
@@ -1740,7 +1740,7 @@ async function defaultExchangeCode(code, fetchFn = fetch) {
   return body.token;
 }
 async function authenticate(authDeps) {
-  const exchange = authDeps.exchangeCode ?? defaultExchangeCode;
+  const exchange = authDeps.exchangeCode ?? ((code) => defaultExchangeCode(code, authDeps.fetch));
   return new Promise((resolve, reject) => {
     let timer = null;
     let serverHandle = null;
@@ -2807,7 +2807,6 @@ 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, provider) {
@@ -2856,7 +2855,6 @@ function formatAgentEvent(event) {
 import { spawn as nodeSpawn3 } from "node:child_process";
 import { existsSync } from "node:fs";
 import os from "node:os";
-import path2 from "node:path";
 
 // lib/docker/docker-agent.ts
 import path from "node:path";
@@ -2914,6 +2912,36 @@ function hasDockerfile(repoPath, dependencies) {
   const dockerfilePath = path.join(repoPath, ".dust", "Dockerfile");
   return dependencies.existsSync(dockerfilePath);
 }
+async function prepareDockerConfig(repoPath, dependencies, onEvent) {
+  log(`checking for .dust/Dockerfile in ${repoPath}`);
+  if (!hasDockerfile(repoPath, dependencies)) {
+    log("no .dust/Dockerfile found, running without Docker");
+    return {};
+  }
+  const imageTag = generateImageTag(repoPath);
+  log(`Dockerfile found, image tag: ${imageTag}`);
+  onEvent({ type: "loop.docker_detected", imageTag });
+  if (!await isDockerAvailable(dependencies)) {
+    const error = "Docker not available. Install Docker or remove .dust/Dockerfile to run without Docker.";
+    return { error };
+  }
+  onEvent({ type: "loop.docker_building", imageTag });
+  const buildResult = await buildDockerImage({ repoPath, imageTag }, dependencies);
+  if (!buildResult.success) {
+    onEvent({ type: "loop.docker_error", error: buildResult.error });
+    return { error: buildResult.error };
+  }
+  onEvent({ type: "loop.docker_built", imageTag });
+  const homeDir = dependencies.homedir();
+  const config = {
+    imageTag,
+    repoPath,
+    homeDir,
+    hasGitconfig: dependencies.existsSync(path.join(homeDir, ".gitconfig"))
+  };
+  log(`Docker config ready: ${JSON.stringify(config)}`);
+  return { config };
+}
 
 // lib/artifacts/workflow-tasks.ts
 var IDEA_TRANSITION_PREFIXES = [
@@ -3440,36 +3468,17 @@ 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.");
-      return { exitCode: 1 };
-    }
-    onLoopEvent({ type: "loop.docker_building", imageTag });
-    const buildResult = await buildDockerImage({ repoPath: context.cwd, imageTag }, dockerDeps);
-    if (!buildResult.success) {
-      onLoopEvent({ type: "loop.docker_error", error: buildResult.error });
-      context.stderr(buildResult.error);
-      return { exitCode: 1 };
-    }
-    onLoopEvent({ type: "loop.docker_built", imageTag });
-    const homeDir = os.homedir();
-    dockerConfig = {
-      imageTag,
-      repoPath: context.cwd,
-      homeDir,
-      hasGitconfig: existsSync(path2.join(homeDir, ".gitconfig"))
-    };
+  const dockerResult = await prepareDockerConfig(context.cwd, dockerDeps, onLoopEvent);
+  if ("error" in dockerResult) {
+    context.stderr(dockerResult.error);
+    return { exitCode: 1 };
+  }
+  if ("config" in dockerResult) {
+    dockerConfig = dockerResult.config;
     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" });
@@ -3546,6 +3555,7 @@ async function* spawnCodex(prompt, options = {}, dependencies = defaultDependenc
     });
     proc.on("error", reject);
   });
+  closePromise.catch(() => {});
   const abortHandler = () => {
     if (!proc.killed) {
       proc.kill();
@@ -3698,9 +3708,15 @@ function createBufferStdoutSink(loopState, logBuffer) {
     }
   };
 }
+function createStdoutSinkFactory(loopState, logBuffer) {
+  return () => createBufferStdoutSink(loopState, logBuffer);
+}
 function createBufferRun(run3, bufferSinkDeps) {
   return (prompt, options) => run3(prompt, options, bufferSinkDeps);
 }
+function createCodexBufferRun(run3, codexBufferSinkDeps) {
+  return (prompt, options) => run3(prompt, options, codexBufferSinkDeps);
+}
 async function noOpPostEvent() {}
 function createLoopEventHandler(logBuffer) {
   return function onLoopEvent(event) {
@@ -3767,31 +3783,6 @@ async function runRepositoryLoop(repoState, repoDeps, sendEvent, sessionId) {
     sequence: 0,
     agentSessionId: undefined
   };
-  const isCodex = repoState.repository.agentProvider === "codex";
-  const agentType = isCodex ? "codex" : "claude";
-  log3(`${repoName}: agentProvider=${repoState.repository.agentProvider ?? "(unset)"}, using ${agentType}`);
-  const createStdoutSink2 = () => createBufferStdoutSink(loopState, repoState.logBuffer);
-  let bufferRun;
-  if (isCodex) {
-    const codexBufferSinkDeps = {
-      ...defaultRunnerDependencies2,
-      createStdoutSink: createStdoutSink2
-    };
-    bufferRun = (prompt, options) => run2(prompt, options, codexBufferSinkDeps);
-  } else {
-    const bufferSinkDeps = {
-      ...defaultRunnerDependencies,
-      createStdoutSink: createStdoutSink2
-    };
-    bufferRun = createBufferRun(run3, bufferSinkDeps);
-  }
-  const loopDeps = {
-    spawn,
-    run: bufferRun,
-    sleep,
-    postEvent: noOpPostEvent,
-    agentType
-  };
   const onLoopEvent = createLoopEventHandler(repoState.logBuffer);
   const onAgentEvent = createAgentEventHandler({
     repoState,
@@ -3807,43 +3798,53 @@ async function runRepositoryLoop(repoState, repoDeps, sendEvent, sessionId) {
     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;
-        }
-      }
+  const dockerResult = await prepareDockerConfig(repoState.path, dockerDeps, onLoopEvent);
+  if ("error" in dockerResult) {
+    log3(`Docker error: ${dockerResult.error}`);
+    appendLogLine(repoState.logBuffer, createLogLine(dockerResult.error, "stderr"));
+  } else if ("config" in dockerResult) {
+    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");
+    dockerConfig = dockerResult.config;
   }
   log3(`loop started for ${repoName} at ${repoState.path}`);
   while (!repoState.stopRequested) {
     loopState.agentSessionId = crypto.randomUUID();
+    const isCodex = repoState.repository.agentProvider === "codex";
+    const agentType = isCodex ? "codex" : "claude";
+    log3(`${repoName}: agentProvider=${repoState.repository.agentProvider ?? "(unset)"}, using ${agentType}`);
+    const createStdoutSink2 = createStdoutSinkFactory(loopState, repoState.logBuffer);
+    let bufferRun;
+    if (isCodex) {
+      const codexBufferSinkDeps = {
+        ...defaultRunnerDependencies2,
+        spawnCodex: (prompt, options = {}) => {
+          const spawnDeps = {
+            ...defaultDependencies2,
+            spawn
+          };
+          return defaultRunnerDependencies2.spawnCodex(prompt, options, spawnDeps);
+        },
+        createStdoutSink: createStdoutSink2
+      };
+      bufferRun = createCodexBufferRun(run2, codexBufferSinkDeps);
+    } else {
+      const bufferSinkDeps = {
+        ...defaultRunnerDependencies,
+        createStdoutSink: createStdoutSink2
+      };
+      bufferRun = createBufferRun(run3, bufferSinkDeps);
+    }
+    const loopDeps = {
+      spawn,
+      run: bufferRun,
+      sleep,
+      postEvent: noOpPostEvent,
+      agentType
+    };
     const abortController = new AbortController;
     const cancelCurrentIteration = createCancelHandler(abortController);
     repoState.cancelCurrentIteration = cancelCurrentIteration;
@@ -3990,18 +3991,14 @@ async function handleRepositoryList(repositories, manager, repoDeps, context) {
     }
   }
   for (const [name, repo] of incomingRepos) {
-    if (!manager.repositories.has(name)) {
+    const existing = manager.repositories.get(name);
+    if (!existing) {
       await addRepository(repo, manager, repoDeps, context);
-    } else {
-      const existing = manager.repositories.get(name);
-      if (!existing)
-        continue;
-      if (existing.repository.agentProvider !== repo.agentProvider) {
-        const from = existing.repository.agentProvider ?? "(unset)";
-        const to = repo.agentProvider ?? "(unset)";
-        log4(`${name}: agentProvider changed from ${from} to ${to}`);
-        existing.repository.agentProvider = repo.agentProvider;
-      }
+    } else if (existing.repository.agentProvider !== repo.agentProvider) {
+      const from = existing.repository.agentProvider ?? "(unset)";
+      const to = repo.agentProvider ?? "(unset)";
+      log4(`${name}: agentProvider changed from ${from} to ${to}`);
+      existing.repository.agentProvider = repo.agentProvider;
     }
   }
   for (const name of manager.repositories.keys()) {
@@ -4114,18 +4111,19 @@ function visibleLength(text) {
 function truncateLine(text, maxWidth) {
   if (maxWidth <= 0)
     return "";
-  if (visibleLength(text) <= maxWidth)
+  const textLength = visibleLength(text);
+  if (textLength <= maxWidth)
     return text;
   const ansiRegex = /\x1b\[[0-9;]*m/g;
+  const truncateAt = maxWidth - CHARS.ellipsis.length;
   let visibleCount = 0;
   let result = "";
   let lastIndex = 0;
   for (let match = ansiRegex.exec(text);match !== null; match = ansiRegex.exec(text)) {
     const textBefore = text.slice(lastIndex, match.index);
     for (const char of textBefore) {
-      if (visibleCount >= maxWidth - CHARS.ellipsis.length) {
-        result += CHARS.ellipsis;
-        return result + ANSI.RESET;
+      if (visibleCount >= truncateAt) {
+        return result + CHARS.ellipsis + ANSI.RESET;
       }
       result += char;
       visibleCount++;
@@ -4135,14 +4133,13 @@ function truncateLine(text, maxWidth) {
   }
   const remaining = text.slice(lastIndex);
   for (const char of remaining) {
-    if (visibleCount >= maxWidth - CHARS.ellipsis.length) {
-      result += CHARS.ellipsis;
-      return result + ANSI.RESET;
+    if (visibleCount >= truncateAt) {
+      return result + CHARS.ellipsis + ANSI.RESET;
     }
     result += char;
     visibleCount++;
   }
-  return result;
+  return result + ANSI.RESET;
 }
 function createTerminalUIState() {
   return {
@@ -4272,7 +4269,7 @@ function getVisibleLogs(state) {
       const buffer2 = state.logBuffers.get(repoName2);
       if (!buffer2)
         continue;
-      const color2 = repoColors.get(repoName2) ?? ANSI.FG_WHITE;
+      const color2 = repoColors.get(repoName2);
       const lines = getLogLines(buffer2);
       for (const line of lines) {
         allLogs.push({ ...line, repository: repoName2, color: color2 });
@@ -4414,27 +4411,27 @@ var log5 = createLogger("dust:cli:commands:bucket");
 var DEFAULT_DUSTBUCKET_WS_URL = "wss://dustbucket.com/agent/connect";
 function createAuthFileSystem(dependencies) {
   return {
-    exists: (path4) => {
+    exists: (path2) => {
       try {
-        dependencies.accessSync(path4);
+        dependencies.accessSync(path2);
         return true;
       } catch {
         return false;
       }
     },
-    isDirectory: (path4) => {
+    isDirectory: (path2) => {
       try {
-        return dependencies.statSync(path4).isDirectory();
+        return dependencies.statSync(path2).isDirectory();
       } catch {
         return false;
       }
     },
-    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),
+    getFileCreationTime: (path2) => dependencies.statSync(path2).birthtimeMs,
+    readFile: (path2) => dependencies.readFile(path2, "utf8"),
+    writeFile: (path2, content) => dependencies.writeFile(path2, content, "utf8"),
+    mkdir: (path2, options) => dependencies.mkdir(path2, options).then(() => {}),
+    readdir: (path2) => dependencies.readdir(path2),
+    chmod: (path2, mode) => dependencies.chmod(path2, mode),
     rename: (oldPath, newPath) => dependencies.rename(oldPath, newPath)
   };
 }
@@ -4615,6 +4612,20 @@ function syncTUI(state) {
     }
   }
 }
+function handleRepositoryListSuccess(state, repos, repoDeps, context, useTUI) {
+  syncTUI(state);
+  for (const repoData of repos) {
+    if (repoData.hasTask) {
+      const repoState = state.repositories.get(repoData.name);
+      if (repoState) {
+        signalTaskAvailable(repoState, state, repoDeps, context, useTUI);
+      }
+    }
+  }
+}
+function handleRepositoryListError(state, context, useTUI, error) {
+  logMessage(state, context, useTUI, `Failed to handle repository list: ${error.message}`, "stderr");
+}
 function logMessage(state, context, useTUI, message, stream = "stdout") {
   if (useTUI) {
     const systemBuffer = state.logBuffers.get("system");
@@ -4752,19 +4763,7 @@ function executeEffects(effects, dependencies) {
         const repoDeps = toRepositoryDependencies(bucketDependencies, fileSystem);
         const repoContext = createTUIContext(state, context, useTUI);
         const repos = effect.repositories;
-        handleRepositoryList(repos, state, repoDeps, repoContext).then(() => {
-          syncTUI(state);
-          for (const repoData of repos) {
-            if (repoData.hasTask) {
-              const repoState = state.repositories.get(repoData.name);
-              if (repoState) {
-                signalTaskAvailable(repoState, state, repoDeps, context, useTUI);
-              }
-            }
-          }
-        }).catch((error) => {
-          logMessage(state, context, useTUI, `Failed to handle repository list: ${error.message}`, "stderr");
-        });
+        handleRepositoryList(repos, state, repoDeps, repoContext).then(() => handleRepositoryListSuccess(state, repos, repoDeps, context, useTUI)).catch((error) => handleRepositoryListError(state, context, useTUI, error));
         break;
       }
       case "signalTaskAvailable": {
@@ -5065,16 +5064,16 @@ function createDefaultUploadDependencies() {
       getHomeDir: () => homedir2(),
       fileSystem: authFileSystem
     },
-    readFileBytes: async (path4) => {
-      const buffer = await Bun.file(path4).arrayBuffer();
+    readFileBytes: async (path2) => {
+      const buffer = await Bun.file(path2).arrayBuffer();
       return new Uint8Array(buffer);
     },
-    getFileSize: async (path4) => {
-      const file = Bun.file(path4);
+    getFileSize: async (path2) => {
+      const file = Bun.file(path2);
       return file.size;
     },
-    fileExists: async (path4) => {
-      const file = Bun.file(path4);
+    fileExists: async (path2) => {
+      const file = Bun.file(path2);
       return file.exists();
     },
     uploadFile: async (url, token, fileBytes, contentType, fileName) => {
@@ -5869,12 +5868,12 @@ function validateNoCycles(allPrincipleRelationships) {
   }
   for (const rel of allPrincipleRelationships) {
     const visited = new Set;
-    const path4 = [];
+    const path2 = [];
     let current = rel.filePath;
     while (current) {
       if (visited.has(current)) {
-        const cycleStart = path4.indexOf(current);
-        const cyclePath = path4.slice(cycleStart).concat(current);
+        const cycleStart = path2.indexOf(current);
+        const cyclePath = path2.slice(cycleStart).concat(current);
         violations.push({
           file: rel.filePath,
           message: `Cycle detected in principle hierarchy: ${cyclePath.join(" -> ")}`
@@ -5882,7 +5881,7 @@ function validateNoCycles(allPrincipleRelationships) {
         break;
       }
       visited.add(current);
-      path4.push(current);
+      path2.push(current);
       const currentRel = relationshipMap.get(current);
       if (currentRel && currentRel.parentPrinciples.length > 0) {
         current = currentRel.parentPrinciples[0];
@@ -6170,14 +6169,12 @@ async function runValidationCheck(dependencies, emitEvent, clock = Date.now) {
   if (result.exitCode === 0) {
     emitEvent?.({ type: "check-passed", name: "lint", durationMs });
   } else {
-    const failedEvent = {
+    emitEvent?.({
       type: "check-failed",
       name: "lint",
-      durationMs
-    };
-    if (output)
-      failedEvent.output = output;
-    emitEvent?.(failedEvent);
+      durationMs,
+      output
+    });
   }
   return {
     name: "lint",
@@ -6602,7 +6599,7 @@ async function list(dependencies) {
         ideas: collectedItems.map((i) => ({
           path: i.path,
           title: i.title,
-          status: i.status ?? "draft"
+          status: i.status
         }))
       });
     } else if (type === "principles") {
@@ -6869,8 +6866,8 @@ function parseGitDiffNameStatus(output) {
     const parts = line.split("\t");
     if (parts.length >= 2) {
       const statusChar = parts[0].charAt(0);
-      const path4 = parts.length > 2 ? parts[2] : parts[1];
-      changes.push({ status: statusChar, path: path4 });
+      const path2 = parts.length > 2 ? parts[2] : parts[1];
+      changes.push({ status: statusChar, path: path2 });
     }
   }
   return changes;
@@ -6931,12 +6928,12 @@ async function getUncommittedFiles(cwd, gitRunner) {
 `).filter((line) => line.length > 0);
   for (const line of lines) {
     if (line.length > 3) {
-      const path4 = line.substring(3);
-      const arrowIndex = path4.indexOf(" -> ");
+      const path2 = line.substring(3);
+      const arrowIndex = path2.indexOf(" -> ");
       if (arrowIndex !== -1) {
-        files.push(path4.substring(arrowIndex + 4));
+        files.push(path2.substring(arrowIndex + 4));
       } else {
-        files.push(path4);
+        files.push(path2);
       }
     }
   }
@@ -7087,24 +7084,24 @@ async function main(options) {
 function createFileSystem(primitives) {
   return {
     exists: primitives.existsSync,
-    isDirectory: (path4) => {
+    isDirectory: (path2) => {
       try {
-        return primitives.statSync(path4).isDirectory();
+        return primitives.statSync(path2).isDirectory();
       } catch {
         return false;
       }
     },
-    readFile: (path4) => primitives.readFile(path4, "utf-8"),
-    writeFile: (path4, content, options) => primitives.writeFile(path4, content, {
+    readFile: (path2) => primitives.readFile(path2, "utf-8"),
+    writeFile: (path2, content, options) => primitives.writeFile(path2, content, {
       encoding: "utf-8",
       flag: options?.flag
     }),
-    mkdir: async (path4, options) => {
-      await primitives.mkdir(path4, options);
+    mkdir: async (path2, options) => {
+      await primitives.mkdir(path2, options);
     },
-    getFileCreationTime: (path4) => primitives.statSync(path4).birthtimeMs,
-    readdir: (path4) => primitives.readdir(path4),
-    chmod: (path4, mode) => primitives.chmod(path4, mode),
+    getFileCreationTime: (path2) => primitives.statSync(path2).birthtimeMs,
+    readdir: (path2) => primitives.readdir(path2),
+    chmod: (path2, mode) => primitives.chmod(path2, mode),
     rename: (oldPath, newPath) => primitives.rename(oldPath, newPath)
   };
 }

package/package.json

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