@northflare/runner 0.0.24 → 0.0.25

package/bin/northflare-runner

@@ -9,6 +9,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
 import fs from "fs/promises";
+import { existsSync } from "fs";
 import crypto from "crypto";
 import envPaths from "env-paths";
 
@@ -16,8 +17,26 @@ import envPaths from "env-paths";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
 
-const ENV_PATHS_APP_NAME = "northflare-runner";
+function resolveEnvPathsAppName() {
+  if (process.env["NODE_ENV"] === "development") return "northflare-runner-dev";
+
+  // Heuristic: treat as local workspace when pnpm-workspace.yaml sits two levels up (repo root)
+  try {
+    const __dirname = path.dirname(fileURLToPath(import.meta.url));
+    const repoRoot = path.resolve(__dirname, "../..");
+    if (existsSync(path.join(repoRoot, "pnpm-workspace.yaml"))) {
+      return "northflare-runner-dev";
+    }
+  } catch {
+    // ignore and fall back
+  }
+
+  return "northflare-runner";
+}
+
+const ENV_PATHS_APP_NAME = resolveEnvPathsAppName();
 const ENV_PATHS_OPTIONS = { suffix: "" };
+const IS_DEV_APP = ENV_PATHS_APP_NAME.endsWith("-dev");
 
 let DEFAULT_DATA_DIR;
 try {
@@ -28,7 +47,7 @@ try {
     error
   );
   const __dirname = path.dirname(fileURLToPath(import.meta.url));
-  DEFAULT_DATA_DIR = path.resolve(__dirname, "../data");
+  DEFAULT_DATA_DIR = path.resolve(__dirname, IS_DEV_APP ? "../data/dev" : "../data");
 }
 
 /**
@@ -113,6 +132,31 @@ const startCommand = new Command("start")
       process.env.NORTHFLARE_RUNNER_INACTIVITY_TIMEOUT = inactivityTimeout;
     }
 
+    const debugEnabled =
+      !!process.env.DEBUG || !!process.env.NORTHFLARE_RUNNER_DEBUG;
+    // Determine config path for logging purposes (actual load happens in main)
+    let resolvedConfigPath =
+      options.config || command.parent?.opts().config || null;
+    if (!resolvedConfigPath) {
+      try {
+        const paths = envPaths(ENV_PATHS_APP_NAME, ENV_PATHS_OPTIONS);
+        resolvedConfigPath = path.join(paths.config, "config.json");
+      } catch {
+        const localDir = IS_DEV_APP ? "./config/dev" : "./config";
+        resolvedConfigPath = path.resolve(localDir, "config.json");
+      }
+    }
+    if (debugEnabled) {
+      console.log(
+        "[start] Config file location:",
+        path.resolve(resolvedConfigPath)
+      );
+      console.log(
+        "[start] Orchestrator URL (env):",
+        process.env.NORTHFLARE_ORCHESTRATOR_URL || "(not set)"
+      );
+    }
+
     // Load the main module with config path if provided
     // Clear argv[2] since it contains 'start' command
     process.argv.splice(2);
@@ -190,70 +234,54 @@ const listReposCommand = new Command("list-repos")
         process.exit(1);
       }
 
-      // Get default config path
-      const paths = envPaths("northflare-runner", { suffix: "" });
-
-      // Determine config path from command options, parent options, or default
-      const configOption = options.config || command.parent?.opts().config;
-      let configPath;
-      if (configOption) {
-        configPath = path.resolve(configOption);
-      } else {
-        configPath = path.join(paths.config, "config.json");
-      }
-
-      // Load config file
+      // Optional config load for orchestrator URL
       let config = {};
+      const paths = envPaths(ENV_PATHS_APP_NAME, ENV_PATHS_OPTIONS);
+      const configOption = options.config || command.parent?.opts().config;
+      const configPath = configOption
+        ? path.resolve(configOption)
+        : path.join(paths.config, "config.json");
       try {
         const content = await fs.readFile(configPath, "utf-8");
         config = JSON.parse(content);
       } catch (error) {
-        if (error.code === "ENOENT") {
-          if (options.config) {
-            console.error(`Configuration file not found: ${configPath}`);
-            process.exit(1);
-          } else {
-            console.log(
-              `No configuration file found at default location: ${configPath}`
-            );
-            console.log(
-              "Use -c/--config to specify a config file or add-repo to create one."
-            );
-            process.exit(0);
-          }
+        if (error.code !== "ENOENT") {
+          throw error;
         }
-        throw error;
       }
 
-      // Log config file location in debug mode
-      if (process.env.DEBUG) {
-        console.log(`Config file location: ${configPath}`);
-      }
-
-      // Get orchestrator URL from config or environment
       const orchestratorUrl =
-        config.orchestratorUrl ||
         process.env.NORTHFLARE_ORCHESTRATOR_URL ||
+        config.orchestratorUrl ||
         "https://api.northflare.app";
 
       // Fetch runner ID
       const runnerId = await fetchRunnerId(orchestratorUrl, token);
       console.log(`Runner ID: ${runnerId}\n`);
 
-      // Ensure runnerRepos is properly structured
-      if (!config.runnerRepos || typeof config.runnerRepos !== "object") {
-        config.runnerRepos = {};
+      // Fetch snapshot from server
+      const resp = await fetch(`${orchestratorUrl}/api/runner/repos`, {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "X-Runner-Id": runnerId,
+          "Content-Type": "application/json",
+        },
+      });
+
+      if (!resp.ok) {
+        const error = await resp.text();
+        throw new Error(`Failed to fetch runner repos: ${resp.status} - ${error}`);
       }
 
-      // Get repos for this runner
-      const repos = config.runnerRepos[runnerId] || [];
+      const data = await resp.json();
+      const repos = Array.isArray(data.repos) ? data.repos : [];
 
-      // List runner repos
       if (repos.length > 0) {
         console.log(`Found ${repos.length} runner repositories:`);
         repos.forEach((repo, index) => {
           console.log(
-            `${index + 1}. ${repo.name} (${repo.path})${
+            `${index + 1}. ${repo.name} (${repo.runnerPath || repo.path})${
               repo.uuid ? ` [UUID: ${repo.uuid}]` : ""
             }`
           );
@@ -279,9 +307,17 @@ const addRepoCommand = new Command("add-repo")
   )
   .option("-n, --name <name>", "repository name (defaults to folder name)")
   .option("--token <token>", "authentication token")
+  .option(
+    "-d, --debug",
+    "enable verbose logging for add-repo (prints config paths, URLs, etc.)"
+  )
   .action(async (repoPath, options, command) => {
+    const debugEnabled = Boolean(options.debug || process.env.DEBUG);
+    const debug = (...args) => {
+      if (debugEnabled) console.log(...args);
+    };
+
     try {
-      // Get token from command options, parent options, or environment
       const token =
         options.token ||
         command.parent?.opts().token ||
@@ -293,72 +329,33 @@ const addRepoCommand = new Command("add-repo")
         process.exit(1);
       }
 
-      // Get default config path
-      const paths = envPaths("northflare-runner", { suffix: "" });
-
-      // Determine config path from command options, parent options, or default
+      // Optional config for orchestrator/workspace hints
+      const paths = envPaths(ENV_PATHS_APP_NAME, ENV_PATHS_OPTIONS);
       const configOption = options.config || command.parent?.opts().config;
-      let configPath;
-      if (configOption) {
-        configPath = path.resolve(configOption);
-      } else {
-        configPath = path.join(paths.config, "config.json");
-        // Ensure config directory exists
-        await fs.mkdir(paths.config, { recursive: true });
-      }
-
-      // Load existing config
+      const configPath = configOption
+        ? path.resolve(configOption)
+        : path.join(paths.config, "config.json");
       let config = {};
       try {
         const content = await fs.readFile(configPath, "utf-8");
         config = JSON.parse(content);
       } catch (error) {
-        if (error.code === "ENOENT") {
-          console.log(
-            `Configuration file not found: ${configPath}. Creating new config file.`
-          );
-          config = {};
-        } else {
-          throw error;
-        }
-      }
-
-      // Log config file location in debug mode
-      if (process.env.DEBUG) {
-        console.log(`Config file location: ${configPath}`);
+        if (error.code !== "ENOENT") throw error;
       }
 
-      // Get orchestrator URL from config or environment
       const orchestratorUrl =
-        config.orchestratorUrl ||
         process.env.NORTHFLARE_ORCHESTRATOR_URL ||
+        config.orchestratorUrl ||
         "https://api.northflare.app";
+      debug("Orchestrator URL:", orchestratorUrl);
 
-      // Fetch runner ID
       const runnerId = await fetchRunnerId(orchestratorUrl, token);
       console.log(`Runner ID: ${runnerId}`);
 
-      // Ensure runnerRepos is properly structured
-      if (
-        !config.runnerRepos ||
-        typeof config.runnerRepos !== "object" ||
-        Array.isArray(config.runnerRepos)
-      ) {
-        config.runnerRepos = {};
-      }
-
-      // Initialize repos array for this runner if not present
-      if (
-        !config.runnerRepos[runnerId] ||
-        !Array.isArray(config.runnerRepos[runnerId])
-      ) {
-        config.runnerRepos[runnerId] = [];
-      }
-
-      // Resolve the repository path
       const absoluteRepoPath = path.resolve(repoPath);
+      debug("Repository path (absolute):", absoluteRepoPath);
 
-      // Check if path exists
+      // Validate directory
       try {
         const stats = await fs.stat(absoluteRepoPath);
         if (!stats.isDirectory()) {
@@ -372,82 +369,78 @@ const addRepoCommand = new Command("add-repo")
         process.exit(1);
       }
 
-      // Check for duplicates
-      const duplicate = config.runnerRepos[runnerId].find(
-        (repo) => repo.path === absoluteRepoPath
-      );
-      if (duplicate) {
-        console.error(
-          `Error: Repository already exists in configuration: ${duplicate.name} (${duplicate.path})`
-        );
-        process.exit(1);
-      }
-
-      // Determine repository name
       const repoName = options.name || path.basename(absoluteRepoPath);
-
-      // Generate UUID for the repository
       const repoUuid = crypto.randomUUID();
 
-      // Add new repository
-      const newRepo = {
-        uuid: repoUuid,
-        name: repoName,
-        path: absoluteRepoPath,
-      };
-
-      config.runnerRepos[runnerId].push(newRepo);
-
-      // Save updated config
-      const { ConfigManager } = await import("../dist/utils/config.js");
-      await ConfigManager.saveConfigFile(configPath, config);
-
-      console.log(
-        `Successfully added repository: ${repoName} (${absoluteRepoPath})`
-      );
-      console.log(`UUID: ${repoUuid}`);
-      console.log(
-        `Total repositories for this runner: ${config.runnerRepos[runnerId].length}`
-      );
-
-      // Sync all runner repos with the orchestrator
-      console.log("\nSyncing runner repositories with orchestrator...");
-      try {
-        const response = await fetch(`${orchestratorUrl}/api/runner/repos/sync`, {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${token}`,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            repos: config.runnerRepos[runnerId].map((r) => ({
-              uuid: r.uuid,
-              name: r.name,
-              path: r.path,
-            })),
-          }),
-        });
-
-        if (!response.ok) {
-          const error = await response.text();
-          console.warn(
-            `Warning: Failed to sync repos with orchestrator: ${error}`
-          );
+      // Derive workspacePath for external flag
+      const workspacePath =
+        process.env.NORTHFLARE_WORKSPACE_PATH || config.workspacePath;
+      const insideWorkspace =
+        workspacePath &&
+        path
+          .resolve(absoluteRepoPath)
+          .startsWith(path.resolve(workspacePath) + path.sep);
+      const external = !insideWorkspace;
+
+      // Preflight snapshot to warn on duplicates
+      const snapshotResp = await fetch(`${orchestratorUrl}/api/runner/repos`, {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "X-Runner-Id": runnerId,
+          "Content-Type": "application/json",
+        },
+      });
+      let existingRepos = [];
+      if (snapshotResp.ok) {
+        const data = await snapshotResp.json();
+        existingRepos = Array.isArray(data.repos) ? data.repos : [];
+        const dup = existingRepos.find(
+          (r) =>
+            path.resolve(r.runnerPath || r.path || "") === absoluteRepoPath
+        );
+        if (dup) {
           console.warn(
-            "The repository was added to your local config, but may not be visible in the web UI."
-          );
-        } else {
-          const data = await response.json();
-          console.log(
-            `Successfully synced ${data.syncedCount} repositories with orchestrator`
+            `Warning: Repository already exists on server: ${dup.name} (${dup.runnerPath || dup.path})`
           );
         }
-      } catch (syncError) {
-        console.warn(
-          `Warning: Failed to sync repos with orchestrator: ${syncError.message}`
+      } else {
+        debug(
+          "Snapshot fetch failed (continuing)",
+          snapshotResp.status,
+          await snapshotResp.text().catch(() => "")
         );
-        console.warn(
-          "The repository was added to your local config, but may not be visible in the web UI."
+      }
+
+      // Upsert server-side
+      const resp = await fetch(`${orchestratorUrl}/api/runner/repos`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "X-Runner-Id": runnerId,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          uuid: repoUuid,
+          name: repoName,
+          path: absoluteRepoPath,
+          external,
+        }),
+      });
+
+      if (!resp.ok) {
+        const error = await resp.text();
+        throw new Error(`Failed to upsert repo: ${resp.status} - ${error}`);
+      }
+
+      const data = await resp.json();
+      console.log(
+        `Successfully registered repository: ${data.repo?.name || repoName} (${data.repo?.runnerPath || absoluteRepoPath})`
+      );
+      console.log(`UUID: ${data.repo?.uuid || repoUuid}`);
+      if (external) {
+        console.log(
+          "Marked as external (outside workspacePath) - only added via CLI."
         );
       }
 
@@ -480,6 +473,75 @@ program
   .addCommand(startCommand, { isDefault: true })
   .addCommand(validateCommand)
   .addCommand(listReposCommand)
-  .addCommand(addRepoCommand);
+  .addCommand(addRepoCommand)
+  .addCommand(
+    new Command("sync-repos")
+      .description("pull a fresh runner repo snapshot from server (no config writes)")
+      .option("--token <token>", "authentication token")
+      .option("-c, --config <path>", "path to configuration file")
+      .action(async (options, command) => {
+        try {
+          const token =
+            options.token ||
+            command.parent?.opts().token ||
+            process.env.NORTHFLARE_RUNNER_TOKEN;
+          if (!token) {
+            console.error(
+              "Error: NORTHFLARE_RUNNER_TOKEN is required. Provide it via --token or environment variable."
+            );
+            process.exit(1);
+          }
+
+          let config = {};
+          const paths = envPaths(ENV_PATHS_APP_NAME, ENV_PATHS_OPTIONS);
+          const configOption = options.config || command.parent?.opts().config;
+          const configPath = configOption
+            ? path.resolve(configOption)
+            : path.join(paths.config, "config.json");
+          try {
+            const content = await fs.readFile(configPath, "utf-8");
+            config = JSON.parse(content);
+          } catch (err) {
+            if (err.code !== "ENOENT") throw err;
+          }
+
+          const orchestratorUrl =
+            process.env.NORTHFLARE_ORCHESTRATOR_URL ||
+            config.orchestratorUrl ||
+            "https://api.northflare.app";
+
+          const runnerId = await fetchRunnerId(orchestratorUrl, token);
+          console.log(`Runner ID: ${runnerId}`);
+
+          const resp = await fetch(`${orchestratorUrl}/api/runner/repos`, {
+            method: "GET",
+            headers: {
+              Authorization: `Bearer ${token}`,
+              "X-Runner-Id": runnerId,
+              "Content-Type": "application/json",
+            },
+          });
+
+          if (!resp.ok) {
+            const error = await resp.text();
+            throw new Error(`Failed to fetch runner repos: ${resp.status} - ${error}`);
+          }
+
+          const data = await resp.json();
+          const repos = Array.isArray(data.repos) ? data.repos : [];
+          console.log(`Synced ${repos.length} repos from server snapshot.`);
+          repos.forEach((r, idx) => {
+            console.log(
+              `${idx + 1}. ${r.name} (${r.runnerPath || r.path})${r.external ? " [external]" : ""}`
+            );
+          });
+
+          process.exit(0);
+        } catch (error) {
+          console.error("Error syncing repositories:", error.message);
+          process.exit(1);
+        }
+      })
+  );
 
 program.parse(process.argv);

package/dist/components/claude-sdk-manager.d.ts

@@ -45,6 +45,12 @@ export declare class ClaudeManager {
      * Normalize arbitrary content shapes into a plain string for the CLI
      */
     private normalizeToText;
+    /**
+     * Normalize arbitrary content shapes into content blocks array for multimodal support.
+     * Returns the array of content blocks if the content contains image blocks,
+     * otherwise returns null to indicate text-only content.
+     */
+    private normalizeToContentBlocks;
     private handleStreamedMessage;
 }
 //# sourceMappingURL=claude-sdk-manager.d.ts.map

package/dist/components/claude-sdk-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-sdk-manager.d.ts","sourceRoot":"","sources":["../../src/components/claude-sdk-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAuBrF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,iBAAiB,CAA4B;gBAGnD,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,yBAAyB;IAiB9C,OAAO,CAAC,sBAAsB;IAKxB,iBAAiB,CACrB,sBAAsB,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC3D,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,OAAO,EAAE,EAC1B,gBAAgB,CAAC,EAAE;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,kBAAkB,EAAE,MAAM,CAAC;QAC3B,qBAAqB,EAAE,MAAM,CAAC;QAC9B,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;KACzC,GACA,OAAO,CAAC,mBAAmB,CAAC;IA2YzB,gBAAgB,CACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,mBAAmB,EAC5B,gBAAgB,GAAE,OAAe,EACjC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAmCV,kBAAkB,CACtB,sBAAsB,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC3D,oBAAoB,EAAE,MAAM,EAC5B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,kBAAkB,EAC1B,gBAAgB,CAAC,EAAE,GAAG,EACtB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC;YAuCJ,qBAAqB;IA2C7B,eAAe,CACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,GAAG,EACZ,MAAM,CAAC,EAAE,kBAAkB,EAC3B,sBAAsB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC5D,oBAAoB,CAAC,EAAE,MAAM,EAC7B,YAAY,CAAC,EAAE,GAAG,EAClB,uBAAuB,CAAC,EAAE,MAAM,GAC/B,OAAO,CAAC,IAAI,CAAC;YAoIF,iBAAiB;YA2BjB,wBAAwB;IA2BtC,OAAO,CAAC,aAAa;IAerB;;OAEG;IACH,OAAO,CAAC,eAAe;YA2CT,qBAAqB;CA0dpC"}
+{"version":3,"file":"claude-sdk-manager.d.ts","sourceRoot":"","sources":["../../src/components/claude-sdk-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAuBrF,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,iBAAiB,CAA4B;gBAGnD,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,yBAAyB;IAiB9C,OAAO,CAAC,sBAAsB;IAKxB,iBAAiB,CACrB,sBAAsB,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC3D,oBAAoB,EAAE,MAAM,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,eAAe,EAAE,OAAO,EAAE,EAC1B,gBAAgB,CAAC,EAAE;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,kBAAkB,EAAE,MAAM,CAAC;QAC3B,qBAAqB,EAAE,MAAM,CAAC;QAC9B,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;KACzC,GACA,OAAO,CAAC,mBAAmB,CAAC;IAyZzB,gBAAgB,CACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,mBAAmB,EAC5B,gBAAgB,GAAE,OAAe,EACjC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAmCV,kBAAkB,CACtB,sBAAsB,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC3D,oBAAoB,EAAE,MAAM,EAC5B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,kBAAkB,EAC1B,gBAAgB,CAAC,EAAE,GAAG,EACtB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC;YAuCJ,qBAAqB;IA2C7B,eAAe,CACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,GAAG,EACZ,MAAM,CAAC,EAAE,kBAAkB,EAC3B,sBAAsB,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,aAAa,EAC5D,oBAAoB,CAAC,EAAE,MAAM,EAC7B,YAAY,CAAC,EAAE,GAAG,EAClB,uBAAuB,CAAC,EAAE,MAAM,GAC/B,OAAO,CAAC,IAAI,CAAC;YAoIF,iBAAiB;YA2BjB,wBAAwB;IA2BtC,OAAO,CAAC,aAAa;IAerB;;OAEG;IACH,OAAO,CAAC,eAAe;IA2CvB;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;YAyBlB,qBAAqB;CA0dpC"}

package/dist/components/claude-sdk-manager.js

@@ -334,11 +334,25 @@ export class ClaudeManager {
         // Send initial messages
         try {
             for (const message of initialMessages) {
-                const initialText = this.normalizeToText(message.content);
-                conversation.send({
-                    type: "text",
-                    text: initialText,
-                });
+                // Check if the message content contains multimodal content blocks (e.g., images)
+                const contentBlocks = this.normalizeToContentBlocks(message.content);
+                if (contentBlocks && Array.isArray(contentBlocks) && contentBlocks.some(b => b.type === 'image')) {
+                    // Send as multimodal message with content array
+                    // The SDK types may not include multimodal support, but the underlying API does
+                    console.log('[ClaudeManager] Sending multimodal message with', contentBlocks.length, 'content blocks');
+                    conversation.send({
+                        type: "user",
+                        content: contentBlocks,
+                    });
+                }
+                else {
+                    // Fallback to text-only message
+                    const initialText = this.normalizeToText(message.content);
+                    conversation.send({
+                        type: "text",
+                        text: initialText,
+                    });
+                }
             }
             console.log(`Started conversation for ${conversationObjectType} ${conversationObjectId} in workspace ${workspacePath}`);
             // Return the conversation context directly
@@ -625,6 +639,33 @@ export class ClaudeManager {
             return String(value);
         }
     }
+    /**
+     * Normalize arbitrary content shapes into content blocks array for multimodal support.
+     * Returns the array of content blocks if the content contains image blocks,
+     * otherwise returns null to indicate text-only content.
+     */
+    normalizeToContentBlocks(value) {
+        // If already an array, check if it contains image blocks
+        if (Array.isArray(value)) {
+            const hasImages = value.some(b => b && b.type === 'image');
+            if (hasImages) {
+                // Return the content blocks as-is, they're already in the right format
+                return value;
+            }
+            return null;
+        }
+        // Check if it's a wrapped content object
+        if (typeof value === 'object' && value !== null) {
+            // Check for nested content array
+            if (Array.isArray(value.content)) {
+                const hasImages = value.content.some((b) => b && b.type === 'image');
+                if (hasImages) {
+                    return value.content;
+                }
+            }
+        }
+        return null;
+    }
     async handleStreamedMessage(context, message, sessionId) {
         /*
          * SDK tool call payload reference (observed shapes)