Merge pull request #714 from rogerchappel/fix/blueprint-deploy-openclaw

Author: rogerchappel

src/lib/blueprint-runtime-provisioning.test.ts

@@ -30,6 +30,26 @@ function agent(overrides: Partial<BlueprintAgentTemplate> = {}): BlueprintAgentT
 }
 
 describe("buildBlueprintRuntimeConfigPatch", () => {
+  it("uses OpenClaw's default agent directory when no agent list exists yet", () => {
+    const patch = buildBlueprintRuntimeConfigPatch({
+      config: {
+        agents: {
+          defaults: { workspace: "/workspace" },
+        },
+      },
+      agentTemplates: [agent({ callsign: "Cipher" })],
+      runtimeCapabilities: null,
+    });
+
+    expect(patch.agents.list).toEqual([
+      expect.objectContaining({
+        id: "cipher",
+        workspace: "/workspace/agents/cipher",
+      }),
+    ]);
+    expect(patch.agents.list[0]).not.toHaveProperty("agentDir");
+  });
+
   it("adds provisioned blueprint agents to the OpenClaw agent list and ACP allowlist", () => {
     const patch = buildBlueprintRuntimeConfigPatch({
       config: {

src/lib/blueprint-runtime-provisioning.ts

@@ -100,8 +100,8 @@ export function buildBlueprintRuntimeConfigPatch(params: {
   const agentRoot = inferAgentRoot(existingAgents);
   const directReports = buildDirectReportRuntimeRefs(params.agentTemplates);
 
-  if (!workspaceRoot || !agentRoot) {
-    throw new Error("Primary runtime config does not expose agent workspace roots");
+  if (!workspaceRoot) {
+    throw new Error("Primary runtime config does not expose an agent workspace root");
   }
 
   const blueprintEntries = params.agentTemplates.map((tmpl) => {
@@ -112,13 +112,15 @@ export function buildBlueprintRuntimeConfigPatch(params: {
       params.runtimeCapabilities
     );
     const workspacePath = pathPosix.join(workspaceRoot, "agents", runtimeRef);
-    const agentDir = pathPosix.join(agentRoot, runtimeRef, "agent");
+    const agentDir = agentRoot
+      ? pathPosix.join(agentRoot, runtimeRef, "agent")
+      : null;
 
     return {
       id: runtimeRef,
       name: runtimeRef,
       workspace: workspacePath,
-      agentDir,
+      ...(agentRoot ? { agentDir } : {}),
       model: resolvedModel.primaryModel
         ? {
             primary: resolvedModel.primaryModel,