@love-moon/conductor-cli 0.5.1 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @love-moon/conductor-cli
 
+## 0.6.1
+
+### Patch Changes
+
+- Updated dependencies [650fc55]
+  - @love-moon/ai-sdk@0.6.1
+  - @love-moon/conductor-sdk@0.6.1
+
+## 0.6.0
+
+### Minor Changes
+
+- bcc80b5: Initialize Git submodules automatically when preparing task worktrees.
+
+### Patch Changes
+
+- @love-moon/conductor-sdk@0.6.0
+- @love-moon/ai-sdk@0.6.0
+
 ## 0.5.1
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@love-moon/conductor-cli",
-  "version": "0.5.1",
-  "gitCommitId": "119eab6",
+  "version": "0.6.1",
+  "gitCommitId": "707fffe",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lovemoon-ai/conductor.git"
@@ -23,8 +23,8 @@
     "test": "node --test test/*.test.js"
   },
   "dependencies": {
-    "@love-moon/ai-sdk": "0.5.1",
-    "@love-moon/conductor-sdk": "0.5.1",
+    "@love-moon/ai-sdk": "0.6.1",
+    "@love-moon/conductor-sdk": "0.6.1",
     "@github/copilot-sdk": "^0.3.0",
     "chrome-launcher": "^1.2.1",
     "chrome-remote-interface": "^0.33.0",
@@ -37,7 +37,7 @@
   },
   "optionalDependencies": {
     "@roamhq/wrtc": "^0.10.0",
-    "@love-moon/chat-web": "0.5.1"
+    "@love-moon/chat-web": "0.6.1"
   },
   "pnpm": {
     "onlyBuiltDependencies": [

package/src/daemon.js

@@ -1256,6 +1256,8 @@ export function startDaemon(config = {}, deps = {}) {
     "",
     "worktree:",
     "  sync_branch: false",
+    "  sync_submodules: true",
+    "  # When .gitmodules exists, initialize/update submodules in task worktrees.",
     "  symlink: []",
     "  # Example: symlink paths from the parent workspace into each worktree",
     "  # symlink:",
@@ -1264,6 +1266,72 @@ export function startDaemon(config = {}, deps = {}) {
     "",
   ].join("\n");
 
+  const MAX_PROJECT_ICON_IMAGE_BYTES = 128 * 1024;
+  const PROJECT_ICON_MIME_BY_EXTENSION = {
+    ".svg": "image/svg+xml",
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".gif": "image/gif",
+    ".webp": "image/webp",
+    ".ico": "image/x-icon",
+    ".avif": "image/avif",
+  };
+
+  function getProjectSettingsCandidates(projectWorkspacePath) {
+    return [
+      path.join(projectWorkspacePath, ".conductor", "settings.yaml"),
+      path.join(projectWorkspacePath, ".conductor", "settings.yml"),
+      path.join(projectWorkspacePath, ".conductor", "setttings.yaml"),
+      path.join(projectWorkspacePath, ".conductor", "setttings.yml"),
+    ];
+  }
+
+  function extractProjectIconFromSettings(parsed) {
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return null;
+    }
+    const direct = normalizeOptionalString(parsed.icon);
+    if (direct) return direct;
+    const projectSettings = parsed.project;
+    if (
+      projectSettings &&
+      typeof projectSettings === "object" &&
+      !Array.isArray(projectSettings)
+    ) {
+      return normalizeOptionalString(projectSettings.icon);
+    }
+    return null;
+  }
+
+  function projectIconLooksLikeFilesystemPath(iconValue) {
+    if (/^(https?:\/\/|data:)/i.test(iconValue)) return false;
+    if (iconValue.startsWith("/") || iconValue.startsWith("./") || iconValue.startsWith("../")) {
+      return true;
+    }
+    if (!iconValue.includes("/")) return false;
+    const ext = path.extname(iconValue).toLowerCase();
+    return Object.prototype.hasOwnProperty.call(PROJECT_ICON_MIME_BY_EXTENSION, ext);
+  }
+
+  function readProjectIconAsDataUri(settingsDir, iconValue) {
+    const resolvedPath = path.isAbsolute(iconValue)
+      ? iconValue
+      : path.resolve(settingsDir, iconValue);
+    const ext = path.extname(resolvedPath).toLowerCase();
+    const mime = PROJECT_ICON_MIME_BY_EXTENSION[ext];
+    if (!mime) return null;
+    try {
+      const stat = statSyncFn(resolvedPath);
+      if (!stat.isFile() || stat.size === 0 || stat.size > MAX_PROJECT_ICON_IMAGE_BYTES) {
+        return null;
+      }
+      return `data:${mime};base64,${readFileSyncFn(resolvedPath).toString("base64")}`;
+    } catch {
+      return null;
+    }
+  }
+
   function ensureProjectSettingsTemplate(projectWorkspacePath) {
     const settingsPath = path.join(projectWorkspacePath, ".conductor", "settings.yaml");
     if (existsSyncFn(settingsPath)) {
@@ -1277,15 +1345,28 @@ export function startDaemon(config = {}, deps = {}) {
     }
   }
 
-  function readProjectWorktreeSettings(projectWorkspacePath) {
-    const settingsCandidates = [
-      path.join(projectWorkspacePath, ".conductor", "settings.yaml"),
-      path.join(projectWorkspacePath, ".conductor", "settings.yml"),
-      path.join(projectWorkspacePath, ".conductor", "setttings.yaml"),
-      path.join(projectWorkspacePath, ".conductor", "setttings.yml"),
-    ];
+  function readProjectIconSetting(projectWorkspacePath) {
+    for (const settingsPath of getProjectSettingsCandidates(projectWorkspacePath)) {
+      if (!existsSyncFn(settingsPath)) {
+        continue;
+      }
+      let rawIcon = null;
+      try {
+        rawIcon = extractProjectIconFromSettings(yaml.load(readFileSyncFn(settingsPath, "utf8")));
+      } catch {
+        return null;
+      }
+      if (!rawIcon) return null;
+      if (!projectIconLooksLikeFilesystemPath(rawIcon)) {
+        return rawIcon;
+      }
+      return readProjectIconAsDataUri(path.dirname(settingsPath), rawIcon);
+    }
+    return null;
+  }
 
-    for (const settingsPath of settingsCandidates) {
+  function readProjectWorktreeSettings(projectWorkspacePath) {
+    for (const settingsPath of getProjectSettingsCandidates(projectWorkspacePath)) {
       if (!existsSyncFn(settingsPath)) {
         continue;
       }
@@ -1299,6 +1380,7 @@ export function startDaemon(config = {}, deps = {}) {
         return {
           symlinkPaths: normalizeConfiguredPathList(worktreeSettings.symlink, projectWorkspacePath),
           syncBranch: worktreeSettings.sync_branch === true || worktreeSettings.syncBranch === true,
+          syncSubmodules: worktreeSettings.sync_submodules !== false && worktreeSettings.syncSubmodules !== false,
           settingsPath,
         };
       } catch (error) {
@@ -1309,6 +1391,7 @@ export function startDaemon(config = {}, deps = {}) {
     return {
       symlinkPaths: [],
       syncBranch: false,
+      syncSubmodules: true,
       settingsPath: null,
     };
   }
@@ -1378,6 +1461,28 @@ export function startDaemon(config = {}, deps = {}) {
     }
   }
 
+  async function ensureTaskWorktreeSubmodules({ taskId, projectWorkspacePath, worktreeRoot }) {
+    const { syncSubmodules } = readProjectWorktreeSettings(projectWorkspacePath);
+    if (!syncSubmodules || !existsSyncFn(path.join(worktreeRoot, ".gitmodules"))) {
+      return;
+    }
+
+    try {
+      await runSpawnProcess(
+        "git",
+        ["-C", worktreeRoot, "submodule", "sync", "--recursive"],
+        { cwd: worktreeRoot, timeoutMs: WORKTREE_SUBMODULE_SYNC_TIMEOUT_MS },
+      );
+      await runSpawnProcess(
+        "git",
+        ["-C", worktreeRoot, "submodule", "update", "--init", "--recursive"],
+        { cwd: worktreeRoot, timeoutMs: WORKTREE_SUBMODULE_SYNC_TIMEOUT_MS },
+      );
+    } catch (error) {
+      throw new Error(`Failed to sync git submodules for ${taskId}: ${error?.message || error}`);
+    }
+  }
+
   async function runSpawnProcess(command, args, options = {}) {
     let child;
     const { timeoutMs, ...spawnOptions } = options || {};
@@ -1566,6 +1671,11 @@ export function startDaemon(config = {}, deps = {}) {
       }
     }
 
+    await ensureTaskWorktreeSubmodules({
+      taskId,
+      projectWorkspacePath: worktreeConfig.projectWorkspacePath,
+      worktreeRoot,
+    });
     mkdirSyncFn(finalCwd, { recursive: true });
     await ensureTaskWorktreeSymlinks({
       projectRepoRoot: worktreeConfig.projectRepoRoot,
@@ -1601,6 +1711,10 @@ export function startDaemon(config = {}, deps = {}) {
     process.env.CONDUCTOR_WORKTREE_SYNC_TIMEOUT_MS,
     5_000,
   );
+  const WORKTREE_SUBMODULE_SYNC_TIMEOUT_MS = parsePositiveInt(
+    process.env.CONDUCTOR_WORKTREE_SUBMODULE_SYNC_TIMEOUT_MS,
+    120_000,
+  );
   const SHUTDOWN_STATUS_REPORT_TIMEOUT_MS = parsePositiveInt(
     process.env.CONDUCTOR_SHUTDOWN_STATUS_REPORT_TIMEOUT_MS,
     1000,
@@ -4338,6 +4452,7 @@ export function startDaemon(config = {}, deps = {}) {
       lastCommit: null,
       lastCommitAt: null,
       fileCount: null,
+      icon: null,
       error: null,
       errorCode: null,
       validatedAt,
@@ -4391,6 +4506,7 @@ export function startDaemon(config = {}, deps = {}) {
             typeof snapshot?.fileCount === "number" && Number.isInteger(snapshot.fileCount)
               ? snapshot.fileCount
               : null,
+          icon: readProjectIconSetting(effectiveWorkspace),
         };
       }
     } catch (error) {
@@ -4414,6 +4530,7 @@ export function startDaemon(config = {}, deps = {}) {
           last_commit_at: result.lastCommitAt,
           git_remote_url: result.gitRemoteUrl,
           file_count: result.fileCount,
+          icon: result.icon,
           error: result.error,
           error_code: result.errorCode,
           validated_at: result.validatedAt,