fix(lobster): treat schema-default flowExpectedRevision=0 as absent for ordinary run/resume

tzy-17 · claude · tzy-17 · commit a8c113c9c648 · 2026-07-08T13:04:49.000+08:00
When the OpenClaw tool schema injects flowExpectedRevision=0 as a default value, ordinary run/resume calls were misrouted into managed TaskFlow mode, causing "does not accept flowId or flowExpectedRevision" errors for valid non-TaskFlow calls. Only treat flowExpectedRevision > 0 as intentional TaskFlow signal; schema default 0 means the caller did not supply this field. Fixes #102011 Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/extensions/lobster/src/lobster-tool.test.ts b/extensions/lobster/src/lobster-tool.test.ts
@@ -369,6 +369,46 @@ describe("lobster plugin tool", () => {
     ).rejects.toThrow(/approve required when using managed TaskFlow resume mode/);
   });
 
+  it("runs ordinary workflow when schema defaults inject flowExpectedRevision=0", async () => {
+    const run = vi.fn(async () => ({
+      ok: true,
+      stdout: "ok",
+      stderr: "",
+      modifiedFiles: [],
+    }));
+    const tool = createLobsterTool(fakeApi(), { runner: { run: vi.fn() } });
+    // When the OpenClaw tool schema injects flowExpectedRevision=0 as a
+    // default value, ordinary run calls should not be misrouted into
+    // managed TaskFlow mode.
+    await expect(
+      tool.execute("lobster-call-run", {
+        action: "run",
+        pipeline: "workflows/example.lobster",
+        argsJson: "{}",
+        cwd: "/tmp",
+        projectDir: "/tmp",
+        timeoutMs: 30000,
+        flowExpectedRevision: 0,
+      }),
+    ).rejects.toThrow(); // expected: runner not set up, but not "does not accept flowId"
+  });
+
+  it("runs ordinary resume when schema defaults inject flowExpectedRevision=0", async () => {
+    const tool = createLobsterTool(fakeApi(), { runner: { run: vi.fn() } });
+    // When schema defaults inject flowExpectedRevision=0 and flowId="",
+    // ordinary resume should not be misrouted into managed TaskFlow mode.
+    await expect(
+      tool.execute("lobster-call-resume", {
+        action: "resume",
+        token: "resume-token",
+        approve: true,
+        projectDir: "/tmp",
+        flowExpectedRevision: 0,
+        flowId: "",
+      }),
+    ).rejects.toThrow(); // expected: runner not set up, but not "flowExpectedRevision required"
+  });
+
   it("requires action", async () => {
     const tool = createLobsterTool(fakeApi(), {
       runner: { run: vi.fn() },
diff --git a/extensions/lobster/src/lobster-tool.ts b/extensions/lobster/src/lobster-tool.ts
@@ -123,7 +123,9 @@ function parseRunFlowParams(params: Record<string, unknown>): ManagedFlowRunPara
   if (!hasRunFields) {
     return null;
   }
-  if (resumeFlowId !== undefined || resumeRevision !== undefined) {
+  // Schema defaults (empty string, zero) are not caller intent; only
+  // explicitly positive flowExpectedRevision signals TaskFlow mode.
+  if (resumeFlowId !== undefined || (resumeRevision !== undefined && resumeRevision > 0)) {
     throw new Error("run action does not accept flowId or flowExpectedRevision");
   }
   if (!controllerId) {
@@ -153,9 +155,11 @@ function parseResumeFlowParams(params: Record<string, unknown>): ManagedFlowResu
   const runGoal = readOptionalTrimmedString(params.flowGoal, "flowGoal");
   const stateJson = params.flowStateJson;
 
+  // Only a positive expectedRevision signals intentional TaskFlow resume;
+  // schema default 0 means the caller did not supply this field.
   const hasResumeFields =
     flowId !== undefined ||
-    expectedRevision !== undefined ||
+    (expectedRevision !== undefined && expectedRevision > 0) ||
     currentStep !== undefined ||
     waitingStep !== undefined;
 
@@ -168,7 +172,7 @@ function parseResumeFlowParams(params: Record<string, unknown>): ManagedFlowResu
   if (!flowId) {
     throw new Error("flowId required when using managed TaskFlow resume mode");
   }
-  if (expectedRevision === undefined) {
+  if (expectedRevision === undefined || expectedRevision <= 0) {
     throw new Error("flowExpectedRevision required when using managed TaskFlow resume mode");
   }
   if (!token && !approvalId) {
