mirror of
https://github.com/jackwener/OpenCLI.git
synced 2026-09-14 18:25:42 +08:00
4fe9a73ebc
* refactor: migrate adapter imports to package exports Replace all relative imports (../../src/registry.js, ../../browser/cdp.js, etc.) with package exports (@jackwener/opencli/registry, @jackwener/opencli/errors, etc.) across all 484 adapter files. This decouples adapter import resolution from directory structure: - User CLIs in ~/.opencli/clis/ resolve via node_modules symlink - Internal adapters resolve via Node.js self-referencing - No more shim files needed for import resolution Changes: - package.json: add sub-path exports for all public modules - clis/**: replace relative imports with @jackwener/opencli/... - discovery.ts: simplify ensureUserCliCompatShims to symlink-only - registry-api.ts: export CommandArgs type - Remove root-level shim directories (browser/, download/, pipeline/) - Remove shim entries from tsconfig.json include and package.json files * test: add regression tests for package exports Prevents regressions like #788/#791 by: 1. Scanning all adapter files for forbidden relative imports (../../src/, ../../browser/, etc.) — fails if any remain 2. Verifying every package.json export maps to an existing source file 18 new test cases. * fix: use junction on Windows + broaden test patterns - discovery.ts: use 'junction' symlink type on Windows (no admin required) - package-exports.test.ts: generalize forbidden patterns to catch any depth of ../ traversal (not just ../../ and ../../../) * fix: update stale vi.mock/importActual paths in adapter tests Test files still used old relative paths for vi.mock() and vi.importActual() calls. Updated 5 test files to use package exports. Also broadened regression test patterns to catch mock/importActual paths. * fix: use rm instead of unlink for symlink cleanup, add warn on failure Addresses review feedback from Astro-Han: - rm() handles both symlinks and stale directories (unlink fails on dirs) - Log a warning when symlink creation fails instead of silent catch * docs: update import examples to use package exports Update all documentation, contributing guides, and skills to use @jackwener/opencli/registry instead of ../../src/registry.js. Without this, users following the docs would write adapters with broken imports since the old shim files are no longer created.
96 lines
3.4 KiB
TypeScript
96 lines
3.4 KiB
TypeScript
import { execSync, spawnSync } from 'node:child_process';
|
|
import { cli, Strategy } from '@jackwener/opencli/registry';
|
|
import { ConfigError } from '@jackwener/opencli/errors';
|
|
import type { IPage } from '@jackwener/opencli/types';
|
|
import { activateChatGPT, getVisibleChatMessages, selectModel, MODEL_CHOICES, isGenerating } from './ax.js';
|
|
|
|
export const askCommand = cli({
|
|
site: 'chatgpt',
|
|
name: 'ask',
|
|
description: 'Send a prompt and wait for the AI response (send + wait + read)',
|
|
domain: 'localhost',
|
|
strategy: Strategy.PUBLIC,
|
|
browser: false,
|
|
args: [
|
|
{ name: 'text', required: true, positional: true, help: 'Prompt to send' },
|
|
{ name: 'model', required: false, help: 'Model/mode to use: auto, instant, thinking, 5.2-instant, 5.2-thinking', choices: MODEL_CHOICES },
|
|
{ name: 'timeout', required: false, help: 'Max seconds to wait for response (default: 30)', default: '30' },
|
|
],
|
|
columns: ['Role', 'Text'],
|
|
func: async (page: IPage | null, kwargs: any) => {
|
|
if (process.platform !== 'darwin') {
|
|
throw new ConfigError('ChatGPT Desktop integration requires macOS (osascript is not available on this platform)');
|
|
}
|
|
|
|
const text = kwargs.text as string;
|
|
const model = kwargs.model as string | undefined;
|
|
const timeout = parseInt(kwargs.timeout as string, 10) || 30;
|
|
|
|
// Switch model before sending if requested
|
|
if (model) {
|
|
activateChatGPT();
|
|
selectModel(model);
|
|
}
|
|
|
|
// Backup clipboard
|
|
let clipBackup = '';
|
|
try { clipBackup = execSync('pbpaste', { encoding: 'utf-8' }); } catch {}
|
|
const messagesBefore = getVisibleChatMessages();
|
|
|
|
// Send the message
|
|
spawnSync('pbcopy', { input: text });
|
|
activateChatGPT();
|
|
|
|
const cmd = "osascript " +
|
|
"-e 'tell application \"System Events\"' " +
|
|
"-e 'keystroke \"v\" using command down' " +
|
|
"-e 'delay 0.2' " +
|
|
"-e 'keystroke return' " +
|
|
"-e 'end tell'";
|
|
execSync(cmd);
|
|
|
|
// Restore clipboard after the prompt is sent.
|
|
if (clipBackup) spawnSync('pbcopy', { input: clipBackup });
|
|
|
|
// Wait for response: poll until ChatGPT stops generating ("Stop generating" button disappears),
|
|
// then read the final response text.
|
|
const pollInterval = 2;
|
|
const maxPolls = Math.ceil(timeout / pollInterval);
|
|
let response = '';
|
|
let generationStarted = false;
|
|
|
|
for (let i = 0; i < maxPolls; i++) {
|
|
execSync(`sleep ${pollInterval}`);
|
|
const generating = isGenerating();
|
|
if (generating) {
|
|
generationStarted = true;
|
|
continue;
|
|
}
|
|
// Generation finished (or never started yet)
|
|
if (!generationStarted && i < 3) continue; // give it a moment to start
|
|
|
|
// Read final response
|
|
activateChatGPT(0.3);
|
|
const messagesNow = getVisibleChatMessages();
|
|
if (messagesNow.length > messagesBefore.length) {
|
|
const newMessages = messagesNow.slice(messagesBefore.length);
|
|
const candidate = [...newMessages].reverse().find((message) => message !== text);
|
|
if (candidate) response = candidate;
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (!response) {
|
|
return [
|
|
{ Role: 'User', Text: text },
|
|
{ Role: 'System', Text: `No response within ${timeout}s. ChatGPT may still be generating.` },
|
|
];
|
|
}
|
|
|
|
return [
|
|
{ Role: 'User', Text: text },
|
|
{ Role: 'Assistant', Text: response },
|
|
];
|
|
},
|
|
});
|