@pixelbyte-software/pixcode 1.33.1 → 1.33.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{index-ii4JVCNw.js → index-BrB-LHeY.js} +173 -173
- package/dist/assets/index-cWbTlXsr.css +32 -0
- package/dist/icons/opencode-logo-dark.svg +1 -0
- package/dist/icons/opencode-logo-light.svg +1 -0
- package/dist/icons/qwen-logo.svg +15 -0
- package/dist/index.html +2 -2
- package/dist-server/server/index.js +22 -3
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/opencode-cli.js +360 -0
- package/dist-server/server/opencode-cli.js.map +1 -0
- package/dist-server/server/opencode-response-handler.js +95 -0
- package/dist-server/server/opencode-response-handler.js.map +1 -0
- package/package.json +1 -1
- package/server/index.js +18 -2
- package/server/opencode-cli.js +403 -0
- package/server/opencode-response-handler.js +92 -0
- package/dist/assets/index-Byb8Wnts.css +0 -32
|
@@ -0,0 +1,360 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OpenCode CLI adapter.
|
|
3
|
+
*
|
|
4
|
+
* OpenCode (https://opencode.ai, npm package: `opencode-ai`, binary: `opencode`)
|
|
5
|
+
* is a multi-provider terminal coding agent. Unlike Claude/Codex/Gemini/Qwen it
|
|
6
|
+
* uses XDG paths (`~/.config/opencode/` for config, `~/.local/share/opencode/`
|
|
7
|
+
* for data) on Linux/macOS/Windows alike — the literal `~/.config` and
|
|
8
|
+
* `~/.local/share` folders under the user profile, NOT %APPDATA% on Windows.
|
|
9
|
+
*
|
|
10
|
+
* Headless invocation:
|
|
11
|
+
* opencode run \
|
|
12
|
+
* --agent <build|plan> # build (default) or plan (read-only) mode
|
|
13
|
+
* --model <provider/model> # e.g. anthropic/claude-sonnet-4-5
|
|
14
|
+
* --format json # NDJSON event stream
|
|
15
|
+
* [-s <id>] # resume a session by id
|
|
16
|
+
* [--dangerously-skip-permissions]
|
|
17
|
+
* -- "<prompt>"
|
|
18
|
+
*
|
|
19
|
+
* Mirrors the structure of qwen-code-cli.js so the dispatch path in
|
|
20
|
+
* server/index.js is uniform across all five spawn-based providers.
|
|
21
|
+
*/
|
|
22
|
+
import { spawn } from 'child_process';
|
|
23
|
+
import crossSpawn from 'cross-spawn';
|
|
24
|
+
import { promises as fs } from 'fs';
|
|
25
|
+
import path from 'path';
|
|
26
|
+
import os from 'os';
|
|
27
|
+
import sessionManager from './sessionManager.js';
|
|
28
|
+
import OpencodeResponseHandler from './opencode-response-handler.js';
|
|
29
|
+
import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js';
|
|
30
|
+
import { buildSpawnEnv } from './services/provider-credentials.js';
|
|
31
|
+
import { providerAuthService } from './modules/providers/services/provider-auth.service.js';
|
|
32
|
+
import { createNormalizedMessage } from './shared/utils.js';
|
|
33
|
+
// `opencode.cmd` shim on Windows — cross-spawn handles the .cmd resolution.
|
|
34
|
+
const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn;
|
|
35
|
+
const activeOpencodeProcesses = new Map();
|
|
36
|
+
function mapPermissionModeToArgs(permissionMode, skipPermissions) {
|
|
37
|
+
// OpenCode's permission model is per-tool/per-pattern (see opencode.json
|
|
38
|
+
// "permission" key). For chat-message routing we only need the high-level
|
|
39
|
+
// toggle: build (normal) vs plan (read-only) vs skip-everything.
|
|
40
|
+
if (skipPermissions || permissionMode === 'bypassPermissions' || permissionMode === 'acceptEdits') {
|
|
41
|
+
return { agent: 'build', dangerously: true };
|
|
42
|
+
}
|
|
43
|
+
if (permissionMode === 'plan') {
|
|
44
|
+
return { agent: 'plan', dangerously: false };
|
|
45
|
+
}
|
|
46
|
+
return { agent: 'build', dangerously: false };
|
|
47
|
+
}
|
|
48
|
+
async function spawnOpencode(command, options = {}, ws) {
|
|
49
|
+
const { sessionId, projectPath, cwd, toolsSettings, permissionMode, images, sessionSummary, agent: agentOverride } = options;
|
|
50
|
+
let capturedSessionId = sessionId;
|
|
51
|
+
let sessionCreatedSent = false;
|
|
52
|
+
let assistantBlocks = [];
|
|
53
|
+
const settings = toolsSettings || { allowedTools: [], disallowedTools: [], skipPermissions: false };
|
|
54
|
+
const safeSessionIdPattern = /^[a-zA-Z0-9_.\-:]+$/;
|
|
55
|
+
const args = ['run', '--format', 'json'];
|
|
56
|
+
const { agent, dangerously } = mapPermissionModeToArgs(permissionMode, settings.skipPermissions || options.skipPermissions);
|
|
57
|
+
const effectiveAgent = agentOverride || agent;
|
|
58
|
+
if (effectiveAgent) {
|
|
59
|
+
args.push('--agent', effectiveAgent);
|
|
60
|
+
}
|
|
61
|
+
if (dangerously) {
|
|
62
|
+
args.push('--dangerously-skip-permissions');
|
|
63
|
+
}
|
|
64
|
+
if (sessionId) {
|
|
65
|
+
const session = sessionManager.getSession(sessionId);
|
|
66
|
+
const cliId = session?.cliSessionId || sessionId;
|
|
67
|
+
if (cliId && safeSessionIdPattern.test(cliId)) {
|
|
68
|
+
args.push('-s', cliId);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
const modelToUse = options.model;
|
|
72
|
+
if (modelToUse) {
|
|
73
|
+
args.push('--model', modelToUse);
|
|
74
|
+
}
|
|
75
|
+
const cleanPath = (cwd || projectPath || process.cwd()).replace(/[^\x20-\x7E]/g, '').trim();
|
|
76
|
+
const workingDir = cleanPath;
|
|
77
|
+
// Image attachments: OpenCode accepts repeated `-f <path>` flags. We dump
|
|
78
|
+
// base64 attachments to a tmp dir under the project root and pass each path.
|
|
79
|
+
const tempImagePaths = [];
|
|
80
|
+
let tempDir = null;
|
|
81
|
+
if (images && images.length > 0) {
|
|
82
|
+
try {
|
|
83
|
+
tempDir = path.join(workingDir, '.tmp', 'opencode-images', Date.now().toString());
|
|
84
|
+
await fs.mkdir(tempDir, { recursive: true });
|
|
85
|
+
for (const [index, image] of images.entries()) {
|
|
86
|
+
const matches = image.data.match(/^data:([^;]+);base64,(.+)$/);
|
|
87
|
+
if (!matches)
|
|
88
|
+
continue;
|
|
89
|
+
const [, mimeType, base64Data] = matches;
|
|
90
|
+
const extension = mimeType.split('/')[1] || 'png';
|
|
91
|
+
const filename = `image_${index}.${extension}`;
|
|
92
|
+
const filepath = path.join(tempDir, filename);
|
|
93
|
+
await fs.writeFile(filepath, Buffer.from(base64Data, 'base64'));
|
|
94
|
+
tempImagePaths.push(filepath);
|
|
95
|
+
args.push('-f', filepath);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
catch (error) {
|
|
99
|
+
console.error('Error processing images for OpenCode:', error);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
// Prompt is the trailing positional. Use `--` to be safe against prompts
|
|
103
|
+
// that start with a `-`.
|
|
104
|
+
if (command && command.trim()) {
|
|
105
|
+
args.push('--', command);
|
|
106
|
+
}
|
|
107
|
+
// OPENCODE_CLI_PATH is exported by primeCliBinPath() during boot. Falls
|
|
108
|
+
// back to the bare binary name (resolved via PATH) when unset.
|
|
109
|
+
const opencodePath = process.env.OPENCODE_CLI_PATH || 'opencode';
|
|
110
|
+
console.log('Spawning OpenCode CLI:', opencodePath, args.join(' '));
|
|
111
|
+
console.log('Working directory:', workingDir);
|
|
112
|
+
let spawnCmd = opencodePath;
|
|
113
|
+
let spawnArgs = args;
|
|
114
|
+
if (os.platform() !== 'win32') {
|
|
115
|
+
// Force `exec` so the child replaces the wrapper shell — keeps SIGTERM
|
|
116
|
+
// delivery clean when we abort the session. Same trick as qwen-cli.
|
|
117
|
+
spawnCmd = 'sh';
|
|
118
|
+
spawnArgs = ['-c', 'exec "$0" "$@"', opencodePath, ...args];
|
|
119
|
+
}
|
|
120
|
+
const spawnEnv = await buildSpawnEnv('opencode');
|
|
121
|
+
return new Promise((resolve, reject) => {
|
|
122
|
+
const opencodeProcess = spawnFunction(spawnCmd, spawnArgs, {
|
|
123
|
+
cwd: workingDir,
|
|
124
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
125
|
+
env: spawnEnv,
|
|
126
|
+
});
|
|
127
|
+
let terminalNotificationSent = false;
|
|
128
|
+
let terminalFailureReason = null;
|
|
129
|
+
const notifyTerminalState = ({ code = null, error = null } = {}) => {
|
|
130
|
+
if (terminalNotificationSent)
|
|
131
|
+
return;
|
|
132
|
+
terminalNotificationSent = true;
|
|
133
|
+
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
134
|
+
if (code === 0 && !error) {
|
|
135
|
+
notifyRunStopped({
|
|
136
|
+
userId: ws?.userId || null,
|
|
137
|
+
provider: 'opencode',
|
|
138
|
+
sessionId: finalSessionId,
|
|
139
|
+
sessionName: sessionSummary,
|
|
140
|
+
stopReason: 'completed',
|
|
141
|
+
});
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
notifyRunFailed({
|
|
145
|
+
userId: ws?.userId || null,
|
|
146
|
+
provider: 'opencode',
|
|
147
|
+
sessionId: finalSessionId,
|
|
148
|
+
sessionName: sessionSummary,
|
|
149
|
+
error: error || terminalFailureReason || `OpenCode CLI exited with code ${code}`,
|
|
150
|
+
});
|
|
151
|
+
};
|
|
152
|
+
opencodeProcess.tempImagePaths = tempImagePaths;
|
|
153
|
+
opencodeProcess.tempDir = tempDir;
|
|
154
|
+
const processKey = capturedSessionId || sessionId || `opencode_${Date.now()}`;
|
|
155
|
+
activeOpencodeProcesses.set(processKey, opencodeProcess);
|
|
156
|
+
opencodeProcess.sessionId = processKey;
|
|
157
|
+
opencodeProcess.stdin.end();
|
|
158
|
+
const timeoutMs = 120000;
|
|
159
|
+
let timeout;
|
|
160
|
+
const startTimeout = () => {
|
|
161
|
+
if (timeout)
|
|
162
|
+
clearTimeout(timeout);
|
|
163
|
+
timeout = setTimeout(() => {
|
|
164
|
+
const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId || processKey);
|
|
165
|
+
terminalFailureReason = `OpenCode CLI timeout - no response received for ${timeoutMs / 1000} seconds`;
|
|
166
|
+
ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'opencode' }));
|
|
167
|
+
try {
|
|
168
|
+
opencodeProcess.kill('SIGTERM');
|
|
169
|
+
}
|
|
170
|
+
catch { /* noop */ }
|
|
171
|
+
}, timeoutMs);
|
|
172
|
+
};
|
|
173
|
+
startTimeout();
|
|
174
|
+
if (command && capturedSessionId) {
|
|
175
|
+
sessionManager.addMessage(capturedSessionId, 'user', command);
|
|
176
|
+
}
|
|
177
|
+
let responseHandler;
|
|
178
|
+
if (ws) {
|
|
179
|
+
responseHandler = new OpencodeResponseHandler(ws, {
|
|
180
|
+
onContentFragment: (content) => {
|
|
181
|
+
if (assistantBlocks.length > 0 && assistantBlocks[assistantBlocks.length - 1].type === 'text') {
|
|
182
|
+
assistantBlocks[assistantBlocks.length - 1].text += content;
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
assistantBlocks.push({ type: 'text', text: content });
|
|
186
|
+
}
|
|
187
|
+
},
|
|
188
|
+
onToolUse: (event) => {
|
|
189
|
+
assistantBlocks.push({
|
|
190
|
+
type: 'tool_use',
|
|
191
|
+
id: event.tool_id,
|
|
192
|
+
name: event.tool_name,
|
|
193
|
+
input: event.parameters,
|
|
194
|
+
});
|
|
195
|
+
},
|
|
196
|
+
onToolResult: (event) => {
|
|
197
|
+
if (capturedSessionId) {
|
|
198
|
+
if (assistantBlocks.length > 0) {
|
|
199
|
+
sessionManager.addMessage(capturedSessionId, 'assistant', [...assistantBlocks]);
|
|
200
|
+
assistantBlocks = [];
|
|
201
|
+
}
|
|
202
|
+
sessionManager.addMessage(capturedSessionId, 'user', [{
|
|
203
|
+
type: 'tool_result',
|
|
204
|
+
tool_use_id: event.tool_id,
|
|
205
|
+
content: event.output === undefined ? null : event.output,
|
|
206
|
+
is_error: event.status === 'error',
|
|
207
|
+
}]);
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
onInit: (event) => {
|
|
211
|
+
if (capturedSessionId) {
|
|
212
|
+
const sess = sessionManager.getSession(capturedSessionId);
|
|
213
|
+
if (sess && !sess.cliSessionId) {
|
|
214
|
+
sess.cliSessionId = event.session_id;
|
|
215
|
+
sessionManager.saveSession(capturedSessionId);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
},
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
opencodeProcess.stdout.on('data', (data) => {
|
|
222
|
+
const rawOutput = data.toString();
|
|
223
|
+
startTimeout();
|
|
224
|
+
if (!sessionId && !sessionCreatedSent && !capturedSessionId) {
|
|
225
|
+
capturedSessionId = `opencode_${Date.now()}`;
|
|
226
|
+
sessionCreatedSent = true;
|
|
227
|
+
sessionManager.createSession(capturedSessionId, cwd || process.cwd());
|
|
228
|
+
if (command) {
|
|
229
|
+
sessionManager.addMessage(capturedSessionId, 'user', command);
|
|
230
|
+
}
|
|
231
|
+
if (processKey !== capturedSessionId) {
|
|
232
|
+
activeOpencodeProcesses.delete(processKey);
|
|
233
|
+
activeOpencodeProcesses.set(capturedSessionId, opencodeProcess);
|
|
234
|
+
}
|
|
235
|
+
ws.setSessionId && typeof ws.setSessionId === 'function' && ws.setSessionId(capturedSessionId);
|
|
236
|
+
ws.send(createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'opencode' }));
|
|
237
|
+
}
|
|
238
|
+
if (responseHandler) {
|
|
239
|
+
responseHandler.processData(rawOutput);
|
|
240
|
+
}
|
|
241
|
+
else if (rawOutput) {
|
|
242
|
+
if (assistantBlocks.length > 0 && assistantBlocks[assistantBlocks.length - 1].type === 'text') {
|
|
243
|
+
assistantBlocks[assistantBlocks.length - 1].text += rawOutput;
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
assistantBlocks.push({ type: 'text', text: rawOutput });
|
|
247
|
+
}
|
|
248
|
+
const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId);
|
|
249
|
+
ws.send(createNormalizedMessage({ kind: 'stream_delta', content: rawOutput, sessionId: socketSessionId, provider: 'opencode' }));
|
|
250
|
+
}
|
|
251
|
+
});
|
|
252
|
+
opencodeProcess.stderr.on('data', (data) => {
|
|
253
|
+
const errorMsg = data.toString();
|
|
254
|
+
// Suppress known cosmetic noise.
|
|
255
|
+
if (errorMsg.includes('[DEP0040]') ||
|
|
256
|
+
errorMsg.includes('DeprecationWarning') ||
|
|
257
|
+
errorMsg.includes('--trace-deprecation') ||
|
|
258
|
+
errorMsg.includes('punycode')) {
|
|
259
|
+
return;
|
|
260
|
+
}
|
|
261
|
+
const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId);
|
|
262
|
+
ws.send(createNormalizedMessage({ kind: 'error', content: errorMsg, sessionId: socketSessionId, provider: 'opencode' }));
|
|
263
|
+
});
|
|
264
|
+
opencodeProcess.on('close', async (code) => {
|
|
265
|
+
clearTimeout(timeout);
|
|
266
|
+
if (responseHandler) {
|
|
267
|
+
responseHandler.forceFlush();
|
|
268
|
+
responseHandler.destroy();
|
|
269
|
+
}
|
|
270
|
+
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
271
|
+
activeOpencodeProcesses.delete(finalSessionId);
|
|
272
|
+
if (finalSessionId && assistantBlocks.length > 0) {
|
|
273
|
+
sessionManager.addMessage(finalSessionId, 'assistant', assistantBlocks);
|
|
274
|
+
}
|
|
275
|
+
ws.send(createNormalizedMessage({ kind: 'complete', exitCode: code, isNewSession: !sessionId && !!command, sessionId: finalSessionId, provider: 'opencode' }));
|
|
276
|
+
if (opencodeProcess.tempImagePaths && opencodeProcess.tempImagePaths.length > 0) {
|
|
277
|
+
for (const imagePath of opencodeProcess.tempImagePaths) {
|
|
278
|
+
await fs.unlink(imagePath).catch(() => { });
|
|
279
|
+
}
|
|
280
|
+
if (opencodeProcess.tempDir) {
|
|
281
|
+
await fs.rm(opencodeProcess.tempDir, { recursive: true, force: true }).catch(() => { });
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
if (code === 0) {
|
|
285
|
+
notifyTerminalState({ code });
|
|
286
|
+
resolve();
|
|
287
|
+
}
|
|
288
|
+
else {
|
|
289
|
+
if (code === 127) {
|
|
290
|
+
const installed = await providerAuthService.isProviderInstalled('opencode');
|
|
291
|
+
if (!installed) {
|
|
292
|
+
const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId;
|
|
293
|
+
ws.send(createNormalizedMessage({
|
|
294
|
+
kind: 'error',
|
|
295
|
+
content: 'OpenCode CLI is not installed. Install it from the Settings → Agents → OpenCode tab, or run: npm install -g opencode-ai',
|
|
296
|
+
sessionId: socketSessionId,
|
|
297
|
+
provider: 'opencode',
|
|
298
|
+
}));
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
notifyTerminalState({
|
|
302
|
+
code,
|
|
303
|
+
error: code === null ? 'OpenCode CLI process was terminated or timed out' : null,
|
|
304
|
+
});
|
|
305
|
+
reject(new Error(code === null ? 'OpenCode CLI process was terminated or timed out' : `OpenCode CLI exited with code ${code}`));
|
|
306
|
+
}
|
|
307
|
+
});
|
|
308
|
+
opencodeProcess.on('error', async (error) => {
|
|
309
|
+
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
310
|
+
activeOpencodeProcesses.delete(finalSessionId);
|
|
311
|
+
const installed = await providerAuthService.isProviderInstalled('opencode');
|
|
312
|
+
const errorContent = !installed
|
|
313
|
+
? 'OpenCode CLI is not installed. Install it from the Settings → Agents → OpenCode tab, or run: npm install -g opencode-ai'
|
|
314
|
+
: error.message;
|
|
315
|
+
const errorSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId;
|
|
316
|
+
ws.send(createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: errorSessionId, provider: 'opencode' }));
|
|
317
|
+
notifyTerminalState({ error });
|
|
318
|
+
reject(error);
|
|
319
|
+
});
|
|
320
|
+
});
|
|
321
|
+
}
|
|
322
|
+
function abortOpencodeSession(sessionId) {
|
|
323
|
+
let opencodeProc = activeOpencodeProcesses.get(sessionId);
|
|
324
|
+
let processKey = sessionId;
|
|
325
|
+
if (!opencodeProc) {
|
|
326
|
+
for (const [key, proc] of activeOpencodeProcesses.entries()) {
|
|
327
|
+
if (proc.sessionId === sessionId) {
|
|
328
|
+
opencodeProc = proc;
|
|
329
|
+
processKey = key;
|
|
330
|
+
break;
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
if (opencodeProc) {
|
|
335
|
+
try {
|
|
336
|
+
opencodeProc.kill('SIGTERM');
|
|
337
|
+
setTimeout(() => {
|
|
338
|
+
if (activeOpencodeProcesses.has(processKey)) {
|
|
339
|
+
try {
|
|
340
|
+
opencodeProc.kill('SIGKILL');
|
|
341
|
+
}
|
|
342
|
+
catch { /* noop */ }
|
|
343
|
+
}
|
|
344
|
+
}, 2000);
|
|
345
|
+
return true;
|
|
346
|
+
}
|
|
347
|
+
catch {
|
|
348
|
+
return false;
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
return false;
|
|
352
|
+
}
|
|
353
|
+
function isOpencodeSessionActive(sessionId) {
|
|
354
|
+
return activeOpencodeProcesses.has(sessionId);
|
|
355
|
+
}
|
|
356
|
+
function getActiveOpencodeSessions() {
|
|
357
|
+
return Array.from(activeOpencodeProcesses.keys());
|
|
358
|
+
}
|
|
359
|
+
export { spawnOpencode, abortOpencodeSession, isOpencodeSessionActive, getActiveOpencodeSessions, };
|
|
360
|
+
//# sourceMappingURL=opencode-cli.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-cli.js","sourceRoot":"","sources":["../../server/opencode-cli.js"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
// OpenCode Response Handler — `opencode run --format json` parser.
|
|
2
|
+
//
|
|
3
|
+
// The JSON format streams one event per line (NDJSON). Event shapes follow
|
|
4
|
+
// the OpenAPI contract exposed by `opencode serve`. We treat the stream
|
|
5
|
+
// permissively: lines that don't parse as JSON are passed through as plain
|
|
6
|
+
// text deltas (covers OpenCode's pre-stream banner output and any debug
|
|
7
|
+
// noise the CLI emits to stdout).
|
|
8
|
+
import { sessionsService } from './modules/providers/services/sessions.service.js';
|
|
9
|
+
class OpencodeResponseHandler {
|
|
10
|
+
constructor(ws, options = {}) {
|
|
11
|
+
this.ws = ws;
|
|
12
|
+
this.buffer = '';
|
|
13
|
+
this.onContentFragment = options.onContentFragment || null;
|
|
14
|
+
this.onInit = options.onInit || null;
|
|
15
|
+
this.onToolUse = options.onToolUse || null;
|
|
16
|
+
this.onToolResult = options.onToolResult || null;
|
|
17
|
+
}
|
|
18
|
+
processData(data) {
|
|
19
|
+
this.buffer += data;
|
|
20
|
+
const lines = this.buffer.split('\n');
|
|
21
|
+
this.buffer = lines.pop() || '';
|
|
22
|
+
for (const line of lines) {
|
|
23
|
+
const trimmed = line.trim();
|
|
24
|
+
if (!trimmed)
|
|
25
|
+
continue;
|
|
26
|
+
try {
|
|
27
|
+
const event = JSON.parse(trimmed);
|
|
28
|
+
this.handleEvent(event);
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
// Non-JSON line — surface as plain text delta so the user sees CLI
|
|
32
|
+
// banners / status messages instead of swallowing them silently.
|
|
33
|
+
if (this.onContentFragment)
|
|
34
|
+
this.onContentFragment(trimmed + '\n');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
handleEvent(event) {
|
|
39
|
+
const sid = typeof this.ws.getSessionId === 'function' ? this.ws.getSessionId() : null;
|
|
40
|
+
if (event.type === 'init' || event.type === 'session.start') {
|
|
41
|
+
if (this.onInit)
|
|
42
|
+
this.onInit(event);
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
// OpenCode emits both `message` events and `part` events that compose
|
|
46
|
+
// a single assistant turn. We handle whichever shape lands.
|
|
47
|
+
if (event.type === 'message' && event.role === 'assistant') {
|
|
48
|
+
const content = event.content || event.text || '';
|
|
49
|
+
if (this.onContentFragment && content)
|
|
50
|
+
this.onContentFragment(content);
|
|
51
|
+
}
|
|
52
|
+
else if (event.type === 'part' && event.part_type === 'text') {
|
|
53
|
+
const content = event.text || event.content || '';
|
|
54
|
+
if (this.onContentFragment && content)
|
|
55
|
+
this.onContentFragment(content);
|
|
56
|
+
}
|
|
57
|
+
else if (event.type === 'tool_use' || event.type === 'tool-use' || event.type === 'tool.start') {
|
|
58
|
+
if (this.onToolUse)
|
|
59
|
+
this.onToolUse({
|
|
60
|
+
tool_id: event.tool_id || event.id,
|
|
61
|
+
tool_name: event.tool_name || event.name,
|
|
62
|
+
parameters: event.parameters || event.input || {},
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
else if (event.type === 'tool_result' || event.type === 'tool-result' || event.type === 'tool.end') {
|
|
66
|
+
if (this.onToolResult)
|
|
67
|
+
this.onToolResult({
|
|
68
|
+
tool_id: event.tool_id || event.id,
|
|
69
|
+
output: event.output ?? event.result ?? '',
|
|
70
|
+
status: event.status || (event.isError ? 'error' : 'ok'),
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
const normalized = sessionsService.normalizeMessage('opencode', event, sid);
|
|
74
|
+
for (const msg of normalized) {
|
|
75
|
+
this.ws.send(msg);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
forceFlush() {
|
|
79
|
+
if (this.buffer.trim()) {
|
|
80
|
+
try {
|
|
81
|
+
const event = JSON.parse(this.buffer);
|
|
82
|
+
this.handleEvent(event);
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
if (this.onContentFragment)
|
|
86
|
+
this.onContentFragment(this.buffer);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
destroy() {
|
|
91
|
+
this.buffer = '';
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
export default OpencodeResponseHandler;
|
|
95
|
+
//# sourceMappingURL=opencode-response-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-response-handler.js","sourceRoot":"","sources":["../../server/opencode-response-handler.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pixelbyte-software/pixcode",
|
|
3
|
-
"version": "1.33.
|
|
3
|
+
"version": "1.33.3",
|
|
4
4
|
"description": "Pixcode — a desktop and mobile web UI for Claude Code, Cursor CLI, Codex, Gemini CLI, Qwen Code, and OpenCode.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist-server/server/index.js",
|
package/server/index.js
CHANGED
|
@@ -48,6 +48,7 @@ import { spawnCursor, abortCursorSession, isCursorSessionActive, getActiveCursor
|
|
|
48
48
|
import { queryCodex, abortCodexSession, isCodexSessionActive, getActiveCodexSessions } from './openai-codex.js';
|
|
49
49
|
import { spawnGemini, abortGeminiSession, isGeminiSessionActive, getActiveGeminiSessions } from './gemini-cli.js';
|
|
50
50
|
import { spawnQwen, abortQwenSession, isQwenSessionActive, getActiveQwenSessions } from './qwen-code-cli.js';
|
|
51
|
+
import { spawnOpencode, abortOpencodeSession, isOpencodeSessionActive, getActiveOpencodeSessions } from './opencode-cli.js';
|
|
51
52
|
import sessionManager from './sessionManager.js';
|
|
52
53
|
import gitRoutes from './routes/git.js';
|
|
53
54
|
import authRoutes from './routes/auth.js';
|
|
@@ -1810,6 +1811,9 @@ function handleChatConnection(ws, request) {
|
|
|
1810
1811
|
} else if (data.type === 'qwen-command') {
|
|
1811
1812
|
chatDebug('qwen', data);
|
|
1812
1813
|
await spawnQwen(data.command, data.options, writer);
|
|
1814
|
+
} else if (data.type === 'opencode-command') {
|
|
1815
|
+
chatDebug('opencode', data);
|
|
1816
|
+
await spawnOpencode(data.command, data.options, writer);
|
|
1813
1817
|
} else if (data.type === 'cursor-resume') {
|
|
1814
1818
|
// Backward compatibility: treat as cursor-command with resume and no prompt
|
|
1815
1819
|
console.log('[DEBUG] Cursor resume session (compat):', data.sessionId);
|
|
@@ -1831,6 +1835,8 @@ function handleChatConnection(ws, request) {
|
|
|
1831
1835
|
success = abortGeminiSession(data.sessionId);
|
|
1832
1836
|
} else if (provider === 'qwen') {
|
|
1833
1837
|
success = abortQwenSession(data.sessionId);
|
|
1838
|
+
} else if (provider === 'opencode') {
|
|
1839
|
+
success = abortOpencodeSession(data.sessionId);
|
|
1834
1840
|
} else {
|
|
1835
1841
|
// Use Claude Agents SDK
|
|
1836
1842
|
success = await abortClaudeSDKSession(data.sessionId);
|
|
@@ -1867,6 +1873,8 @@ function handleChatConnection(ws, request) {
|
|
|
1867
1873
|
isActive = isGeminiSessionActive(sessionId);
|
|
1868
1874
|
} else if (provider === 'qwen') {
|
|
1869
1875
|
isActive = isQwenSessionActive(sessionId);
|
|
1876
|
+
} else if (provider === 'opencode') {
|
|
1877
|
+
isActive = isOpencodeSessionActive(sessionId);
|
|
1870
1878
|
} else {
|
|
1871
1879
|
// Use Claude Agents SDK
|
|
1872
1880
|
isActive = isClaudeSDKSessionActive(sessionId);
|
|
@@ -1901,7 +1909,8 @@ function handleChatConnection(ws, request) {
|
|
|
1901
1909
|
cursor: getActiveCursorSessions(),
|
|
1902
1910
|
codex: getActiveCodexSessions(),
|
|
1903
1911
|
gemini: getActiveGeminiSessions(),
|
|
1904
|
-
qwen: getActiveQwenSessions()
|
|
1912
|
+
qwen: getActiveQwenSessions(),
|
|
1913
|
+
opencode: getActiveOpencodeSessions()
|
|
1905
1914
|
};
|
|
1906
1915
|
writer.send({
|
|
1907
1916
|
type: 'active-sessions',
|
|
@@ -1978,7 +1987,13 @@ function handleShellConnection(ws) {
|
|
|
1978
1987
|
const commandSuffix = isPlainShell && initialCommand
|
|
1979
1988
|
? `_cmd_${Buffer.from(initialCommand).toString('base64').slice(0, 16)}`
|
|
1980
1989
|
: '';
|
|
1981
|
-
|
|
1990
|
+
// Include provider in the key so a fresh "new session" in OpenCode
|
|
1991
|
+
// doesn't reattach to a cached Claude PTY for the same project (or
|
|
1992
|
+
// vice versa). Before this, the key was just `${path}_default`,
|
|
1993
|
+
// which collided across providers and made every disconnect →
|
|
1994
|
+
// switch-provider flow reopen the previously-running CLI.
|
|
1995
|
+
const providerSuffix = isPlainShell ? '' : `_${provider}`;
|
|
1996
|
+
ptySessionKey = `${projectPath}_${sessionId || 'default'}${providerSuffix}${commandSuffix}`;
|
|
1982
1997
|
|
|
1983
1998
|
// Kill any existing login session before starting fresh
|
|
1984
1999
|
if (isLoginCommand) {
|
|
@@ -2034,6 +2049,7 @@ function handleShellConnection(ws) {
|
|
|
2034
2049
|
: provider === 'codex' ? 'Codex'
|
|
2035
2050
|
: provider === 'gemini' ? 'Gemini'
|
|
2036
2051
|
: provider === 'qwen' ? 'Qwen Code'
|
|
2052
|
+
: provider === 'opencode' ? 'OpenCode'
|
|
2037
2053
|
: 'Claude';
|
|
2038
2054
|
welcomeMsg = hasSession ?
|
|
2039
2055
|
`\x1b[36mResuming ${providerName} session ${sessionId} in: ${projectPath}\x1b[0m\r\n` :
|