@a5c-ai/babysitter-sdk 0.0.33 → 0.0.35

package/dist/cli/commands/runIterate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runIterate.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/runIterate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0JtF"}
+{"version":3,"file":"runIterate.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/runIterate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxD,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8ItF"}

package/dist/cli/commands/runIterate.js

@@ -61,69 +61,60 @@ async function runIterate(options) {
     if (verbose) {
         console.error(`[run:iterate] Starting iteration ${iteration} for run ${runId}`);
     }
+    // First, advance the runtime one step to request pending effects (if any).
+    // This is what creates EFFECT_REQUESTED entries that hooks can observe via task:list.
+    const iterationResult = await (0, orchestrateIteration_1.orchestrateIteration)({ runDir });
+    if (iterationResult.status === "completed") {
+        await (0, runtime_1.callRuntimeHook)("on-iteration-end", {
+            runId,
+            iteration,
+            action: "none",
+            status: "completed",
+            reason: "completed",
+            timestamp: new Date().toISOString(),
+        }, { cwd: projectRoot, logger: verbose ? ((msg) => console.error(msg)) : undefined });
+        return {
+            iteration,
+            status: "completed",
+            action: "none",
+            reason: "completed",
+            metadata: { runId, processId: metadata.processId, hookStatus: "executed" },
+        };
+    }
+    if (iterationResult.status === "failed") {
+        await (0, runtime_1.callRuntimeHook)("on-iteration-end", {
+            runId,
+            iteration,
+            action: "none",
+            status: "failed",
+            reason: "failed",
+            timestamp: new Date().toISOString(),
+        }, { cwd: projectRoot, logger: verbose ? ((msg) => console.error(msg)) : undefined });
+        return {
+            iteration,
+            status: "failed",
+            action: "none",
+            reason: "failed",
+            metadata: { runId, processId: metadata.processId, hookStatus: "executed" },
+        };
+    }
     // === Call on-iteration-start hook ===
-    // Hook analyzes state and returns orchestration decisions
+    // Hook may execute/post effects that were requested by orchestrateIteration().
     const iterationStartPayload = {
         runId,
         iteration,
+        status: iterationResult.status,
+        pending: iterationResult.status === "waiting" ? iterationResult.nextActions : [],
         timestamp: new Date().toISOString(),
     };
     const hookResult = await (0, runtime_1.callRuntimeHook)("on-iteration-start", iterationStartPayload, {
         cwd: projectRoot,
         logger: verbose ? ((msg) => console.error(msg)) : undefined,
     });
-    // If no hooks executed, fall back to running one real orchestration step (runtime iteration).
-    // This ensures `run:iterate` works even without a plugin install / hooks configuration.
-    if (!hookResult.executedHooks?.length) {
-        const iterationResult = await (0, orchestrateIteration_1.orchestrateIteration)({ runDir });
-        const status = iterationResult.status === "waiting"
-            ? "waiting"
-            : iterationResult.status === "completed"
-                ? "completed"
-                : "failed";
-        // Still call on-iteration-end (will be a no-op if no hooks are installed).
-        await (0, runtime_1.callRuntimeHook)("on-iteration-end", {
-            runId,
-            iteration,
-            action: status === "waiting" ? "waiting" : "none",
-            status,
-            reason: "no-hooks-fallback",
-            count: iterationResult.status === "waiting" ? iterationResult.nextActions.length : undefined,
-            timestamp: new Date().toISOString(),
-        }, {
-            cwd: projectRoot,
-            logger: verbose ? ((msg) => console.error(msg)) : undefined,
-        });
-        return {
-            iteration,
-            status,
-            action: status === "waiting" ? "waiting" : "none",
-            reason: "no-hooks-fallback",
-            count: iterationResult.status === "waiting" ? iterationResult.nextActions.length : undefined,
-            nextActions: iterationResult.status === "waiting" ? iterationResult.nextActions : undefined,
-            metadata: {
-                runId,
-                processId: metadata.processId,
-                hookStatus: "none",
-            },
-        };
-    }
     // Parse hook output
-    let hookDecision = {};
-    if (hookResult.output) {
-        try {
-            hookDecision = typeof hookResult.output === "string"
-                ? JSON.parse(hookResult.output)
-                : hookResult.output;
-        }
-        catch (e) {
-            if (verbose) {
-                console.error(`[run:iterate] Warning: Could not parse hook output:`, hookResult.output);
-            }
-        }
-    }
-    const action = hookDecision.action || "none";
-    const reason = hookDecision.reason || "unknown";
+    const hookDecision = parseHookDecision(hookResult.output);
+    const action = hookDecision.action ?? "none";
+    const reason = hookDecision.reason ?? "unknown";
     const count = hookDecision.count;
     const until = hookDecision.until;
     if (verbose) {
@@ -131,21 +122,17 @@ async function runIterate(options) {
     }
     // Determine result status based on hook action
     let status;
-    // Check for terminal state first
-    if (reason === "terminal-state") {
-        status = hookDecision.status === "failed" ? "failed" : "completed";
-    }
-    else if (action === "executed-tasks") {
+    if (action === "executed-tasks") {
         status = "executed";
     }
     else if (action === "waiting") {
         status = "waiting";
     }
-    else if (action === "none") {
-        status = "none";
+    else if (iterationResult.status === "waiting") {
+        // If the hook didn't execute anything, surface runtime waiting details.
+        status = "waiting";
     }
     else {
-        // Default to none for unknown actions
         status = "none";
     }
     // === Call on-iteration-end hook ===
@@ -170,6 +157,7 @@ async function runIterate(options) {
         reason,
         count,
         until,
+        nextActions: iterationResult.status === "waiting" ? iterationResult.nextActions : undefined,
         metadata: {
             runId,
             processId: metadata.processId,
@@ -178,3 +166,30 @@ async function runIterate(options) {
     };
     return result;
 }
+function parseHookDecision(output) {
+    const record = parseMaybeJsonRecord(output);
+    if (!record)
+        return {};
+    const action = typeof record.action === "string" ? record.action : undefined;
+    const reason = typeof record.reason === "string" ? record.reason : undefined;
+    const status = typeof record.status === "string" ? record.status : undefined;
+    const count = typeof record.count === "number" ? record.count : undefined;
+    const until = typeof record.until === "number" ? record.until : undefined;
+    return { action, reason, status, count, until };
+}
+function parseMaybeJsonRecord(output) {
+    if (!output)
+        return undefined;
+    if (typeof output === "object" && !Array.isArray(output)) {
+        return output;
+    }
+    if (typeof output !== "string")
+        return undefined;
+    try {
+        const parsed = JSON.parse(output);
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AA20CA,wBAAgB,mBAAmB;eAEf,MAAM,EAAE,GAA2B,OAAO,CAAC,MAAM,CAAC;kBAyCpD,MAAM;EAIvB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AAmwCA,wBAAgB,mBAAmB;eAEf,MAAM,EAAE,GAA2B,OAAO,CAAC,MAAM,CAAC;kBAsCpD,MAAM;EAIvB"}

package/dist/cli/main.js

@@ -38,7 +38,6 @@ exports.createBabysitterCli = createBabysitterCli;
 const node_fs_1 = require("node:fs");
 const path = __importStar(require("node:path"));
 const commitEffectResult_1 = require("../runtime/commitEffectResult");
-const orchestrateIteration_1 = require("../runtime/orchestrateIteration");
 const createRun_1 = require("../runtime/createRun");
 const effectIndex_1 = require("../runtime/replay/effectIndex");
 const stateCache_1 = require("../runtime/replay/stateCache");
@@ -53,7 +52,6 @@ const USAGE = `Usage:
   babysitter run:rebuild-state <runDir> [--runs-dir <dir>] [--json] [--dry-run]
   babysitter run:iterate <runDir> [--runs-dir <dir>] [--json] [--verbose] [--iteration <n>]
   babysitter task:post <runDir> <effectId> --status <ok|error> [--runs-dir <dir>] [--json] [--dry-run] [--value <file>] [--error <file>] [--stdout-ref <ref>] [--stderr-ref <ref>] [--stdout-file <file>] [--stderr-file <file>] [--started-at <iso8601>] [--finished-at <iso8601>] [--metadata <file>] [--invocation-key <key>]
-  babysitter run:step <runDir> [--runs-dir <dir>] [--json] [--now <iso8601>]
   babysitter task:list <runDir> [--runs-dir <dir>] [--pending] [--kind <kind>] [--json]
   babysitter task:show <runDir> <effectId> [--runs-dir <dir>] [--json]
 
@@ -202,10 +200,6 @@ function parseArgs(argv) {
             parsed.requestId = expectFlagValue(rest, ++i, "--request");
             continue;
         }
-        if (arg === "--now") {
-            parsed.nowOverride = expectFlagValue(rest, ++i, "--now");
-            continue;
-        }
         positionals.push(arg);
     }
     if (parsed.command === "task:post") {
@@ -229,9 +223,6 @@ function parseArgs(argv) {
     else if (parsed.command === "run:rebuild-state") {
         [parsed.runDirArg] = positionals;
     }
-    else if (parsed.command === "run:step") {
-        [parsed.runDirArg] = positionals;
-    }
     return parsed;
 }
 function resolveRunDir(baseDir, runDirArg) {
@@ -863,65 +854,6 @@ async function handleTaskPost(parsed) {
     }
     return parsed.taskStatus === "ok" ? 0 : 1;
 }
-function parseNowOverride(nowOverride) {
-    if (!nowOverride)
-        return null;
-    const parsed = new Date(nowOverride);
-    if (Number.isNaN(parsed.getTime())) {
-        throw new Error(`--now must be a valid ISO 8601 timestamp (received: ${nowOverride})`);
-    }
-    return parsed;
-}
-async function handleRunStep(parsed) {
-    if (!parsed.runDirArg) {
-        console.error(USAGE);
-        return 1;
-    }
-    const runDir = resolveRunDir(parsed.runsDir, parsed.runDirArg);
-    logVerbose("run:step", parsed, {
-        runDir,
-        now: parsed.nowOverride ?? "auto",
-        json: parsed.json,
-    });
-    if (!(await readRunMetadataSafe(runDir, "run:step")))
-        return 1;
-    let now;
-    try {
-        now = parseNowOverride(parsed.nowOverride) ?? new Date();
-    }
-    catch (error) {
-        console.error(error instanceof Error ? error.message : String(error));
-        return 1;
-    }
-    const iteration = await (0, orchestrateIteration_1.orchestrateIteration)({ runDir, now });
-    const pendingActions = iteration.status === "waiting" ? iteration.nextActions : undefined;
-    const metadata = enrichIterationMetadata(iteration.metadata, pendingActions);
-    const formattedMetadata = formatIterationMetadata(metadata);
-    if (parsed.json) {
-        console.log(JSON.stringify({ ...iteration, metadata: formattedMetadata.jsonMetadata ?? null }));
-        return iteration.status === "failed" ? 1 : 0;
-    }
-    if (iteration.status === "completed") {
-        const output = JSON.stringify(iteration.output ?? null);
-        const suffix = formattedMetadata.textParts.length ? ` ${formattedMetadata.textParts.join(" ")}` : "";
-        console.error(`[run:step] status=completed output=${output}${suffix}`);
-        return 0;
-    }
-    if (iteration.status === "waiting") {
-        logPendingActions(iteration.nextActions, {
-            command: "run:step",
-            metadataParts: formattedMetadata.textParts,
-        });
-        logSleepHints("run:step", iteration.nextActions);
-        return 0;
-    }
-    const suffix = formattedMetadata.textParts.length ? ` ${formattedMetadata.textParts.join(" ")}` : "";
-    console.error(`[run:step] status=failed${suffix}`);
-    if (iteration.error !== undefined) {
-        console.error(iteration.error);
-    }
-    return 1;
-}
 async function handleTaskList(parsed) {
     if (!parsed.runDirArg) {
         console.error(USAGE);
@@ -1270,9 +1202,6 @@ function createBabysitterCli() {
                 if (parsed.command === "task:post") {
                     return await handleTaskPost(parsed);
                 }
-                if (parsed.command === "run:step") {
-                    return await handleRunStep(parsed);
-                }
                 if (parsed.command === "task:list") {
                     return await handleTaskList(parsed);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a5c-ai/babysitter-sdk",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Storage and run-registry primitives for event-sourced babysitter workflows.",
   "license": "UNLICENSED",
   "type": "commonjs",