conductor-oss 0.2.3 → 0.2.5

package/web/.next/standalone/packages/web/src/app/api/spawn/route.ts

@@ -1,10 +1,11 @@
 import { type NextRequest, NextResponse } from "next/server";
 import { readFile, writeFile } from "node:fs/promises";
 import { parse, stringify } from "yaml";
+import { syncWorkspaceSupportFiles } from "@conductor-oss/core";
 import { getServices, invalidateServicesCache } from "@/lib/services";
 import { guardApiAccess, guardApiActionAccess } from "@/lib/auth";
 import { sessionToDashboard } from "@/lib/serialize";
-import { syncProjectLocalConfig } from "@/lib/projectConfigSync";
+import { normalizeRootProjectPaths, syncProjectLocalConfig } from "@/lib/projectConfigSync";
 
 /** POST /api/spawn -- Spawn a new agent session. */
 
@@ -38,14 +39,18 @@ async function persistSpawnAgentSelection(configPath: string, projectId: string,
     ...nextPreferences,
     codingAgent: agent,
   };
+  await normalizeRootProjectPaths(nextRoot);
 
   const updatedYaml = stringify(nextRoot, { lineWidth: 0 });
   await writeFile(configPath, updatedYaml, "utf8");
 
   try {
     invalidateServicesCache("spawn agent selection updated");
-    const { config: refreshedConfig } = await getServices();
+    const { config: refreshedConfig, registry } = await getServices();
     await syncProjectLocalConfig(refreshedConfig as unknown as Record<string, unknown>, projectId);
+    syncWorkspaceSupportFiles(refreshedConfig, {
+      agentNames: registry.list("agent").map((agent) => agent.name),
+    });
   } catch (err) {
     await writeFile(configPath, originalConfigRaw, "utf8");
     invalidateServicesCache("spawn agent selection rollback");

package/web/.next/standalone/packages/web/src/app/api/workspaces/route.ts

@@ -5,10 +5,15 @@ import { homedir } from "node:os";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { parse, stringify } from "yaml";
-import { buildConductorBoard, buildProjectConfigRecord, generateSessionPrefix } from "@conductor-oss/core";
+import {
+  buildConductorBoard,
+  buildProjectConfigRecord,
+  generateSessionPrefix,
+  syncWorkspaceSupportFiles,
+} from "@conductor-oss/core";
 import { getServices, invalidateServicesCache } from "@/lib/services";
 import { guardApiAccess, guardApiActionAccess } from "@/lib/auth";
-import { syncProjectLocalConfig } from "@/lib/projectConfigSync";
+import { normalizeRootProjectPaths, syncProjectLocalConfig } from "@/lib/projectConfigSync";
 
 const execFileAsync = promisify(execFile);
 
@@ -277,6 +282,7 @@ async function writeProjectToConfig(args: {
   const nextProjects = toProjectMap(nextRoot.projects);
   nextProjects[args.projectId] = args.projectData;
   nextRoot.projects = nextProjects;
+  await normalizeRootProjectPaths(nextRoot);
 
   const updatedYaml = stringify(nextRoot, {
     lineWidth: 0,
@@ -451,8 +457,11 @@ export async function POST(request: NextRequest) {
         displayName: deriveDisplayName(projectId),
       });
       {
-        const { config: refreshedConfig } = await getServices();
+        const { config: refreshedConfig, registry } = await getServices();
         await syncProjectLocalConfig(refreshedConfig as unknown as Record<string, unknown>, projectId);
+        syncWorkspaceSupportFiles(refreshedConfig, {
+          agentNames: registry.list("agent").map((agent) => agent.name),
+        });
       }
 
       return NextResponse.json(
@@ -537,8 +546,11 @@ export async function POST(request: NextRequest) {
       displayName: deriveDisplayName(projectId),
     });
     {
-      const { config: refreshedConfig } = await getServices();
+      const { config: refreshedConfig, registry } = await getServices();
       await syncProjectLocalConfig(refreshedConfig as unknown as Record<string, unknown>, projectId);
+      syncWorkspaceSupportFiles(refreshedConfig, {
+        agentNames: registry.list("agent").map((agent) => agent.name),
+      });
     }
 
     return NextResponse.json(

package/web/.next/standalone/packages/web/src/lib/projectConfigSync.ts

@@ -1,7 +1,11 @@
 import { join, resolve } from "node:path";
-import { writeFile } from "node:fs/promises";
+import { stat, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { buildConductorYaml, type ScaffoldProjectConfig } from "@conductor-oss/core";
+import {
+  buildConductorYaml,
+  resolveConfiguredProjectPath,
+  type ScaffoldProjectConfig,
+} from "@conductor-oss/core";
 
 type MutableConfig = Record<string, unknown>;
 
@@ -25,6 +29,14 @@ function expandHome(value: string): string {
   return resolve(value);
 }
 
+async function isDirectory(path: string): Promise<boolean> {
+  try {
+    return (await stat(path)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
 function normalizePreferences(value: unknown) {
   const root = toObject(value);
   const notifications = toObject(root["notifications"]);
@@ -45,14 +57,18 @@ function normalizePreferences(value: unknown) {
   };
 }
 
-function buildProjectScaffold(projectId: string, project: Record<string, unknown>): ScaffoldProjectConfig {
+function buildProjectScaffold(
+  projectId: string,
+  project: Record<string, unknown>,
+  projectPath: string,
+): ScaffoldProjectConfig {
   const agentConfig = toObject(project["agentConfig"]);
 
   return {
     projectId,
     displayName: asNonEmptyString(project["name"]) ?? projectId,
     repo: asNonEmptyString(project["repo"]) ?? `local-${projectId}`,
-    path: expandHome(asNonEmptyString(project["path"]) ?? projectId),
+    path: projectPath,
     agent: asNonEmptyString(project["agent"]) ?? "claude-code",
     defaultBranch: asNonEmptyString(project["defaultBranch"]) ?? "main",
     defaultWorkingDirectory: asNonEmptyString(project["defaultWorkingDirectory"]),
@@ -66,11 +82,43 @@ function buildProjectScaffold(projectId: string, project: Record<string, unknown
   };
 }
 
+export async function normalizeRootProjectPaths(rootConfig: MutableConfig): Promise<void> {
+  const projects = toObject(rootConfig["projects"]);
+
+  for (const [projectId, rawProject] of Object.entries(projects)) {
+    const project = toObject(rawProject);
+    const rawProjectPath = asNonEmptyString(project["path"]);
+    if (!rawProjectPath) {
+      continue;
+    }
+
+    const resolvedProjectPath = resolveConfiguredProjectPath(
+      rawProjectPath,
+      asNonEmptyString(project["repo"]),
+    );
+
+    if (!await isDirectory(resolvedProjectPath)) {
+      continue;
+    }
+
+    projects[projectId] = {
+      ...project,
+      path: resolvedProjectPath,
+    };
+  }
+
+  rootConfig["projects"] = projects;
+}
+
 export async function syncProjectLocalConfig(rootConfig: MutableConfig, projectId: string): Promise<void> {
   const projects = toObject(rootConfig["projects"]);
   const project = toObject(projects[projectId]);
-  const projectPath = asNonEmptyString(project["path"]);
-  if (!projectPath) {
+  const rawProjectPath = asNonEmptyString(project["path"]);
+  if (!rawProjectPath) {
+    return;
+  }
+  const projectPath = resolveConfiguredProjectPath(rawProjectPath, asNonEmptyString(project["repo"]));
+  if (!await isDirectory(projectPath)) {
     return;
   }
 
@@ -78,13 +126,13 @@ export async function syncProjectLocalConfig(rootConfig: MutableConfig, projectI
     port: typeof rootConfig["port"] === "number" ? rootConfig["port"] : 4747,
     dashboardUrl: asNonEmptyString(rootConfig["dashboardUrl"]),
     preferences: normalizePreferences(rootConfig["preferences"]),
-    projects: [buildProjectScaffold(projectId, project)],
+    projects: [buildProjectScaffold(projectId, project, projectPath)],
   });
-
-  await writeFile(join(expandHome(projectPath), "conductor.yaml"), yaml, "utf8");
+  await writeFile(join(projectPath, "conductor.yaml"), yaml, "utf8");
 }
 
 export async function syncAllProjectLocalConfigs(rootConfig: MutableConfig): Promise<void> {
+  await normalizeRootProjectPaths(rootConfig);
   const projects = toObject(rootConfig["projects"]);
   for (const projectId of Object.keys(projects)) {
     await syncProjectLocalConfig(rootConfig, projectId);