fix: trim cron model overrides and doc guidance (#711) (thanks @mjrussell)
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
### Changes
|
### Changes
|
||||||
- macOS: prompt to install the global `clawdbot` CLI when missing in local mode; install via `clawd.bot/install-cli.sh` (no onboarding) and use external launchd/CLI instead of the embedded gateway runtime.
|
- macOS: prompt to install the global `clawdbot` CLI when missing in local mode; install via `clawd.bot/install-cli.sh` (no onboarding) and use external launchd/CLI instead of the embedded gateway runtime.
|
||||||
- Docs: add gog calendar event color IDs from `gog calendar colors`. (#715) — thanks @mjrussell.
|
- Docs: add gog calendar event color IDs from `gog calendar colors`. (#715) — thanks @mjrussell.
|
||||||
|
- Cron/CLI: trim model overrides on cron edits and document main-session guidance. (#711) — thanks @mjrussell.
|
||||||
|
|
||||||
## 2026.1.10
|
## 2026.1.10
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,10 @@ Isolated jobs (`agentTurn`) can override the model and thinking level:
|
|||||||
- `model`: Provider/model string (e.g., `anthropic/claude-sonnet-4-20250514`) or alias (e.g., `opus`)
|
- `model`: Provider/model string (e.g., `anthropic/claude-sonnet-4-20250514`) or alias (e.g., `opus`)
|
||||||
- `thinking`: Thinking level (`off`, `minimal`, `low`, `medium`, `high`)
|
- `thinking`: Thinking level (`off`, `minimal`, `low`, `medium`, `high`)
|
||||||
|
|
||||||
|
Note: You can set `model` on main-session jobs too, but it changes the shared main
|
||||||
|
session model. We recommend model overrides only for isolated jobs to avoid
|
||||||
|
unexpected context shifts.
|
||||||
|
|
||||||
Resolution priority:
|
Resolution priority:
|
||||||
1. Job payload override (highest)
|
1. Job payload override (highest)
|
||||||
2. Hook-specific defaults (e.g., `hooks.gmail.model`)
|
2. Hook-specific defaults (e.g., `hooks.gmail.model`)
|
||||||
|
|||||||
110
src/cli/cron-cli.test.ts
Normal file
110
src/cli/cron-cli.test.ts
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
import { Command } from "commander";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
const callGatewayFromCli = vi.fn(
|
||||||
|
async (method: string, _opts: unknown, params?: unknown) => {
|
||||||
|
if (method === "cron.status") return { enabled: true };
|
||||||
|
return { ok: true, params };
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
vi.mock("./gateway-rpc.js", async () => {
|
||||||
|
const actual =
|
||||||
|
await vi.importActual<typeof import("./gateway-rpc.js")>(
|
||||||
|
"./gateway-rpc.js",
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
...actual,
|
||||||
|
callGatewayFromCli: (
|
||||||
|
method: string,
|
||||||
|
opts: unknown,
|
||||||
|
params?: unknown,
|
||||||
|
extra?: unknown,
|
||||||
|
) => callGatewayFromCli(method, opts, params, extra),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
vi.mock("../runtime.js", () => ({
|
||||||
|
defaultRuntime: {
|
||||||
|
log: vi.fn(),
|
||||||
|
error: vi.fn(),
|
||||||
|
exit: (code: number) => {
|
||||||
|
throw new Error(`__exit__:${code}`);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe("cron cli", () => {
|
||||||
|
it("trims model and thinking on cron add", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
await program.parseAsync(
|
||||||
|
[
|
||||||
|
"cron",
|
||||||
|
"add",
|
||||||
|
"--name",
|
||||||
|
"Daily",
|
||||||
|
"--cron",
|
||||||
|
"* * * * *",
|
||||||
|
"--session",
|
||||||
|
"isolated",
|
||||||
|
"--message",
|
||||||
|
"hello",
|
||||||
|
"--model",
|
||||||
|
" opus ",
|
||||||
|
"--thinking",
|
||||||
|
" low ",
|
||||||
|
],
|
||||||
|
{ from: "user" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const addCall = callGatewayFromCli.mock.calls.find(
|
||||||
|
(call) => call[0] === "cron.add",
|
||||||
|
);
|
||||||
|
const params = addCall?.[2] as {
|
||||||
|
payload?: { model?: string; thinking?: string };
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(params?.payload?.model).toBe("opus");
|
||||||
|
expect(params?.payload?.thinking).toBe("low");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("omits empty model and thinking on cron edit", async () => {
|
||||||
|
callGatewayFromCli.mockClear();
|
||||||
|
|
||||||
|
const { registerCronCli } = await import("./cron-cli.js");
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride();
|
||||||
|
registerCronCli(program);
|
||||||
|
|
||||||
|
await program.parseAsync(
|
||||||
|
[
|
||||||
|
"cron",
|
||||||
|
"edit",
|
||||||
|
"job-1",
|
||||||
|
"--message",
|
||||||
|
"hello",
|
||||||
|
"--model",
|
||||||
|
" ",
|
||||||
|
"--thinking",
|
||||||
|
" ",
|
||||||
|
],
|
||||||
|
{ from: "user" },
|
||||||
|
);
|
||||||
|
|
||||||
|
const updateCall = callGatewayFromCli.mock.calls.find(
|
||||||
|
(call) => call[0] === "cron.update",
|
||||||
|
);
|
||||||
|
const patch = updateCall?.[2] as {
|
||||||
|
patch?: { payload?: { model?: string; thinking?: string } };
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(patch?.patch?.payload?.model).toBeUndefined();
|
||||||
|
expect(patch?.patch?.payload?.thinking).toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -646,15 +646,22 @@ export function registerCronCli(program: Command) {
|
|||||||
text: String(opts.systemEvent),
|
text: String(opts.systemEvent),
|
||||||
};
|
};
|
||||||
} else if (opts.message) {
|
} else if (opts.message) {
|
||||||
|
const model =
|
||||||
|
typeof opts.model === "string" && opts.model.trim()
|
||||||
|
? opts.model.trim()
|
||||||
|
: undefined;
|
||||||
|
const thinking =
|
||||||
|
typeof opts.thinking === "string" && opts.thinking.trim()
|
||||||
|
? opts.thinking.trim()
|
||||||
|
: undefined;
|
||||||
const timeoutSeconds = opts.timeoutSeconds
|
const timeoutSeconds = opts.timeoutSeconds
|
||||||
? Number.parseInt(String(opts.timeoutSeconds), 10)
|
? Number.parseInt(String(opts.timeoutSeconds), 10)
|
||||||
: undefined;
|
: undefined;
|
||||||
patch.payload = {
|
patch.payload = {
|
||||||
kind: "agentTurn",
|
kind: "agentTurn",
|
||||||
message: String(opts.message),
|
message: String(opts.message),
|
||||||
model: typeof opts.model === "string" ? opts.model : undefined,
|
model,
|
||||||
thinking:
|
thinking,
|
||||||
typeof opts.thinking === "string" ? opts.thinking : undefined,
|
|
||||||
timeoutSeconds:
|
timeoutSeconds:
|
||||||
timeoutSeconds && Number.isFinite(timeoutSeconds)
|
timeoutSeconds && Number.isFinite(timeoutSeconds)
|
||||||
? timeoutSeconds
|
? timeoutSeconds
|
||||||
|
|||||||
Reference in New Issue
Block a user