@hasna/loops 0.3.57 → 0.3.58

package/dist/cli/index.js

@@ -1260,12 +1260,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1437,6 +1446,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1475,6 +1487,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),
@@ -4733,6 +4748,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
     const workflowWithoutGoal = { ...workflow, goal: undefined };
     return runGoal(store, workflow.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: opts.loop?.id,
         loopName: opts.loop?.name,
@@ -4825,6 +4841,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
       if (step.goal) {
         result = await runGoal(store, step.goal, {
           ...opts,
+          model: opts.goalModel,
           target: targetWithStepAccount(step),
           signal: controller.signal,
           context: {
@@ -4966,6 +4983,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     if (loop.goal) {
       return runGoal(store, loop.goal, {
         ...opts,
+        model: opts.goalModel,
         target: loop.target,
         context: {
           loopId: loop.id,
@@ -4987,8 +5005,10 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     }
   }
   if (loop.goal) {
+    const workflowForLoopGoal = workflow.goal ? { ...workflow, goal: undefined } : workflow;
     return runGoal(store, loop.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: loop.id,
         loopName: loop.name,
@@ -4997,7 +5017,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
         workflowId: workflow.id,
         workflowName: workflow.name
       },
-      executeNode: async (node) => executeWorkflow(store, workflow, {
+      executeNode: async (node) => executeWorkflow(store, workflowForLoopGoal, {
         ...opts,
         loop,
         loopRun: run,
@@ -6477,7 +6497,7 @@ function buildScriptInventoryReport(store, opts = {}) {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.3.57",
+  version: "0.3.58",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -8617,6 +8637,21 @@ function workflowTimeoutMigrationName(workflow, timeoutMs) {
   const suffix = randomUUID().replace(/-/g, "").slice(0, 8);
   return `${workflow.name}-${policy}-${suffix}`;
 }
+function workflowWithoutGoalWrapper(workflow, opts = {}) {
+  return {
+    body: {
+      name: opts.name ?? workflow.name,
+      description: workflow.description,
+      version: workflow.version,
+      steps: workflow.steps
+    },
+    changed: workflow.goal !== undefined
+  };
+}
+function workflowGoalWrapperMigrationName(workflow) {
+  const suffix = randomUUID().replace(/-/g, "").slice(0, 8);
+  return `${workflow.name}-no-workflow-goal-${suffix}`;
+}
 function printTextOutput(value) {
   for (const line of textOutputBlocks(value, { indent: "  " }))
     console.log(line);
@@ -11268,6 +11303,66 @@ workflows.command("migrate-agent-timeouts").description("append-only migrate act
     store.close();
   }
 });
+workflows.command("migrate-goal-wrappers").description("append-only migrate active workflow loops away from workflow-level goal wrappers").option("--loop <idOrName>", "migrate only one loop instead of all active workflow loops").option("--apply", "create new workflow specs and retarget eligible loops").option("--archive-old", "archive old workflow specs after retargeting when no active loops still reference them").action((opts) => {
+  const store = new Store;
+  try {
+    const candidateLoops = opts.loop ? [store.requireUniqueLoop(opts.loop)] : store.listLoops({ status: "active", limit: 1e4 }).filter((loop) => loop.target.type === "workflow");
+    const rows = [];
+    for (const loop of candidateLoops) {
+      if (loop.archivedAt) {
+        rows.push({ loop: publicLoop(loop), status: "skipped", reason: "loop is archived" });
+        continue;
+      }
+      if (loop.target.type !== "workflow") {
+        rows.push({ loop: publicLoop(loop), status: "skipped", reason: "loop is not a workflow loop" });
+        continue;
+      }
+      const workflow = store.requireWorkflow(loop.target.workflowId);
+      const nextWorkflowName = workflowGoalWrapperMigrationName(workflow);
+      const migration = workflowWithoutGoalWrapper(workflow, { name: nextWorkflowName });
+      if (!migration.changed) {
+        rows.push({ loop: publicLoop(loop), workflow: publicWorkflow(workflow), status: "skipped", reason: "workflow has no top-level goal wrapper" });
+        continue;
+      }
+      if (store.hasRunningRun(loop.id)) {
+        rows.push({ loop: publicLoop(loop), workflow: publicWorkflow(workflow), status: "blocked", reason: "loop has a running run; retry after it finishes" });
+        continue;
+      }
+      if (!opts.apply) {
+        rows.push({
+          loop: publicLoop(loop),
+          workflow: publicWorkflow(workflow),
+          status: "would_migrate",
+          nextWorkflowName,
+          removedGoal: workflow.goal
+        });
+        continue;
+      }
+      const migrated = store.createAndRetargetWorkflowLoop(loop.id, migration.body, {
+        workflowTimeoutMs: loop.target.timeoutMs,
+        archiveOld: Boolean(opts.archiveOld)
+      });
+      rows.push({
+        loop: publicLoop(migrated.loop),
+        previousWorkflow: publicWorkflow(migrated.previousWorkflow),
+        workflow: publicWorkflow(migrated.workflow),
+        archivedOld: migrated.archivedOld ? publicWorkflow(migrated.archivedOld) : undefined,
+        status: "migrated"
+      });
+    }
+    const summary = {
+      apply: Boolean(opts.apply),
+      total: rows.length,
+      migrated: rows.filter((row) => row.status === "migrated").length,
+      wouldMigrate: rows.filter((row) => row.status === "would_migrate").length,
+      blocked: rows.filter((row) => row.status === "blocked").length,
+      skipped: rows.filter((row) => row.status === "skipped").length
+    };
+    print({ summary, rows }, opts.apply ? `migrated=${summary.migrated} blocked=${summary.blocked} skipped=${summary.skipped}` : `would_migrate=${summary.wouldMigrate} blocked=${summary.blocked} skipped=${summary.skipped}`);
+  } finally {
+    store.close();
+  }
+});
 workflows.command("archive <idOrName>").action((idOrName) => {
   const store = new Store;
   try {

package/dist/daemon/index.js

@@ -1260,12 +1260,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1437,6 +1446,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1475,6 +1487,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),
@@ -4617,6 +4632,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
     const workflowWithoutGoal = { ...workflow, goal: undefined };
     return runGoal(store, workflow.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: opts.loop?.id,
         loopName: opts.loop?.name,
@@ -4709,6 +4725,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
       if (step.goal) {
         result = await runGoal(store, step.goal, {
           ...opts,
+          model: opts.goalModel,
           target: targetWithStepAccount(step),
           signal: controller.signal,
           context: {
@@ -4850,6 +4867,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     if (loop.goal) {
       return runGoal(store, loop.goal, {
         ...opts,
+        model: opts.goalModel,
         target: loop.target,
         context: {
           loopId: loop.id,
@@ -4871,8 +4889,10 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     }
   }
   if (loop.goal) {
+    const workflowForLoopGoal = workflow.goal ? { ...workflow, goal: undefined } : workflow;
     return runGoal(store, loop.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: loop.id,
         loopName: loop.name,
@@ -4881,7 +4901,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
         workflowId: workflow.id,
         workflowName: workflow.name
       },
-      executeNode: async (node) => executeWorkflow(store, workflow, {
+      executeNode: async (node) => executeWorkflow(store, workflowForLoopGoal, {
         ...opts,
         loop,
         loopRun: run,
@@ -5611,7 +5631,7 @@ function enableStartup(result) {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.3.57",
+  version: "0.3.58",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",

package/dist/index.js

@@ -1258,12 +1258,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1435,6 +1444,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1473,6 +1485,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),
@@ -4506,7 +4521,7 @@ function publicGoalRun(run) {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.3.57",
+  version: "0.3.58",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -5047,6 +5062,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
     const workflowWithoutGoal = { ...workflow, goal: undefined };
     return runGoal(store, workflow.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: opts.loop?.id,
         loopName: opts.loop?.name,
@@ -5139,6 +5155,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
       if (step.goal) {
         result = await runGoal(store, step.goal, {
           ...opts,
+          model: opts.goalModel,
           target: targetWithStepAccount(step),
           signal: controller.signal,
           context: {
@@ -5280,6 +5297,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     if (loop.goal) {
       return runGoal(store, loop.goal, {
         ...opts,
+        model: opts.goalModel,
         target: loop.target,
         context: {
           loopId: loop.id,
@@ -5301,8 +5319,10 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     }
   }
   if (loop.goal) {
+    const workflowForLoopGoal = workflow.goal ? { ...workflow, goal: undefined } : workflow;
     return runGoal(store, loop.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: loop.id,
         loopName: loop.name,
@@ -5311,7 +5331,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
         workflowId: workflow.id,
         workflowName: workflow.name
       },
-      executeNode: async (node) => executeWorkflow(store, workflow, {
+      executeNode: async (node) => executeWorkflow(store, workflowForLoopGoal, {
         ...opts,
         loop,
         loopRun: run,

package/dist/lib/executor.d.ts

@@ -1,7 +1,9 @@
+import type { LanguageModel } from "ai";
 import type { ExecutableTarget, ExecutorResult, Loop, LoopMachineRef, LoopRun, PersistGuardOptions } from "../types.js";
 export interface ExecuteOptions extends PersistGuardOptions {
     maxOutputBytes?: number;
     env?: NodeJS.ProcessEnv;
+    goalModel?: LanguageModel;
     log?: (message: string) => void;
     signal?: AbortSignal;
     onSpawn?: (pid: number) => void;

package/dist/lib/store.d.ts

@@ -71,6 +71,7 @@ export declare class Store {
     private addColumnIfMissing;
     private createWorkflowRunBackfillIndexes;
     private assertDaemonLeaseFence;
+    private assertNoNestedWorkflowGoal;
     createLoop(input: CreateLoopInput, from?: Date): Loop;
     getLoop(id: string): Loop | undefined;
     findLoopByName(name: string): Loop | undefined;

package/dist/lib/store.js

@@ -1258,12 +1258,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1435,6 +1444,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1473,6 +1485,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),

package/dist/mcp/index.js

@@ -1260,12 +1260,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1437,6 +1446,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1475,6 +1487,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),
@@ -4508,7 +4523,7 @@ function publicGoalRun(run) {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.3.57",
+  version: "0.3.58",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -5049,6 +5064,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
     const workflowWithoutGoal = { ...workflow, goal: undefined };
     return runGoal(store, workflow.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: opts.loop?.id,
         loopName: opts.loop?.name,
@@ -5141,6 +5157,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
       if (step.goal) {
         result = await runGoal(store, step.goal, {
           ...opts,
+          model: opts.goalModel,
           target: targetWithStepAccount(step),
           signal: controller.signal,
           context: {
@@ -5282,6 +5299,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     if (loop.goal) {
       return runGoal(store, loop.goal, {
         ...opts,
+        model: opts.goalModel,
         target: loop.target,
         context: {
           loopId: loop.id,
@@ -5303,8 +5321,10 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     }
   }
   if (loop.goal) {
+    const workflowForLoopGoal = workflow.goal ? { ...workflow, goal: undefined } : workflow;
     return runGoal(store, loop.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: loop.id,
         loopName: loop.name,
@@ -5313,7 +5333,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
         workflowId: workflow.id,
         workflowName: workflow.name
       },
-      executeNode: async (node) => executeWorkflow(store, workflow, {
+      executeNode: async (node) => executeWorkflow(store, workflowForLoopGoal, {
         ...opts,
         loop,
         loopRun: run,

package/dist/sdk/index.js

@@ -1258,12 +1258,21 @@ class Store {
     if (!row)
       throw new Error("daemon lease lost");
   }
+  assertNoNestedWorkflowGoal(target, goal) {
+    if (!goal || target.type !== "workflow")
+      return;
+    const workflow = this.getWorkflow(target.workflowId);
+    if (workflow?.goal) {
+      throw new Error(`workflow loop cannot define a loop-level goal when workflow ${workflow.name} already has a top-level goal; remove one goal wrapper`);
+    }
+  }
   createLoop(input, from = new Date) {
     const now = nowIso();
     const target = input.target.type === "workflow" ? input.target : normalizeCreateWorkflowInput({
       name: "loop-target-validation",
       steps: [{ id: "target", target: input.target }]
     }).steps[0].target;
+    this.assertNoNestedWorkflowGoal(target, input.goal);
     const loop = {
       id: genId(),
       name: input.name,
@@ -1435,6 +1444,9 @@ class Store {
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
       const workflow = this.requireWorkflow(workflowId);
+      if (current.goal && workflow.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to workflow ${workflow.name} because both define top-level goals`);
+      }
       const target = { ...current.target, workflowId: workflow.id };
       if (opts.workflowTimeoutMs !== undefined)
         target.timeoutMs = opts.workflowTimeoutMs;
@@ -1473,6 +1485,9 @@ class Store {
         throw new Error(`loop is not a workflow loop: ${idOrName}`);
       if (this.hasRunningRun(current.id))
         throw new Error(`refusing to retarget running loop: ${current.id}`);
+      if (current.goal && normalized.goal) {
+        throw new Error(`workflow loop cannot retarget ${current.name} to a workflow that also defines a top-level goal`);
+      }
       const previousWorkflow = this.requireWorkflow(current.target.workflowId);
       const workflow = {
         id: genId(),
@@ -4607,6 +4622,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
     const workflowWithoutGoal = { ...workflow, goal: undefined };
     return runGoal(store, workflow.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: opts.loop?.id,
         loopName: opts.loop?.name,
@@ -4699,6 +4715,7 @@ async function executeWorkflow(store, workflow, opts = {}) {
       if (step.goal) {
         result = await runGoal(store, step.goal, {
           ...opts,
+          model: opts.goalModel,
           target: targetWithStepAccount(step),
           signal: controller.signal,
           context: {
@@ -4840,6 +4857,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     if (loop.goal) {
       return runGoal(store, loop.goal, {
         ...opts,
+        model: opts.goalModel,
         target: loop.target,
         context: {
           loopId: loop.id,
@@ -4861,8 +4879,10 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
     }
   }
   if (loop.goal) {
+    const workflowForLoopGoal = workflow.goal ? { ...workflow, goal: undefined } : workflow;
     return runGoal(store, loop.goal, {
       ...opts,
+      model: opts.goalModel,
       context: {
         loopId: loop.id,
         loopName: loop.name,
@@ -4871,7 +4891,7 @@ async function executeLoopTarget(store, loop, run, opts = {}) {
         workflowId: workflow.id,
         workflowName: workflow.name
       },
-      executeNode: async (node) => executeWorkflow(store, workflow, {
+      executeNode: async (node) => executeWorkflow(store, workflowForLoopGoal, {
         ...opts,
         loop,
         loopRun: run,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/loops",
-  "version": "0.3.57",
+  "version": "0.3.58",
   "description": "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   "type": "module",
   "main": "dist/index.js",