terse-cli 0.4.6 → 0.5.0

package/dist/providers/typescript/jobMacro.js

@@ -1,128 +1,86 @@
-import path from "node:path";
-import { StepCallKind, findStepImportName, matchStepCall, transformJobStep, transformStep } from "./stepMacro.js";
-// MARK: Rewrite job sources
+import { findStepImportName, matchStepCall, transformStep } from "./stepMacro.js";
 export function transformJobSource(ts, source, fileName) {
-    const { code: withSteps, stepDefs } = extractJobSteps(ts, source, fileName);
-    const sf = ts.createSourceFile(fileName, withSteps, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-    const jobs = [];
-    const hoisted = [];
-    const edits = [];
-    const isProp = (p, key) => ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.text === key;
-    const visit = (node) => {
-        if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "createJob" && node.arguments.length > 0 && ts.isObjectLiteralExpression(node.arguments[0])) {
-            const obj = node.arguments[0];
-            const nameProp = obj.properties.find(p => isProp(p, "name"));
-            const onTrigger = obj.properties.find(p => isProp(p, "onTrigger"));
-            const statesProp = obj.properties.find(p => isProp(p, "states"));
-            const durable = obj.properties.find(p => isProp(p, "durable"))?.initializer.kind === ts.SyntaxKind.TrueKeyword;
-            const jobName = nameProp && ts.isStringLiteralLike(nameProp.initializer) ? nameProp.initializer.text : undefined;
-            const fn = onTrigger?.initializer;
-            if (jobName && fn && durable && (ts.isArrowFunction(fn) || ts.isFunctionExpression(fn))) {
-                const fnName = `terseWf_${Buffer.from(jobName).toString("hex")}`;
-                const param = fn.parameters.length ? fn.parameters[0].name.getText(sf) : "event";
-                const stateParam = fn.parameters.length > 1 ? fn.parameters[1].name.getText(sf) : "state";
-                const statesText = statesProp ? statesProp.initializer.getText(sf) : "[]";
-                const body = ts.isBlock(fn.body) ? fn.body.getText(sf).slice(1, -1) : `\n  return ${fn.body.getText(sf)}\n`;
-                hoisted.push(`async function ${fnName}(__rawEvent) {\n` +
-                    `  "use workflow"\n` +
-                    `  const ${param} = createSDKTrigger(__rawEvent)\n` +
-                    `  const ${stateParam} = __buildJobStateAccessor(${statesText})\n` +
-                    body +
-                    `}`);
-                edits.push({ start: onTrigger.getStart(sf), end: onTrigger.getEnd(), text: `onTrigger: ${fnName}` });
-                jobs.push({ name: jobName, fnName });
-            }
-        }
-        ts.forEachChild(node, visit);
-    };
-    visit(sf);
-    if (jobs.length === 0)
-        return { code: withSteps, stepsCode: null, jobs };
-    const imports = sf.statements.filter(ts.isImportDeclaration);
-    const lastImportEnd = imports.length ? imports[imports.length - 1].getEnd() : 0;
-    edits.push({ start: lastImportEnd, end: lastImportEnd, text: `\n\n${hoisted.join("\n\n")}\n` });
-    const importEdit = sdkImportEdit(ts, sf, imports, lastImportEnd, ["createSDKTrigger", "__buildJobStateAccessor"]);
-    if (importEdit)
-        edits.push(importEdit);
-    if (stepDefs.length > 0) {
-        edits.push({ start: lastImportEnd, end: lastImportEnd, text: `\nimport { ${stepDefs.map(s => s.name).join(", ")} } from "${stepsImportSpecifier(fileName)}"` });
-    }
-    let code = withSteps;
-    for (const e of edits.sort((a, b) => b.start - a.start))
-        code = code.slice(0, e.start) + e.text + code.slice(e.end);
-    const stepsCode = stepDefs.length > 0 ? buildStepsModule(ts, sf, stepDefs) : null;
-    return { code, stepsCode, jobs };
-}
-// MARK: Extract job steps
-function extractJobSteps(ts, source, fileName) {
     const sf = ts.createSourceFile(fileName, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-    const stepDefs = [];
-    const edits = [];
     const stepName = findStepImportName(ts, sf);
-    let counter = 0;
+    const stepEdits = [];
+    let stepIndex = 0;
     const visit = (node) => {
         const step = matchStepCall(ts, node, stepName);
         if (step) {
-            switch (step.kind) {
-                case StepCallKind.Step: {
-                    const { stepDef, edit } = transformStep(ts, sf, step, fileName, counter++, stepName);
-                    stepDefs.push(stepDef);
-                    edits.push(edit);
-                    return;
-                }
-                case StepCallKind.JobStep: {
-                    const transformed = transformJobStep(ts, sf, step, fileName, counter, stepName);
-                    if (transformed) {
-                        counter++;
-                        stepDefs.push(transformed.stepDef);
-                        edits.push(transformed.edit);
-                        return;
-                    }
-                    break;
-                }
-            }
+            stepEdits.push(transformStep(ts, sf, step, fileName, stepIndex++));
+            return;
         }
         ts.forEachChild(node, visit);
     };
     visit(sf);
-    if (edits.length === 0)
-        return { code: source, stepDefs: [] };
-    let code = source;
-    for (const e of edits.sort((a, b) => b.start - a.start))
-        code = code.slice(0, e.start) + e.text + code.slice(e.end);
-    return { code, stepDefs };
+    let code = applyEdits(source, stepEdits);
+    const hoisted = hoistDurableJobs(ts, code, fileName);
+    code = hoisted.code;
+    const sdkImports = [...(stepIndex > 0 ? ["__runDurableStep"] : []), ...(hoisted.jobs.length > 0 ? ["__defineTerseWorkflow", "__registerDurableWorkflow"] : [])];
+    code = addSdkImports(ts, code, fileName, sdkImports);
+    return { code, stepsCode: null, jobs: hoisted.jobs };
 }
-// Steps execute from a separate bundle, so the module scope the hoisted code relies
-// on (clients, env guards, helpers) must exist there too, not just the imports.
-function buildStepsModule(ts, sf, stepDefs) {
-    const moduleCode = sf.statements
-        .filter(s => !containsCreateJob(ts, s))
-        .map(s => s.getText(sf))
-        .join("\n");
-    const defs = stepDefs.map(s => s.def).join("\n\n");
-    return `${moduleCode}\n\n${defs}\n`;
+function hoistDurableJobs(ts, source, fileName) {
+    const sf = ts.createSourceFile(fileName, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const edits = [];
+    const jobs = [];
+    for (const statement of sf.statements) {
+        if (!ts.isExpressionStatement(statement) || !ts.isCallExpression(statement.expression))
+            continue;
+        const name = durableJobName(ts, statement.expression);
+        if (!name)
+            continue;
+        const index = jobs.length;
+        const jobName = `__terseJob${index}`;
+        const workflowName = `__terseWorkflow${index}`;
+        edits.push({
+            start: statement.getStart(sf),
+            end: statement.getEnd(),
+            text: `const ${jobName} = ${statement.expression.getText(sf)}\nconst ${workflowName} = __defineTerseWorkflow(${jobName})\n__registerDurableWorkflow(${workflowName})`
+        });
+        jobs.push({ name });
+    }
+    return { code: applyEdits(source, edits), jobs };
 }
-function containsCreateJob(ts, node) {
-    const walk = (n) => (ts.isCallExpression(n) && ts.isIdentifier(n.expression) && n.expression.text === "createJob" ? true : ts.forEachChild(n, walk));
-    return walk(node) ?? false;
+function durableJobName(ts, node) {
+    if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression) || node.expression.text !== "createJob")
+        return undefined;
+    const [config] = node.arguments;
+    if (!config || !ts.isObjectLiteralExpression(config))
+        return undefined;
+    const name = property(ts, config, "name")?.initializer;
+    const durable = property(ts, config, "durable")?.initializer;
+    if (!name || !ts.isStringLiteralLike(name) || durable?.kind !== ts.SyntaxKind.TrueKeyword)
+        return undefined;
+    return name.text;
 }
-function stepsImportSpecifier(fileName) {
-    return `./${path.basename(fileName).replace(/\.(ts|tsx|mts|cts)$/, "")}.__terse.steps`;
+function property(ts, object, name) {
+    return object.properties.find((candidate) => ts.isPropertyAssignment(candidate) && ts.isIdentifier(candidate.name) && candidate.name.text === name);
 }
-// MARK: Imports
-function sdkImportEdit(ts, sf, imports, lastImportEnd, names) {
-    const sdkImport = imports.find(i => ts.isStringLiteralLike(i.moduleSpecifier) && i.moduleSpecifier.text === "terse-sdk");
-    const named = sdkImport?.importClause?.namedBindings;
-    if (sdkImport && named && ts.isNamedImports(named)) {
-        const missing = names.filter(n => !named.elements.some(el => el.name.text === n));
-        if (missing.length === 0)
-            return null;
-        const lastElement = named.elements[named.elements.length - 1];
-        if (lastElement) {
-            const pos = lastElement.getEnd();
-            return { start: pos, end: pos, text: `, ${missing.join(", ")}` };
-        }
+function addSdkImports(ts, source, fileName, names) {
+    if (names.length === 0)
+        return source;
+    const sf = ts.createSourceFile(fileName, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const imports = sf.statements.filter(ts.isImportDeclaration);
+    const sdkImport = imports.find(statement => ts.isStringLiteralLike(statement.moduleSpecifier) && statement.moduleSpecifier.text === "terse-sdk");
+    const bindings = sdkImport?.importClause?.namedBindings;
+    if (bindings && ts.isNamedImports(bindings)) {
+        const importedNames = new Set(bindings.elements.map(element => (element.propertyName ?? element.name).text));
+        const missingNames = names.filter(name => !importedNames.has(name));
+        if (missingNames.length === 0)
+            return source;
+        const lastElement = bindings.elements[bindings.elements.length - 1];
+        if (lastElement)
+            return applyEdits(source, [{ start: lastElement.getEnd(), end: lastElement.getEnd(), text: `, ${missingNames.join(", ")}` }]);
+    }
+    const lastImportEnd = imports.length > 0 ? imports[imports.length - 1].getEnd() : 0;
+    return applyEdits(source, [{ start: lastImportEnd, end: lastImportEnd, text: `\nimport { ${names.join(", ")} } from "terse-sdk"` }]);
+}
+function applyEdits(source, edits) {
+    let code = source;
+    for (const edit of [...edits].sort((a, b) => b.start - a.start)) {
+        code = code.slice(0, edit.start) + edit.text + code.slice(edit.end);
     }
-    return { start: lastImportEnd, end: lastImportEnd, text: `\nimport { ${names.join(", ")} } from "terse-sdk"` };
+    return code;
 }
 //# sourceMappingURL=jobMacro.js.map

package/dist/providers/typescript/jobMacro.js.map

@@ -1 +1 @@
-{"version":3,"file":"jobMacro.js","sourceRoot":"","sources":["../../../src/providers/typescript/jobMacro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jobMacro.js","sourceRoot":"","sources":["../../../src/providers/typescript/jobMacro.ts"],"names":[],"mappings":"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"}

package/dist/providers/typescript/jobSources.d.ts

@@ -0,0 +1,7 @@
+export type PrepareJobSourcesParams = {
+    readonly cwd: string;
+    readonly entryFile: string;
+};
+/** Copies and macro-transforms project sources for direct loading through tsx. */
+export declare function prepareJobSources({ cwd, entryFile }: PrepareJobSourcesParams): string;
+//# sourceMappingURL=jobSources.d.ts.map

package/dist/providers/typescript/jobSources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jobSources.d.ts","sourceRoot":"","sources":["../../../src/providers/typescript/jobSources.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,uBAAuB,GAAG,MAAM,CAiBrF"}

package/dist/providers/typescript/jobSources.js

@@ -0,0 +1,46 @@
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { transformJobSource } from "./jobMacro.js";
+/** Copies and macro-transforms project sources for direct loading through tsx. */
+export function prepareJobSources({ cwd, entryFile }) {
+    const sourceDirectory = path.join(cwd, "src");
+    const runtimeDirectory = path.join(cwd, ".terse", "runtime");
+    const preparedSourceDirectory = path.join(runtimeDirectory, "src");
+    fs.rmSync(runtimeDirectory, { recursive: true, force: true });
+    fs.mkdirSync(runtimeDirectory, { recursive: true });
+    fs.cpSync(sourceDirectory, preparedSourceDirectory, { recursive: true });
+    const ts = loadTypescript(cwd);
+    for (const file of findSourceFiles(preparedSourceDirectory)) {
+        const source = fs.readFileSync(file, "utf8");
+        const transformed = transformJobSource(ts, source, path.relative(cwd, file));
+        if (transformed.code !== source)
+            fs.writeFileSync(file, transformed.code);
+    }
+    return path.join(runtimeDirectory, entryFile);
+}
+function findSourceFiles(directory) {
+    const files = [];
+    for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
+        const file = path.join(directory, entry.name);
+        if (entry.isDirectory())
+            files.push(...findSourceFiles(file));
+        else if (/\.(?:ts|tsx|mts|cts)$/.test(entry.name))
+            files.push(file);
+    }
+    return files;
+}
+function loadTypescript(cwd) {
+    try {
+        return createRequire(path.join(cwd, "package.json"))("typescript");
+    }
+    catch {
+        try {
+            return createRequire(import.meta.url)("typescript");
+        }
+        catch {
+            throw new Error("Durable execution needs TypeScript in your project. Run: npm install --save-dev typescript");
+        }
+    }
+}
+//# sourceMappingURL=jobSources.js.map

package/dist/providers/typescript/jobSources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jobSources.js","sourceRoot":"","sources":["../../../src/providers/typescript/jobSources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAOlD,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,EAAE,GAAG,EAAE,SAAS,EAA2B;IACzE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC5D,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAElE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7D,EAAE,CAAC,SAAS,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACnD,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,uBAAuB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAExE,MAAM,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;IAC9B,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC5C,MAAM,WAAW,GAAG,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;QAC5E,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM;YAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;AACjD,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACtC,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,KAAK,CAAC,WAAW,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAA;aACxD,IAAI,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvE,CAAC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IAC/B,IAAI,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;IACtE,CAAC;IAAC,MAAM,CAAC;QACL,IAAI,CAAC;YACD,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAA;QACvD,CAAC;QAAC,MAAM,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,4FAA4F,CAAC,CAAA;QACjH,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/providers/typescript/runtimes/JobRuntime.d.ts

@@ -1,11 +1,14 @@
 import type { CreateJobParameters, SessionStreamEvent } from "terse-sdk";
 import type { SerializedEvent } from "terse-types";
+import type { SessionHandle } from "../../shared/sessionStream.js";
 export type RunJobOptions = {
     verbose?: boolean;
     entryFile?: string;
     projectId?: string;
     onSessionEvent?: (event: SessionStreamEvent) => void;
     pauseUiAround?: <T>(fn: () => Promise<T>) => Promise<T>;
+    /** A session stream the caller already opened, so its round trip overlaps loading the job. */
+    session?: Promise<SessionHandle>;
 };
 export type ResumeRunOptions = {
     verbose?: boolean;

package/dist/providers/typescript/runtimes/JobRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/JobRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,MAAM,MAAM,aAAa,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAA;IACpD,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEvH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEhE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOxD"}
+{"version":3,"file":"JobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/JobRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAElE,MAAM,MAAM,aAAa,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAA;IACpD,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACvD,8FAA8F;IAC9F,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEvH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEhE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOxD"}

package/dist/providers/typescript/runtimes/JobRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"JobRuntime.js","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/JobRuntime.ts"],"names":[],"mappings":"AA6BA,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC5C,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,OAAO,CAAA;IAChD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa;IACvC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;AACL,CAAC"}
+{"version":3,"file":"JobRuntime.js","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/JobRuntime.ts"],"names":[],"mappings":"AAiCA,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC5C,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,OAAO,CAAA;IAChD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa;IACvC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;AACL,CAAC"}

package/dist/providers/typescript/runtimes/directJobRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directJobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/directJobRuntime.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,iBAAiB,CAAA;AAGpE,eAAO,MAAM,gBAAgB,EAAE,UA6C9B,CAAA"}
+{"version":3,"file":"directJobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/directJobRuntime.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,iBAAiB,CAAA;AAGpE,eAAO,MAAM,gBAAgB,EAAE,UA8C9B,CAAA"}

package/dist/providers/typescript/runtimes/directJobRuntime.js

@@ -25,7 +25,7 @@ export const directJobRuntime = {
                         console.log(chalk.cyan(`  Job "${job.name}" started`));
                     await job.onTrigger(inputEvent, state);
                 });
-            }, opts?.onSessionEvent);
+            }, opts?.onSessionEvent, opts?.session);
         }
         catch (error) {
             if (error instanceof CliError)

package/dist/providers/typescript/runtimes/directJobRuntime.js.map

@@ -1 +1 @@
-{"version":3,"file":"directJobRuntime.js","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/directJobRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAA;AAEjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,OAAO,EAAmB,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAe;IACxC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI;QACpC,MAAM,SAAS,GAAG,IAAI,EAAE,OAAO,IAAI,IAAI,CAAA;QACvC,MAAM,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAE1C,IAAI,CAAC;YACD,MAAM,WAAW,CACb,MAAM,EACN,SAAS,EACT,aAAa,EACb,KAAK,EAAC,SAAS,EAAC,EAAE;gBACd,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,IAAI,EAAE;oBAC7H,MAAM,KAAK,GAAG,uBAAuB,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;oBACvD,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;wBACvD,IAAI,SAAS;4BAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,IAAI,sCAAsC,CAAC,CAAC,CAAA;wBACjG,OAAM;oBACV,CAAC;oBACD,IAAI,SAAS;wBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAA;oBACrE,MAAM,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;gBAC1C,CAAC,CAAC,CAAA;YACN,CAAC,EACD,IAAI,EAAE,cAAc,CACvB,CAAA;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,QAAQ;gBAAE,MAAM,KAAK,CAAA;YAC1C,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC9D,MAAM,IAAI,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/E,CAAC;YACD,MAAM,IAAI,QAAQ,CAAC,sBAAsB,EAAE,QAAQ,GAAG,CAAC,IAAI,mBAAmB,EAAE,EAAE,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACzH,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,mCAAmC,EAAE;YAC1E,MAAM,EAAE,+FAA+F;SAC1G,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,mCAAmC,EAAE;YAC1E,MAAM,EAAE,+FAA+F;SAC1G,CAAC,CAAA;IACN,CAAC;CACJ,CAAA"}
+{"version":3,"file":"directJobRuntime.js","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/directJobRuntime.ts"],"names":[],"mappings":"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"}

package/dist/providers/typescript/runtimes/durableJobRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableJobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/durableJobRuntime.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,UAAU,EAAkE,MAAM,iBAAiB,CAAA;AAGjH,eAAO,MAAM,iBAAiB,EAAE,UAqC/B,CAAA"}
+{"version":3,"file":"durableJobRuntime.d.ts","sourceRoot":"","sources":["../../../../src/providers/typescript/runtimes/durableJobRuntime.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,UAAU,EAAkE,MAAM,iBAAiB,CAAA;AAGjH,eAAO,MAAM,iBAAiB,EAAE,UA0C/B,CAAA"}

package/dist/providers/typescript/runtimes/durableJobRuntime.js

@@ -1,15 +1,20 @@
 import chalk from "chalk";
+import { FileJournalStore, Runtime } from "little-durable";
 import path from "node:path";
-import { readRuntimeKeyOrBail } from "../../../api.js";
+import { __fetchRegisteredDurableWorkflow, __inputRequestHook, fetchRegisteredJobs } from "terse-sdk";
+import { runWithJobContext } from "terse-sdk/dist/runIdentity/jobContextStore.js";
+import { ApiRoutes } from "terse-types";
+import { fetchWithAuth, readRuntimeKeyOrBail } from "../../../api.js";
 import { CliError } from "../../../cliError.js";
 import { BACKEND_URL } from "../../../config.js";
-import { isCliRunCommandEnabled } from "../../../env.js";
-import { closeDurableRuntime, getDurableRuntime } from "../durableRuntime.js";
-import { readRunStatus, resolveWorkflowRunId, rewindFailedRun } from "../rewindRun.js";
+import { readProjectConfig } from "../../../projectConfig.js";
+import { shouldRunTerseWorkflow } from "../terseWorkflow.js";
 import { formatErrorDetail } from "./JobRuntime.js";
 import { withSession } from "./session.js";
 export const durableJobRuntime = {
     async executeJob(job, runId, event, opts) {
+        if (!runId)
+            throw new CliError("durable_run_id_missing", "Durable execution requires a run ID.");
         const isVerbose = opts?.verbose ?? true;
         const pauseUiAround = opts?.pauseUiAround ?? (async (fn) => fn());
         const apiKey = readRuntimeKeyOrBail();
@@ -17,23 +22,24 @@ export const durableJobRuntime = {
             await withSession(apiKey, isVerbose, pauseUiAround, async (sessionId) => {
                 if (isVerbose)
                     console.log(chalk.cyan(`  Job "${job.name}" started`));
-                const rt = await getDurableRuntime(process.cwd());
-                await rt.start();
-                const dispatched = await rt.dispatchJob(job.name, { sessionId, runId, apiBaseUrl: BACKEND_URL }, event);
-                // We can't await in the Modal Sandbox. This polls, and a blocked run will never exit.
-                if (!isCliRunCommandEnabled())
-                    await dispatched.awaitResult();
-            }, opts?.onSessionEvent);
+                const journalStore = createJournalStore();
+                const runtime = new Runtime({ journalStore });
+                const context = jobContext({ sessionId, runId, job, projectId: opts?.projectId });
+                const shouldRun = await shouldRunTerseWorkflow({ job, event, context });
+                if (!shouldRun)
+                    return;
+                const workflow = __fetchRegisteredDurableWorkflow(job.name);
+                if (!workflow)
+                    throw new Error(`No durable workflow was registered for job "${job.name}".`);
+                const outcome = await runWithJobContext(context, () => runtime.start(workflow, { runId, input: event }).waitForOutcome());
+                await handleOutcome({ runId, outcome, apiKey });
+            }, opts?.onSessionEvent, opts?.session);
         }
         catch (error) {
             if (error instanceof CliError)
                 throw error;
             throw new CliError("job_execution_failed", `Job "${job.name}" threw an error.`, { detail: formatErrorDetail(error) });
         }
-        finally {
-            if (!isCliRunCommandEnabled())
-                await closeDurableRuntime();
-        }
     },
     async resumeRun(runId, opts) {
         return driveResume(runId, opts);
@@ -46,31 +52,40 @@ async function driveResume(runId, opts, input) {
     const isVerbose = opts?.verbose ?? true;
     const pauseUiAround = opts?.pauseUiAround ?? (async (fn) => fn());
     const apiKey = readRuntimeKeyOrBail();
-    const dataDir = resolveDataDir();
-    const workflowRunId = resolveWorkflowRunId(dataDir, runId);
-    const status = readRunStatus(dataDir, workflowRunId);
     try {
-        await withSession(apiKey, isVerbose, pauseUiAround, async () => {
-            if (status === "failed") {
-                const { rewoundStepId } = rewindFailedRun(dataDir, workflowRunId);
-                if (isVerbose)
-                    console.log(chalk.yellow(`  Re-driving failed run ${workflowRunId}${rewoundStepId ? " from the failed step" : ""}; completed steps replay from the journal`));
-            }
-            else if (isVerbose) {
-                console.log(chalk.cyan(`  Resuming run ${workflowRunId}`));
-            }
-            const rt = await getDurableRuntime(process.cwd());
-            if (input) {
-                await deliverInput(rt, input, isVerbose);
-            }
-            else {
-                await rt.start();
-            }
-            if (isCliRunCommandEnabled())
-                return;
-            await rt.awaitRunResult(workflowRunId);
+        await withSession(apiKey, isVerbose, pauseUiAround, async (sessionId) => {
+            const journalStore = createJournalStore();
+            const runtime = new Runtime({ journalStore });
+            const run = await runtime.getRun({ runId });
+            const job = fetchRegisteredJobs().get(run.workflowName);
+            if (!job)
+                throw new Error(`No registered job matches durable workflow "${run.workflowName}".`);
+            const workflow = __fetchRegisteredDurableWorkflow(job.name);
+            if (!workflow)
+                throw new Error(`No durable workflow was registered for job "${job.name}".`);
             if (isVerbose)
-                console.log(chalk.green(`  Run ${workflowRunId} completed`));
+                console.log(chalk.cyan(`  Resuming run ${runId}`));
+            const context = jobContext({ sessionId, runId, job, projectId: readProjectConfig()?.projectId });
+            const outcome = await runWithJobContext(context, async () => {
+                const suspension = await runtime.getSuspension({ runId });
+                if (input) {
+                    if (!suspension || suspension.request.name !== __inputRequestHook.name) {
+                        throw new Error(`No unresolved input wait with token "${input.token}" exists in run "${runId}".`);
+                    }
+                    const request = __inputRequestHook.request.safeParse(suspension.request.payload);
+                    if (!request.success || request.data.token !== input.token) {
+                        throw new Error(`No unresolved input wait with token "${input.token}" exists in run "${runId}".`);
+                    }
+                    const resolution = __inputRequestHook.resolution.parse(input.payload);
+                    return runtime.resumeHook(__inputRequestHook, { runId, workflow, waitId: suspension.waitId, resolution }).waitForOutcome();
+                }
+                return suspension?.request.name === "timer"
+                    ? runtime.resumeTimer(workflow, { runId, waitId: suspension.waitId }).waitForOutcome()
+                    : runtime.resume(workflow, { runId }).waitForOutcome();
+            });
+            await handleOutcome({ runId, outcome, apiKey });
+            if (isVerbose && outcome.status === "completed")
+                console.log(chalk.green(`  Run ${runId} completed`));
         });
     }
     catch (error) {
@@ -78,26 +93,55 @@ async function driveResume(runId, opts, input) {
             throw error;
         throw new CliError("run_resume_failed", `Run "${runId}" could not be resumed.`, { detail: formatErrorDetail(error) });
     }
-    finally {
-        if (!isCliRunCommandEnabled())
-            await closeDurableRuntime();
-    }
 }
-function resolveDataDir() {
-    return process.env.WORKFLOW_LOCAL_DATA_DIR ?? path.join(process.cwd(), ".terse", "data");
+function createJournalStore() {
+    return new FileJournalStore(resolveDataDirectory());
 }
-// Input resumes skip start(): resumeHook re-queues the run itself, and start()'s
-// crash-recovery wake would add a concurrent second replay.
-async function deliverInput(rt, input, isVerbose) {
-    try {
-        await rt.deliverInput(input.token, input.payload);
-        if (isVerbose)
-            console.log(chalk.cyan(`  Delivered input response to hook ${input.token}`));
+function resolveDataDirectory() {
+    return process.env.TERSE_JOURNAL_ROOT ?? path.join(process.cwd(), ".terse", "data");
+}
+function jobContext({ sessionId, runId, job, projectId }) {
+    return {
+        sessionId,
+        runId,
+        apiBaseUrl: BACKEND_URL,
+        jobName: job.name,
+        projectId
+    };
+}
+async function handleOutcome({ runId, outcome, apiKey }) {
+    if (outcome.status === "completed")
+        return;
+    if (outcome.status === "failed") {
+        const error = new Error(outcome.error.message);
+        error.name = outcome.error.name;
+        throw error;
     }
-    catch (error) {
-        // Stale token: recovery replay instead; the run re-parks on its real wait.
-        console.log(chalk.yellow(`  Could not deliver input response to hook ${input.token}: ${formatErrorDetail(error)}`));
-        await rt.start();
+    const body = suspendRequest({ runId, suspension: outcome.suspension });
+    await fetchWithAuth(ApiRoutes.SDK.SUSPEND, apiKey, body, "POST");
+}
+function suspendRequest({ runId, suspension }) {
+    const payload = suspension.request.payload;
+    if (suspension.request.name === "timer") {
+        if (typeof payload !== "object" || payload === null || Array.isArray(payload) || typeof payload.wakeAt !== "string") {
+            throw new Error("Timer suspension has an invalid wakeAt.");
+        }
+        return {
+            runId,
+            kind: "timer",
+            delaySeconds: Math.max(1, Math.ceil((Date.parse(payload.wakeAt) - Date.now()) / 1_000)),
+            idempotencyKey: suspension.waitId
+        };
+    }
+    if (suspension.request.name === __inputRequestHook.name) {
+        const input = __inputRequestHook.request.parse(payload);
+        return {
+            runId,
+            kind: "input",
+            hookToken: input.token,
+            idempotencyKey: suspension.waitId
+        };
     }
+    throw new Error(`Terse does not know how to park hook "${suspension.request.name}".`);
 }
 //# sourceMappingURL=durableJobRuntime.js.map