mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
80eef46b4e
* refactor: move adapters from src/clis/ to root clis/ for monorepo separation Separates CLI adapters from the core runtime to prepare for independent adapter distribution via postinstall fetch. Key changes: - Move src/clis/ → clis/ (adapters at repo root) - Change tsconfig rootDir from "src" to "." so tsc compiles both - Create root-level shim files (registry.ts, errors.ts, etc.) so adapter relative imports (../../registry.js) resolve correctly - Update build-manifest.ts, main.ts paths for new dist/src/ structure - Expand ensureUserCliCompatShims() to cover all adapter import targets (types, utils, logger, launcher, browser/*, download/*, pipeline/*) - Add scripts/fetch-adapters.js postinstall for ~/.opencli/clis/ sync - Update vitest.config.ts adapter test paths - Add package.json files field to exclude adapters from npm package Official adapter files are unconditionally overwritten on update; user-created files not in the manifest are preserved. * fix: add dist/clis/ and cli-manifest.json to npm files, harden fetch-adapters - Add dist/clis/ and dist/cli-manifest.json to package.json files field so built-in adapters and manifest ship with the npm package - Replace execSync with execFileSync to prevent command injection - Add version check to skip redundant adapter fetches - Track tmpRoot explicitly for reliable cleanup * fix: address review blockers — manifest-based updates, global-only fetch, first-run fallback 1. Manifest-based update strategy: - Read old manifest to identify previously-official files - Clean up files removed upstream (in old manifest but not new) - User-created files (never in any manifest) remain untouched 2. Only run fetch-adapters on global install (npm_config_global=true) or explicit OPENCLI_FETCH=1, preventing heavy side effects for local/dev installs 3. First-run fallback in discovery.ts: - ensureUserAdapters() checks for adapter-manifest.json - If missing and ~/.opencli/clis/ is empty, spawns fetch-adapters.js - Guarantees adapters are available even with --ignore-scripts * fix: remove OPENCLI_FETCH env var, use internal _OPENCLI_FIRST_RUN instead * feat: also support OPENCLI_FETCH=1 for explicit adapter fetch trigger * simplify: replace git clone with local copy from dist/clis/ Adapters already ship in the npm package (dist/clis/), so there's no need to clone from GitHub. Copy directly from the installed package: - Eliminates git, curl, tar dependencies - No network calls in postinstall - No timeout/offline issues - Version always matches the installed CLI - ~65 lines of clone/download code replaced by one cpSync loop
81 lines
2.6 KiB
TypeScript
81 lines
2.6 KiB
TypeScript
import { cli, Strategy } from '../../registry.js';
|
|
import { SelectorError } from '../../errors.js';
|
|
import type { IPage } from '../../types.js';
|
|
|
|
export const askCommand = cli({
|
|
site: 'codex',
|
|
name: 'ask',
|
|
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', required: false, help: 'Max seconds to wait for response (default: 60)', default: '60' },
|
|
],
|
|
columns: ['Role', 'Text'],
|
|
func: async (page: IPage, kwargs: any) => {
|
|
const text = kwargs.text as string;
|
|
const timeout = parseInt(kwargs.timeout as string, 10) || 60;
|
|
|
|
// Snapshot the current content length before sending
|
|
const beforeLen = await page.evaluate(`
|
|
(function() {
|
|
const turns = document.querySelectorAll('[data-content-search-turn-key]');
|
|
return turns.length;
|
|
})()
|
|
`);
|
|
|
|
// Inject and send
|
|
const injected = await page.evaluate(`
|
|
(function(text) {
|
|
const editables = Array.from(document.querySelectorAll('[contenteditable="true"]'));
|
|
const composer = editables.length > 0 ? editables[editables.length - 1] : document.querySelector('textarea');
|
|
if (!composer) return false;
|
|
composer.focus();
|
|
document.execCommand('insertText', false, text);
|
|
return true;
|
|
})(${JSON.stringify(text)})
|
|
`);
|
|
if (!injected) throw new SelectorError('Codex input element');
|
|
await page.wait(0.5);
|
|
await page.pressKey('Enter');
|
|
|
|
// Poll for new content
|
|
const pollInterval = 3;
|
|
const maxPolls = Math.ceil(timeout / pollInterval);
|
|
let response = '';
|
|
|
|
for (let i = 0; i < maxPolls; i++) {
|
|
await page.wait(pollInterval);
|
|
|
|
const result = await page.evaluate(`
|
|
(function(prevLen) {
|
|
const turns = document.querySelectorAll('[data-content-search-turn-key]');
|
|
if (turns.length <= prevLen) return null;
|
|
const lastTurn = turns[turns.length - 1];
|
|
const text = lastTurn.innerText || lastTurn.textContent;
|
|
return text ? text.trim() : null;
|
|
})(${beforeLen})
|
|
`);
|
|
|
|
if (result) {
|
|
response = result;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!response) {
|
|
return [
|
|
{ Role: 'User', Text: text },
|
|
{ Role: 'System', Text: `No response within ${timeout}s. The agent may still be working.` },
|
|
];
|
|
}
|
|
|
|
return [
|
|
{ Role: 'User', Text: text },
|
|
{ Role: 'Assistant', Text: response },
|
|
];
|
|
},
|
|
});
|