mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
jakevin
12d88e4b23
* refactor(runtime): unify command timeout into a single --timeout arg Drop the cli-level `timeoutSeconds` build-time ceiling field. A command now opts into runtime-enforced timeouts purely by declaring an arg named `timeout`; the user-facing `--timeout` value (its default or override) is the single authoritative knob, used both by the adapter polling loop and by the runtime ceiling (with a 30s padding for return + closeWindow + trace export). Behavior: - Browser commands without a `--timeout` arg fall back to OPENCLI_BROWSER_COMMAND_TIMEOUT (default 60s, unchanged). - Non-browser commands without a `--timeout` arg now run unbounded rather than against the previously implicit `timeoutSeconds` cap. Affected commands keep their old caps via newly added `--timeout` args. - LLM adapters (gemini/claude/deepseek/doubao/qwen/yuanbao ask) keep their current `--timeout` defaults; the runtime ceiling is now strictly more generous (userTimeout + 30s vs. the previous 180s cap), so `--timeout 600` actually buys 600s of polling rather than dying at 180s. Closes the design discussion that started from PR #1227, which proposed a per-site `OPENCLI_GEMINI_ASK_TIMEOUT` env var to work around the same underlying mismatch. * fix(timeout): wire --timeout arg into chatgpt/gemini image adapter polling codex-coder review on PR #1364 caught that the new --timeout arg I added to chatgpt/image and gemini/image only drove the runtime ceiling — the adapter still hardcoded `const timeout = 120`, so users passing --timeout 240/600 saw runtime allow 270s/630s but the adapter stop polling at 120s. That recreated the same single-knob mismatch this PR was meant to delete. Also add the browser-path runWithTimeout assertion codex-coder flagged as missing: a browser command with --timeout default=5 must call runWithTimeout with timeout: 35; a browser command without --timeout arg must fall back to DEFAULT_BROWSER_COMMAND_TIMEOUT. Image adapters now read kwargs.timeout and reject non-positive-integer values with ArgumentError (no silent fallback). chatgpt/image.test.js updated to pass an explicit timeout when calling .func directly (the test bypasses arg coercion). * fix(runtime): reject invalid timeout ceilings * fix(timeout): normalize timeout args to integer values * fix(timeout): preserve remaining command ceilings * fix(runtime): validate timeout before browser setup
55 lines
2.1 KiB
JavaScript
55 lines
2.1 KiB
JavaScript
import { cli, Strategy } from '@jackwener/opencli/registry';
|
|
import { selectorError, TimeoutError } from '@jackwener/opencli/errors';
|
|
import {
|
|
buildChatwiseInjectTextJs,
|
|
buildChatwiseMessageCountJs,
|
|
buildChatwiseResponseAfterJs,
|
|
requirePositiveTimeout,
|
|
} from './utils.js';
|
|
export const askCommand = cli({
|
|
site: 'chatwise',
|
|
name: 'ask',
|
|
access: 'write',
|
|
description: 'Send a prompt and wait for the AI response (send + wait + read)',
|
|
domain: 'localhost',
|
|
strategy: Strategy.UI,
|
|
browser: true,
|
|
args: [
|
|
{ name: 'text', required: true, positional: true, help: 'Prompt to send' },
|
|
{ name: 'timeout', type: 'int', required: false, help: 'Max seconds to wait (default: 30)', default: 30 },
|
|
],
|
|
columns: ['Role', 'Text'],
|
|
func: async (page, kwargs) => {
|
|
const text = kwargs.text;
|
|
const timeout = requirePositiveTimeout(kwargs.timeout);
|
|
// Snapshot content length
|
|
const beforeLen = await page.evaluate(buildChatwiseMessageCountJs());
|
|
// Send message
|
|
const injected = await page.evaluate(buildChatwiseInjectTextJs(text));
|
|
if (!injected)
|
|
throw selectorError('ChatWise input element');
|
|
await page.wait(0.5);
|
|
await page.pressKey('Enter');
|
|
// Poll for response
|
|
const pollInterval = 2;
|
|
const maxPolls = Math.ceil(timeout / pollInterval);
|
|
let response = '';
|
|
for (let i = 0; i < maxPolls; i++) {
|
|
await page.wait(pollInterval);
|
|
const result = await page.evaluate(buildChatwiseResponseAfterJs(beforeLen, text));
|
|
if (result) {
|
|
const next = String(result).trim();
|
|
if (next === response) break;
|
|
response = next;
|
|
}
|
|
}
|
|
if (!response) {
|
|
throw new TimeoutError('ChatWise response', timeout, 'Confirm ChatWise is done generating, then retry with a larger --timeout if needed.');
|
|
}
|
|
return [
|
|
{ Role: 'User', Text: text },
|
|
{ Role: 'Assistant', Text: response },
|
|
];
|
|
},
|
|
});
|