@questionbase/deskfree 0.4.3 → 0.4.4

package/dist/index.d.ts

@@ -26,6 +26,8 @@ interface OrchestratorQueryOptions {
     model: string;
     /** Agent SDK session ID to resume (for multi-turn conversations). */
     sessionId?: string;
+    /** Path to user's Claude Code executable (uses bundled CLI if omitted). */
+    claudeCodePath?: string;
 }
 /**
  * Run the orchestrator agent. Returns an async iterable of SDKMessage events.
@@ -40,6 +42,8 @@ interface HeartbeatOptions {
     prompt: string;
     orchestratorServer: McpSdkServerConfigWithInstance;
     model: string;
+    /** Path to user's Claude Code executable (uses bundled CLI if omitted). */
+    claudeCodePath?: string;
 }
 /**
  * Run a one-shot heartbeat query (no session persistence).
@@ -390,6 +394,8 @@ interface RuntimeConfig extends LocalConfig {
     duskHour: number | null;
     /** IANA timezone string (e.g. 'America/New_York') for sleep scheduling */
     timezone: string | null;
+    /** Absolute path to the user's Claude Code executable (resolved for 'claude-code' provider) */
+    claudeCodePath: string | undefined;
 }
 /**
  * Load local config from environment variables.
@@ -401,6 +407,10 @@ declare function loadConfig(): LocalConfig;
 /**
  * Merge local config with API-bootstrapped config.
  * Env var overrides take precedence over API values for debugging/testing.
+ *
+ * When running multiple agents on the same machine, stateDir and toolsDir
+ * are automatically namespaced by botId (unless explicitly overridden via
+ * DESKFREE_STATE_DIR / DESKFREE_TOOLS_DIR env vars).
  */
 declare function mergeWithRemoteConfig(local: LocalConfig, remote: RuntimeBootstrapConfig): RuntimeConfig;
 

package/dist/index.js

@@ -3,9 +3,9 @@ import { query, tool, createSdkMcpServer } from '@anthropic-ai/claude-agent-sdk'
 import { createRequire as createRequire$1 } from 'module';
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, unlinkSync, createWriteStream } from 'fs';
 import { join, dirname, extname } from 'path';
+import { execFileSync, execFile } from 'child_process';
 import { z } from 'zod';
 import { appendFile, readFile, mkdir, unlink } from 'fs/promises';
-import { execFile } from 'child_process';
 import { randomUUID } from 'crypto';
 import { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
@@ -11295,7 +11295,7 @@ var DISALLOWED_BUILTIN_TOOLS = [
   "Agent"
 ];
 function runOrchestrator(opts) {
-  const { prompt, orchestratorServer, model, sessionId } = opts;
+  const { prompt, orchestratorServer, model, sessionId, claudeCodePath } = opts;
   return query({
     prompt,
     options: {
@@ -11307,6 +11307,7 @@ function runOrchestrator(opts) {
       },
       systemPrompt: DESKFREE_AGENT_DIRECTIVE,
       model,
+      ...claudeCodePath ? { pathToClaudeCodeExecutable: claudeCodePath } : {},
       maxTurns: MAX_ORCHESTRATOR_TURNS,
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
@@ -11334,12 +11335,13 @@ function runOrchestrator(opts) {
   });
 }
 function runHeartbeat(opts) {
-  const { prompt, orchestratorServer, model } = opts;
+  const { prompt, orchestratorServer, model, claudeCodePath } = opts;
   return query({
     prompt,
     options: {
       systemPrompt: DESKFREE_AGENT_DIRECTIVE,
       model,
+      ...claudeCodePath ? { pathToClaudeCodeExecutable: claudeCodePath } : {},
       maxTurns: MAX_ORCHESTRATOR_TURNS,
       permissionMode: "bypassPermissions",
       allowDangerouslySkipPermissions: true,
@@ -11450,8 +11452,27 @@ function loadConfig() {
   };
 }
 function mergeWithRemoteConfig(local, remote) {
+  const stateDirOverridden = !!process.env["DESKFREE_STATE_DIR"];
+  const toolsDirOverridden = !!process.env["DESKFREE_TOOLS_DIR"];
+  const stateDir = stateDirOverridden ? local.stateDir : isDocker ? local.stateDir : `.deskfree/${remote.botId}/state`;
+  const toolsDir = toolsDirOverridden ? local.toolsDir : isDocker ? local.toolsDir : `.deskfree/${remote.botId}/tools`;
+  let claudeCodePath;
+  if (remote.provider === "claude-code") {
+    try {
+      claudeCodePath = execFileSync("which", ["claude"], {
+        encoding: "utf8"
+      }).trim();
+    } catch {
+      throw new Error(
+        'Provider is "claude-code" but the `claude` CLI was not found on PATH. Install Claude Code first: https://docs.anthropic.com/en/docs/claude-code'
+      );
+    }
+  }
   return {
     ...local,
+    stateDir,
+    toolsDir,
+    claudeCodePath,
     wsUrl: process.env["DESKFREE_WS_URL"] ?? remote.wsUrl,
     model: process.env["DESKFREE_MODEL"] ?? remote.model,
     awsRegion: process.env["AWS_REGION"] ?? remote.awsRegion,
@@ -12860,7 +12881,8 @@ async function routeMessage(message, client, deps, sessionStore, config) {
       prompt,
       orchestratorServer: deps.createOrchestratorServer(),
       model: deps.model,
-      sessionId: existingSessionId
+      sessionId: existingSessionId,
+      claudeCodePath: deps.claudeCodePath
     });
     let fullText = "";
     let capturedSessionId = null;
@@ -13538,7 +13560,16 @@ function startHealthServer(port, log) {
     log.info(`Health server listening on port ${port}`);
   });
   server.on("error", (err) => {
-    log.warn(`Health server error: ${err.message}`);
+    if (err.code === "EADDRINUSE") {
+      log.info(`Port ${port} in use, requesting OS-assigned port...`);
+      server.listen(0, () => {
+        const addr = server.address();
+        const assignedPort = typeof addr === "object" && addr ? addr.port : "unknown";
+        log.info(`Health server listening on port ${assignedPort}`);
+      });
+    } else {
+      log.warn(`Health server error: ${err.message}`);
+    }
   });
   return {
     close() {
@@ -13546,7 +13577,7 @@ function startHealthServer(port, log) {
     }
   };
 }
-function scheduleHeartbeat(createOrchServer, model, intervalMs, signal, log) {
+function scheduleHeartbeat(createOrchServer, model, intervalMs, signal, log, claudeCodePath) {
   if (intervalMs <= 0) return;
   let running = false;
   async function tick() {
@@ -13557,7 +13588,8 @@ function scheduleHeartbeat(createOrchServer, model, intervalMs, signal, log) {
       const result = runHeartbeat({
         prompt: DESKFREE_HEARTBEAT_DIRECTIVE,
         orchestratorServer: createOrchServer(),
-        model
+        model,
+        claudeCodePath
       });
       for await (const _ of result) {
       }
@@ -13579,8 +13611,6 @@ async function startAgent(opts) {
   const log = opts?.log ?? createLogger("agent", localConfig.logLevel);
   const abortController = new AbortController();
   log.info("DeskFree Agent Runtime starting...");
-  mkdirSync(localConfig.stateDir, { recursive: true });
-  mkdirSync(localConfig.toolsDir, { recursive: true });
   const client = new DeskFreeClient(localConfig.botToken, localConfig.apiUrl);
   const errorReporter = initErrorReporter(client, log);
   initializeHealth("unknown");
@@ -13593,12 +13623,15 @@ async function startAgent(opts) {
       wsUrl: config.wsUrl,
       model: config.model,
       region: config.awsRegion,
-      tools: config.tools.length
+      tools: config.tools.length,
+      botId: config.botId
     });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`Failed to bootstrap config from API: ${msg}`);
   }
+  mkdirSync(config.stateDir, { recursive: true });
+  mkdirSync(config.toolsDir, { recursive: true });
   if (config.tools.length > 0) {
     log.info(`Installing ${config.tools.length} tool package(s)...`);
     await installTools(config.tools, config.toolsDir, log);
@@ -13679,7 +13712,8 @@ async function startAgent(opts) {
         {
           createOrchestratorServer: createOrchServer,
           workerManager,
-          model: config.model
+          model: config.model,
+          claudeCodePath: config.claudeCodePath
         },
         sessionStore,
         {
@@ -13694,7 +13728,8 @@ async function startAgent(opts) {
     config.model,
     config.heartbeatIntervalMs,
     abortController.signal,
-    log
+    log,
+    config.claudeCodePath
   );
   if (config.memoryFileId && config.sleepHour !== null && config.timezone) {
     const memoryFileId = config.memoryFileId;