@openagents-org/agent-launcher 0.2.225 → 0.2.227
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/package.json +1 -1
- package/src/adapters/antigravity-stream.js +4 -9
- package/src/adapters/codex.js +15 -0
- package/src/adapters/copilot.js +35 -9
- package/src/adapters/opencode.js +43 -4
- package/src/adapters/utils.js +14 -0
- package/src/adapters/workspace-prompt.js +17 -7
- package/src/cli.js +26 -1
- package/src/daemon.js +13 -7
- package/src/paths.js +26 -0
package/package.json
CHANGED
|
@@ -13,19 +13,14 @@
|
|
|
13
13
|
* rather than a tweak to the gemini adapter.
|
|
14
14
|
*/
|
|
15
15
|
|
|
16
|
-
const { redactSecrets } = require('./utils');
|
|
16
|
+
const { redactSecrets, promptFitsArgv } = require('./utils');
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
|
-
* Longest prompt passed as `-p <prompt
|
|
20
|
-
* (agyStdinMessage).
|
|
21
|
-
* and Node fails the spawn itself with ENAMETOOLONG — the system prompt plus a
|
|
22
|
-
* large pinned glossary got there with a one-word message. Linux caps a single
|
|
23
|
-
* argument at 128 KiB. Both limits are left headroom for quoting and the rest
|
|
24
|
-
* of the argv.
|
|
19
|
+
* Longest prompt passed as `-p <prompt>`; past it the prompt goes over stdin
|
|
20
|
+
* (agyStdinMessage). The limits are shared — see promptFitsArgv in utils.
|
|
25
21
|
*/
|
|
26
22
|
function agyPromptFitsArgv(prompt, platform = process.platform) {
|
|
27
|
-
|
|
28
|
-
return String(prompt || '').length <= limit;
|
|
23
|
+
return promptFitsArgv(prompt, platform);
|
|
29
24
|
}
|
|
30
25
|
|
|
31
26
|
/**
|
package/src/adapters/codex.js
CHANGED
|
@@ -953,6 +953,21 @@ class CodexAdapter extends BaseAdapter {
|
|
|
953
953
|
'at an endpoint that supports the full Responses API, or edit the agent and set Agent capabilities to ' +
|
|
954
954
|
'"Chat only · Chat Completions API" (it then answers without running tools on this device).';
|
|
955
955
|
}
|
|
956
|
+
// The base URL answers, but has nothing at /responses: an endpoint that
|
|
957
|
+
// only serves Chat Completions (or a base URL missing its path prefix).
|
|
958
|
+
// Seen as `unexpected status 404 Not Found: 404 page not found, url:
|
|
959
|
+
// http://host:port/v1/responses` on every message, read as "Codex failed
|
|
960
|
+
// to complete this run" with no hint that the setting is the cause.
|
|
961
|
+
if (/\b404\b/.test(detail) && /\/responses\b/i.test(detail)) {
|
|
962
|
+
const m = /url:\s*(\S+)/i.exec(detail);
|
|
963
|
+
let host = '';
|
|
964
|
+
try { host = new URL(m ? m[1] : (customProvider && customProvider.baseUrl) || '').host; } catch {}
|
|
965
|
+
return `${detail}\n\nThe endpoint this agent is set to${host ? ` (${host})` : ''} has no Responses API ` +
|
|
966
|
+
'(/v1/responses), which the Codex CLI sends every request to — so every run here will fail the same way. ' +
|
|
967
|
+
'Check the base URL (it usually ends in /v1), or, if that service only offers Chat Completions, edit the ' +
|
|
968
|
+
'agent and set Agent capabilities to "Chat only · Chat Completions API" (it then answers without running ' +
|
|
969
|
+
'tools on this device).';
|
|
970
|
+
}
|
|
956
971
|
// A model the user's ChatGPT plan doesn't include for Codex. Seen in the
|
|
957
972
|
// field with several model names picked in the workspace; every run
|
|
958
973
|
// fails the same way until another model is chosen.
|
package/src/adapters/copilot.js
CHANGED
|
@@ -50,6 +50,7 @@ const { buildOpenclawSystemPrompt } = require('./workspace-prompt');
|
|
|
50
50
|
const { whichBinary, whereBinary, getEnhancedEnv, defaultAgentWorkdir } = require('../paths');
|
|
51
51
|
const { compareVersions } = require('../installer');
|
|
52
52
|
const { CopilotStreamParser, redactSensitive } = require('./copilot-stream-parser');
|
|
53
|
+
const { promptFitsArgv } = require('./utils');
|
|
53
54
|
|
|
54
55
|
const IS_WINDOWS = process.platform === 'win32';
|
|
55
56
|
|
|
@@ -61,6 +62,14 @@ const IS_WINDOWS = process.platform === 'win32';
|
|
|
61
62
|
// `--secret-env-vars`/`--no-remote`. Verified end-to-end against 1.0.63.
|
|
62
63
|
const MIN_VERSION = '1.0.0';
|
|
63
64
|
|
|
65
|
+
// First release whose changelog documents a prompt piped over stdin as a
|
|
66
|
+
// prompt-mode run alongside `-p` (1.0.78: its `sessionEnd` hook "the same way
|
|
67
|
+
// `-p` does"). A prompt too long for a command line goes that way instead —
|
|
68
|
+
// on Windows a channel's system prompt plus a large pinned glossary failed the
|
|
69
|
+
// spawn itself with ENAMETOOLONG. An older CLI is told to upgrade rather than
|
|
70
|
+
// handed a stdin it may not read.
|
|
71
|
+
const STDIN_PROMPT_MIN_VERSION = '1.0.78';
|
|
72
|
+
|
|
64
73
|
// Token-bearing env var NAMES Copilot reads (verified precedence via
|
|
65
74
|
// `copilot help environment`): COPILOT_GITHUB_TOKEN > GH_TOKEN > GITHUB_TOKEN.
|
|
66
75
|
// Plus OpenAgents' own workspace token. We pass the NAMES (never values) to
|
|
@@ -276,13 +285,14 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
276
285
|
* single discrete argv element. Permissions are least-privilege and scoped to
|
|
277
286
|
* the working directory.
|
|
278
287
|
*/
|
|
279
|
-
_buildArgs(prompt, channel, { skipResume = false } = {}) {
|
|
288
|
+
_buildArgs(prompt, channel, { skipResume = false, viaStdin = false } = {}) {
|
|
280
289
|
const wd = this.workingDir || defaultAgentWorkdir(this.agentName);
|
|
281
290
|
// Required-value flags take the space form; optional-value/variadic flags
|
|
282
291
|
// (--resume, --secret-env-vars, --allow-tool — declared `[=value]` /
|
|
283
292
|
// `[=value...]` in `copilot --help` v1.0.63) MUST use the `=` form so the
|
|
284
293
|
// next token isn't mistaken for a positional argument.
|
|
285
|
-
|
|
294
|
+
// viaStdin: the prompt is written to the child's stdin, so no `-p`.
|
|
295
|
+
const args = [...(viaStdin ? [] : ['-p', prompt]), '--output-format', 'json', '--stream', 'on'];
|
|
286
296
|
|
|
287
297
|
if (this._model) args.push('--model', this._model);
|
|
288
298
|
|
|
@@ -427,15 +437,25 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
427
437
|
|
|
428
438
|
const fullPrompt = `${this._buildSystemContext(channel)}\n\n---\n\nUser message:\n${content}`;
|
|
429
439
|
|
|
440
|
+
// Too long for a command line: pipe it over stdin instead of `-p`.
|
|
441
|
+
const viaStdin = !promptFitsArgv(fullPrompt);
|
|
442
|
+
if (viaStdin && gate.version && compareVersions(gate.version, STDIN_PROMPT_MIN_VERSION) < 0) {
|
|
443
|
+
await this.sendError(channel,
|
|
444
|
+
`This channel's instructions are too long to pass to GitHub Copilot CLI ${gate.version} on the command line `
|
|
445
|
+
+ `(${fullPrompt.length} characters). Copilot CLI ${STDIN_PROMPT_MIN_VERSION} or newer takes them over stdin — `
|
|
446
|
+
+ 'upgrade with: copilot update (or npm install -g @github/copilot). A shorter pinned glossary for this channel also works.');
|
|
447
|
+
return;
|
|
448
|
+
}
|
|
449
|
+
|
|
430
450
|
// Up to 2 attempts: resume first, then a fresh session if resume was stale.
|
|
431
451
|
for (let attempt = 0; attempt < 2; attempt++) {
|
|
432
452
|
const skipResume = attempt > 0;
|
|
433
|
-
const args = this._buildArgs(fullPrompt, channel, { skipResume });
|
|
434
|
-
this._logSpawn(channel, args, skipResume);
|
|
453
|
+
const args = this._buildArgs(fullPrompt, channel, { skipResume, viaStdin });
|
|
454
|
+
this._logSpawn(channel, args, skipResume, viaStdin);
|
|
435
455
|
|
|
436
456
|
let result;
|
|
437
457
|
try {
|
|
438
|
-
result = await this._runTurn(channel, args);
|
|
458
|
+
result = await this._runTurn(channel, args, viaStdin ? fullPrompt : null);
|
|
439
459
|
} catch (e) {
|
|
440
460
|
await this.sendError(channel, `Error: ${this._redact(e.message)}`);
|
|
441
461
|
return;
|
|
@@ -501,7 +521,7 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
501
521
|
return this._versionGate;
|
|
502
522
|
}
|
|
503
523
|
|
|
504
|
-
_logSpawn(channel, args, skipResume) {
|
|
524
|
+
_logSpawn(channel, args, skipResume, viaStdin = false) {
|
|
505
525
|
// Log a redacted, prompt-free shape of the command. The prompt is replaced
|
|
506
526
|
// with a placeholder; tokens never appear in argv but redact defensively.
|
|
507
527
|
const shown = [];
|
|
@@ -509,7 +529,7 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
509
529
|
if (args[i] === '-p') { shown.push('-p', '<prompt>'); i++; continue; }
|
|
510
530
|
shown.push(args[i]);
|
|
511
531
|
}
|
|
512
|
-
this._log(`Spawning copilot ${redactSensitive(shown.join(' '))}${skipResume ? ' (no-resume retry)' : ''}`);
|
|
532
|
+
this._log(`Spawning copilot ${redactSensitive(shown.join(' '))}${viaStdin ? ' (prompt on stdin)' : ''}${skipResume ? ' (no-resume retry)' : ''}`);
|
|
513
533
|
}
|
|
514
534
|
|
|
515
535
|
/**
|
|
@@ -518,7 +538,7 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
518
538
|
* the turn. Never rejects on CLI failure — failures come back as
|
|
519
539
|
* `errorMessage` / `staleSession` / `timedOut` so the caller can react.
|
|
520
540
|
*/
|
|
521
|
-
_runTurn(channel, args) {
|
|
541
|
+
_runTurn(channel, args, stdinPrompt = null) {
|
|
522
542
|
// Stopped while this turn was being prepared: start nothing (no tokens).
|
|
523
543
|
if (this._stoppedBeforeStart(channel)) return Promise.resolve({ userStopped: true });
|
|
524
544
|
const [file, ...prefix] = this._resolveExec(this._copilotBin);
|
|
@@ -529,7 +549,7 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
529
549
|
let proc;
|
|
530
550
|
try {
|
|
531
551
|
proc = spawn(file, [...prefix, ...args], {
|
|
532
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
552
|
+
stdio: [stdinPrompt != null ? 'pipe' : 'ignore', 'pipe', 'pipe'],
|
|
533
553
|
env,
|
|
534
554
|
cwd,
|
|
535
555
|
detached: !IS_WINDOWS,
|
|
@@ -539,6 +559,12 @@ class CopilotAdapter extends BaseAdapter {
|
|
|
539
559
|
return resolve({ errorMessage: `Failed to launch Copilot CLI: ${this._redact(e.message)}` });
|
|
540
560
|
}
|
|
541
561
|
this._channelProcesses[channel] = proc;
|
|
562
|
+
// The whole prompt, then EOF — Copilot reads stdin to the end before the
|
|
563
|
+
// run starts. A child that exits first turns the write into EPIPE.
|
|
564
|
+
if (stdinPrompt != null && proc.stdin) {
|
|
565
|
+
proc.stdin.on('error', () => {});
|
|
566
|
+
proc.stdin.end(stdinPrompt);
|
|
567
|
+
}
|
|
542
568
|
|
|
543
569
|
// Guard the child's stdio streams against 'error'. When the process is
|
|
544
570
|
// SIGKILL'd on stop, macOS Node can emit a benign EPIPE/ECONNRESET 'error'
|
package/src/adapters/opencode.js
CHANGED
|
@@ -27,6 +27,9 @@ const { buildOpenCodeSkillMd, buildOpenCodeSystemPrompt, workspaceSkillName } =
|
|
|
27
27
|
const { whichBinary, whereBinary, getEnhancedEnv } = require('../paths');
|
|
28
28
|
const { isPostinstallStub, isPostinstallStubOutput } = require('../postinstall-stub');
|
|
29
29
|
|
|
30
|
+
// The launcher's own CLI, whose `mcp-server` command serves the workspace tools.
|
|
31
|
+
const WORKSPACE_MCP_BIN = path.resolve(__dirname, '..', '..', 'bin', 'agent-connector.js');
|
|
32
|
+
|
|
30
33
|
const IS_WINDOWS = process.platform === 'win32';
|
|
31
34
|
|
|
32
35
|
// Max time an `opencode run` may stay completely silent. This is deliberately
|
|
@@ -252,8 +255,40 @@ class OpenCodeAdapter extends BaseAdapter {
|
|
|
252
255
|
touch();
|
|
253
256
|
return { touch, cancel, timeoutMs };
|
|
254
257
|
}
|
|
255
|
-
_spawnEnv() {
|
|
256
|
-
|
|
258
|
+
_spawnEnv(channel) {
|
|
259
|
+
const env = { ...(this.agentEnv || process.env) };
|
|
260
|
+
if (!this._wiresWorkspaceMcp()) return env;
|
|
261
|
+
// Give OpenCode the workspace tools (publish, todos, browser, ...) through
|
|
262
|
+
// our MCP server, as the Claude adapter does. Merged into any inline config
|
|
263
|
+
// the host already passes; the token travels in the child's environment only.
|
|
264
|
+
let cfg = {};
|
|
265
|
+
try { cfg = JSON.parse(env.OPENCODE_CONFIG_CONTENT || '{}') || {}; } catch { return env; }
|
|
266
|
+
if (typeof cfg !== 'object' || Array.isArray(cfg)) return env;
|
|
267
|
+
const args = [WORKSPACE_MCP_BIN, 'mcp-server',
|
|
268
|
+
'--workspace-id', this.workspaceId, '--channel-name', channel || this.channelName || 'general',
|
|
269
|
+
'--agent-name', this.agentName, '--endpoint', this.endpoint];
|
|
270
|
+
const disabled = this.disabledModules || new Set();
|
|
271
|
+
if (disabled.has('files')) args.push('--disable-files');
|
|
272
|
+
if (disabled.has('browser')) args.push('--disable-browser');
|
|
273
|
+
if (disabled.has('knowledge')) args.push('--disable-knowledge');
|
|
274
|
+
const requester = channel && this.requesterEmailFor ? this.requesterEmailFor(channel) : null;
|
|
275
|
+
cfg.mcp = { ...(cfg.mcp || {}), openagents: { type: 'local', enabled: true,
|
|
276
|
+
command: [process.execPath, ...args],
|
|
277
|
+
environment: { OA_WORKSPACE_TOKEN: this.token, ...(requester ? { OPENAGENTS_REQUESTER_EMAIL: requester } : {}) } } };
|
|
278
|
+
env.OPENCODE_CONFIG_CONTENT = JSON.stringify(cfg);
|
|
279
|
+
return env;
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* Only plain OpenCode reads OPENCODE_CONFIG_CONTENT; the forks built on this
|
|
284
|
+
* adapter (CodeArts, MiMo Code) replace _spawnEnv and keep the curl skill.
|
|
285
|
+
*/
|
|
286
|
+
_wiresWorkspaceMcp() {
|
|
287
|
+
// An OpenCode across the Windows/WSL boundary could not start our node.
|
|
288
|
+
const bin = String(this._opencodeBinary || '');
|
|
289
|
+
if (bin.startsWith('wsl:') || (!IS_WINDOWS && /\.(exe|cmd|bat)$/i.test(bin))) return false;
|
|
290
|
+
return this._spawnEnv === OpenCodeAdapter.prototype._spawnEnv
|
|
291
|
+
&& Boolean(this.token && this.workspaceId) && fs.existsSync(WORKSPACE_MCP_BIN);
|
|
257
292
|
}
|
|
258
293
|
|
|
259
294
|
/**
|
|
@@ -366,6 +401,7 @@ class OpenCodeAdapter extends BaseAdapter {
|
|
|
366
401
|
mode: this._mode,
|
|
367
402
|
model: this.modelLabel(),
|
|
368
403
|
disabledModules: this.disabledModules,
|
|
404
|
+
workspaceMcp: this._wiresWorkspaceMcp(),
|
|
369
405
|
...this.pinnedPromptOpts(channelName),
|
|
370
406
|
});
|
|
371
407
|
}
|
|
@@ -1444,9 +1480,12 @@ class OpenCodeAdapter extends BaseAdapter {
|
|
|
1444
1480
|
category = 'unsupported_version';
|
|
1445
1481
|
} else if (has(/\b(401|403)\b/) || has(/unauthor|invalid api key|invalid_api_key|invalid or revoked api key|api key (?:has been |was )?revoked|authentication|auth(entication)? failed|forbidden|invalid token|no api key|missing api key|permission denied/)) {
|
|
1446
1482
|
category = 'auth_failed';
|
|
1447
|
-
} else if (has(/\b402\b|insufficient (?:balance|credits?|funds)|insufficient_quota|out of credits?|payment required|余额不足|欠费|arrearage/)
|
|
1483
|
+
} else if (has(/\b402\b|insufficient (?:balance|credits?|funds)|insufficient_quota|out of credits?|payment required|余额不足|欠费|arrearage/)
|
|
1484
|
+
|| has(/allowance\b[^.]{0,60}\bused up|allowance_exhausted/)) {
|
|
1448
1485
|
// A spent account, not a busy one: waiting does not fix it. Seen in the
|
|
1449
|
-
// field as "Insufficient balance" under "undetermined reason"
|
|
1486
|
+
// field as "Insufficient balance" under "undetermined reason", and as a
|
|
1487
|
+
// plan's "Your Pass allowance for this period is used up, and your
|
|
1488
|
+
// account is set not to…" with no status code in the run's error.
|
|
1450
1489
|
category = 'quota_exhausted';
|
|
1451
1490
|
} else if (has(/\b429\b/) || has(/rate.?limit|too many requests|quota|overloaded/)) {
|
|
1452
1491
|
category = 'rate_limited';
|
package/src/adapters/utils.js
CHANGED
|
@@ -287,7 +287,21 @@ function stripCliNoise(text) {
|
|
|
287
287
|
return String(text || '').split(/\r?\n/).filter((l) => !BENIGN_CLI_OUTPUT.test(l)).join('\n');
|
|
288
288
|
}
|
|
289
289
|
|
|
290
|
+
/**
|
|
291
|
+
* Whether a prompt can go to a CLI as one argv element (`-p <prompt>`).
|
|
292
|
+
* Windows caps a whole command line at 32,767 characters and Node fails the
|
|
293
|
+
* spawn itself with ENAMETOOLONG — the system prompt plus a large pinned
|
|
294
|
+
* glossary got there with a one-word message. Linux caps a single argument at
|
|
295
|
+
* 128 KiB. Both limits leave headroom for quoting and the rest of the argv.
|
|
296
|
+
* Past it, an adapter sends the prompt over stdin.
|
|
297
|
+
*/
|
|
298
|
+
function promptFitsArgv(prompt, platform = process.platform) {
|
|
299
|
+
const limit = platform === 'win32' ? 24000 : 100000;
|
|
300
|
+
return String(prompt || '').length <= limit;
|
|
301
|
+
}
|
|
302
|
+
|
|
290
303
|
module.exports = {
|
|
304
|
+
promptFitsArgv,
|
|
291
305
|
SESSION_DEFAULT_RE,
|
|
292
306
|
networkErrorText,
|
|
293
307
|
BENIGN_CLI_OUTPUT,
|
|
@@ -978,15 +978,24 @@ function buildOpenclawSkillMd({ endpoint, workspaceId, token, agentName, channel
|
|
|
978
978
|
* `glossary` opts in to knowledge pinning exactly as in
|
|
979
979
|
* buildOpenclawSystemPrompt.
|
|
980
980
|
*/
|
|
981
|
-
function buildOpenCodeSystemPrompt({ agentName, workspaceId, channelName, endpoint, token, mode = 'execute', disabledModules, browserEnabled = false, glossary = null, isWindows = process.platform === 'win32', model = null }) {
|
|
982
|
-
|
|
981
|
+
function buildOpenCodeSystemPrompt({ agentName, workspaceId, channelName, endpoint, token, mode = 'execute', disabledModules, browserEnabled = false, glossary = null, isWindows = process.platform === 'win32', model = null, workspaceMcp = false }) {
|
|
982
|
+
// With the workspace MCP server wired in (see OpenCodeAdapter._spawnEnv) the
|
|
983
|
+
// agent gets real workspace_* tools, as Claude does; the curl skill stays on
|
|
984
|
+
// disk as a fallback. Without it, curl through OpenCode's shell tool, `bash`.
|
|
985
|
+
const toolMode = workspaceMcp ? 'mcp' : 'skills';
|
|
986
|
+
const skillName = workspaceSkillName(agentName);
|
|
987
|
+
const identity = buildWorkspaceIdentity(agentName, workspaceId, channelName, mode, toolMode, model);
|
|
983
988
|
const directive = buildBrowserDirective(browserEnabled);
|
|
984
|
-
const collab = buildCollaborationPrompt(
|
|
989
|
+
const collab = buildCollaborationPrompt(toolMode, skillName);
|
|
985
990
|
const modePrompt = buildModePrompt(mode) + buildWindowsShellHint(isWindows);
|
|
986
|
-
const pinned = buildPinnedSections({ toolMode
|
|
991
|
+
const pinned = buildPinnedSections({ toolMode, mode, glossary })
|
|
987
992
|
.map((s) => '\n' + s).join('');
|
|
988
|
-
const
|
|
989
|
-
|
|
993
|
+
const tools = workspaceMcp
|
|
994
|
+
? buildClaudeMcpToolBlock() +
|
|
995
|
+
'Use workspace_publish_project to share HTML pages or reports, workspace_write_file for other files, and the workspace_browser_* tools for the shared browser.\n' +
|
|
996
|
+
`If a workspace tool is missing or fails, the ${skillName} skill documents the same operations as bash + curl.\n`
|
|
997
|
+
: buildApiSkillsPrompt({ endpoint, workspaceId, token, agentName, channelName, disabledModules, mode, execTool: 'bash' });
|
|
998
|
+
return identity + directive + '\n' + collab + '\n' + modePrompt + pinned + '\n' + tools + '\n' + buildGuardrails();
|
|
990
999
|
}
|
|
991
1000
|
|
|
992
1001
|
/**
|
|
@@ -1005,7 +1014,7 @@ function buildPiSystemPrompt({ agentName, workspaceId, channelName, endpoint, to
|
|
|
1005
1014
|
const directive = buildBrowserDirective(browserEnabled);
|
|
1006
1015
|
const collab = buildCollaborationPrompt('skills', workspaceSkillName(agentName));
|
|
1007
1016
|
const modePrompt = buildModePrompt(mode);
|
|
1008
|
-
const api = buildApiSkillsPrompt({ endpoint, workspaceId, token, agentName, channelName, disabledModules, mode });
|
|
1017
|
+
const api = buildApiSkillsPrompt({ endpoint, workspaceId, token, agentName, channelName, disabledModules, mode, execTool: 'bash' });
|
|
1009
1018
|
return identity + directive + '\n' + collab + '\n' + modePrompt + '\n' + api + '\n' + buildGuardrails();
|
|
1010
1019
|
}
|
|
1011
1020
|
|
|
@@ -1149,6 +1158,7 @@ function buildOpenCodeSkillMd({ endpoint, workspaceId, token, agentName, channel
|
|
|
1149
1158
|
channelName: channelName || 'general',
|
|
1150
1159
|
disabledModules,
|
|
1151
1160
|
mode: 'execute',
|
|
1161
|
+
execTool: 'bash',
|
|
1152
1162
|
});
|
|
1153
1163
|
|
|
1154
1164
|
const frontmatter =
|
package/src/cli.js
CHANGED
|
@@ -4,9 +4,11 @@
|
|
|
4
4
|
// no-stray-console-window default on Windows. See win-console.js.
|
|
5
5
|
require('./win-console').installWindowsHideDefault();
|
|
6
6
|
|
|
7
|
+
const path = require('path');
|
|
7
8
|
const { AgentConnector, Daemon } = require('./index');
|
|
8
9
|
const { hasCredentialMetadata, formatAuthGuidance } = require('./auth-guidance');
|
|
9
10
|
const { AUTH_MODE_KEY, CLI_LOGIN, isCliLogin } = require('./env');
|
|
11
|
+
const { loginCommandOf } = require('./agent-login');
|
|
10
12
|
|
|
11
13
|
// ---------------------------------------------------------------------------
|
|
12
14
|
// Arg parsing
|
|
@@ -202,7 +204,9 @@ async function cmdCreate(connector, flags, positional) {
|
|
|
202
204
|
}
|
|
203
205
|
|
|
204
206
|
try {
|
|
205
|
-
|
|
207
|
+
// Stored absolute: a relative --path is relative to this shell, and the
|
|
208
|
+
// daemon that later runs the agent has a different cwd.
|
|
209
|
+
connector.addAgent({ name, type, role, path: flags.path ? path.resolve(String(flags.path)) : process.cwd() });
|
|
206
210
|
|
|
207
211
|
// Signal daemon to pick up the new agent
|
|
208
212
|
try { connector.sendDaemonCommand('reload'); } catch {}
|
|
@@ -386,6 +390,25 @@ async function cmdRuntimes(connector, flags) {
|
|
|
386
390
|
// which judges the type again with its agents' env, said Ready. Judge it
|
|
387
391
|
// the way the daemon launches it: a type is ready when one of its agents
|
|
388
392
|
// is.
|
|
393
|
+
//
|
|
394
|
+
// That key is that agent's alone: a new agent of the type does not get
|
|
395
|
+
// it. `typeReady` keeps the type's own answer (<type>.env, this
|
|
396
|
+
// process's environment, the CLI's sign-in) for the add form, which
|
|
397
|
+
// otherwise read Ready and added an agent with no key at all.
|
|
398
|
+
const typeReady = !!h.ready;
|
|
399
|
+
// Whether the CLI itself is signed in on this device, keys aside: what an
|
|
400
|
+
// agent added on "the account signed in on the device" runs on, the add
|
|
401
|
+
// form's only choice besides a key. Null for a type with no sign-in. A
|
|
402
|
+
// type ready on a key never said whether it is signed in as well, so
|
|
403
|
+
// only that case is asked again, with keys not counting.
|
|
404
|
+
let signedIn = null;
|
|
405
|
+
if (loginCommandOf(e)) {
|
|
406
|
+
if (!h.installed || !h.ready) signedIn = false;
|
|
407
|
+
else if (h.auth_mode === 'cli_login') signedIn = true;
|
|
408
|
+
else {
|
|
409
|
+
try { signedIn = !!connector.healthCheck(e.name, { cliLogin: true }).ready; } catch { signedIn = false; }
|
|
410
|
+
}
|
|
411
|
+
}
|
|
389
412
|
let agentEnv = null;
|
|
390
413
|
if (h.installed && !h.ready) {
|
|
391
414
|
for (const a of agents) {
|
|
@@ -417,6 +440,8 @@ async function cmdRuntimes(connector, flags) {
|
|
|
417
440
|
type: e.name,
|
|
418
441
|
installed: !!h.installed,
|
|
419
442
|
ready: !!h.ready,
|
|
443
|
+
typeReady,
|
|
444
|
+
signedIn,
|
|
420
445
|
version: h.version || null,
|
|
421
446
|
reason: h.reason || null,
|
|
422
447
|
message: h.message || null,
|
package/src/daemon.js
CHANGED
|
@@ -17,7 +17,7 @@ const {
|
|
|
17
17
|
AUTH_MODE_KEY, CLI_LOGIN, MODEL_MODE_KEY, MODEL_DEFAULT, credentialKeys, isCliLogin, modelKeys, stripForCliLogin, typeEnvFor,
|
|
18
18
|
} = require('./env');
|
|
19
19
|
const { configuredModel } = require('./agent-model');
|
|
20
|
-
const { getEnhancedEnv, whichBinary, IS_WINDOWS, defaultAgentWorkdir } = require('./paths');
|
|
20
|
+
const { getEnhancedEnv, whichBinary, IS_WINDOWS, defaultAgentWorkdir, resolveAgentWorkdir } = require('./paths');
|
|
21
21
|
const { hostFreeEnv } = require('./host-agent');
|
|
22
22
|
const { LogWriter } = require('./log-writer');
|
|
23
23
|
const { redactDiagnostic } = require('./adapters/health-status');
|
|
@@ -733,7 +733,7 @@ class Daemon {
|
|
|
733
733
|
type: a.type || 'unknown',
|
|
734
734
|
status: (proc && proc.state) || 'stopped',
|
|
735
735
|
model: model || null,
|
|
736
|
-
workingDir: a.path
|
|
736
|
+
workingDir: resolveAgentWorkdir(a.path),
|
|
737
737
|
apiKeyMasked: apiKey ? maskApiKey(apiKey) : null,
|
|
738
738
|
authMode: this._agentAuthMode(a, apiKey),
|
|
739
739
|
baseUrlHost: endpointHost(this._configuredBaseUrl(a, typeEnv)),
|
|
@@ -1128,7 +1128,10 @@ async _runNodeCommand(n, cmd) {
|
|
|
1128
1128
|
// Working directory: use the one the user picked, else a managed folder
|
|
1129
1129
|
// under the launcher home so every remote-created agent has a clean,
|
|
1130
1130
|
// predictable home without the user typing a path.
|
|
1131
|
-
|
|
1131
|
+
// A relative path ("my-project") is taken from the home directory —
|
|
1132
|
+
// stored as typed, it resolved against the daemon's cwd and every run
|
|
1133
|
+
// failed (see resolveAgentWorkdir).
|
|
1134
|
+
let workingDir = resolveAgentWorkdir(args.workingDir);
|
|
1132
1135
|
if (!workingDir) workingDir = path.join(os.homedir(), '.openagents', 'agents', name);
|
|
1133
1136
|
try { fs.mkdirSync(workingDir, { recursive: true }); } catch {}
|
|
1134
1137
|
const r1 = await this._runAgn(['create', name, '--type', type, '--install', '--path', workingDir]);
|
|
@@ -1204,8 +1207,8 @@ async _runNodeCommand(n, cmd) {
|
|
|
1204
1207
|
// that copy, or the agent keeps running on the old key while the save
|
|
1205
1208
|
// says ok.
|
|
1206
1209
|
const unshadow = Object.fromEntries(applied.map((key) => [key, '']));
|
|
1207
|
-
const newDir = (args.workingDir
|
|
1208
|
-
if (newDir && newDir !== (args.currentWorkingDir || '')) {
|
|
1210
|
+
const newDir = resolveAgentWorkdir(args.workingDir);
|
|
1211
|
+
if (newDir && newDir !== (resolveAgentWorkdir(args.currentWorkingDir) || '')) {
|
|
1209
1212
|
try { fs.mkdirSync(newDir, { recursive: true }); } catch {}
|
|
1210
1213
|
// The agent's own env goes with the entry remove/create replace, and
|
|
1211
1214
|
// for a type that keeps its key on the agent that is the key, the
|
|
@@ -1882,7 +1885,7 @@ async _runNodeCommand(n, cmd) {
|
|
|
1882
1885
|
}
|
|
1883
1886
|
|
|
1884
1887
|
const env = this._buildAgentEnv(agentCfg);
|
|
1885
|
-
const cwd = agentCfg.path || undefined;
|
|
1888
|
+
const cwd = resolveAgentWorkdir(agentCfg.path) || undefined;
|
|
1886
1889
|
|
|
1887
1890
|
while (!this._shuttingDown && !this._stoppedAgents.has(name)) {
|
|
1888
1891
|
try {
|
|
@@ -2053,7 +2056,10 @@ async _runNodeCommand(n, cmd) {
|
|
|
2053
2056
|
// explicit `path`, adapters used to fall back to process.cwd(), which on
|
|
2054
2057
|
// a packaged Windows launcher is C:\WINDOWS\system32 — so writing
|
|
2055
2058
|
// .claude/skills there failed with EPERM. Root it under ~/.openagents.
|
|
2056
|
-
|
|
2059
|
+
// resolveAgentWorkdir: an agent saved with a relative path (older
|
|
2060
|
+
// launchers stored the web form's text verbatim) runs from the home
|
|
2061
|
+
// directory instead of failing on every write.
|
|
2062
|
+
workingDir: resolveAgentWorkdir(agentCfg.path) || defaultAgentWorkdir(name),
|
|
2057
2063
|
toolMode: agentCfg.tool_mode || 'skills',
|
|
2058
2064
|
// The conversation `agn join` created this agent from (Claude Code).
|
|
2059
2065
|
seedSession: agentCfg.seed_session || null,
|
package/src/paths.js
CHANGED
|
@@ -1095,6 +1095,31 @@ function defaultAgentWorkdir(agentName) {
|
|
|
1095
1095
|
return dir;
|
|
1096
1096
|
}
|
|
1097
1097
|
|
|
1098
|
+
/**
|
|
1099
|
+
* The folder an agent's configured `path` names, as an absolute path.
|
|
1100
|
+
*
|
|
1101
|
+
* A path typed in the web form reaches the daemon verbatim, and a bare name
|
|
1102
|
+
* such as `my-agent` used to be stored as-is — relative to whatever the
|
|
1103
|
+
* daemon's cwd happened to be (`/` for a packaged Mac launcher,
|
|
1104
|
+
* C:\WINDOWS\system32 on Windows). Every run then failed on its first write:
|
|
1105
|
+
* `ENOENT: no such file or directory, mkdir 'my-agent/.claude/skills/…'`.
|
|
1106
|
+
*
|
|
1107
|
+
* A relative path is taken from the home directory, where a fresh terminal
|
|
1108
|
+
* starts, and a leading `~` is expanded. Empty input returns null so callers
|
|
1109
|
+
* keep their own default.
|
|
1110
|
+
*/
|
|
1111
|
+
function resolveAgentWorkdir(input, home = os.homedir()) {
|
|
1112
|
+
const raw = String(input == null ? '' : input).trim();
|
|
1113
|
+
if (!raw) return null;
|
|
1114
|
+
// An absolute path is returned as typed: normalizing it would rewrite the
|
|
1115
|
+
// separators of a path saved on another OS (`/home/me/proj` reads back as
|
|
1116
|
+
// `\home\me\proj` on Windows) and show the user a folder they never set.
|
|
1117
|
+
if (path.isAbsolute(raw)) return raw;
|
|
1118
|
+
if (raw === '~') return home;
|
|
1119
|
+
if (/^~[\\/]/.test(raw)) return path.join(home, raw.slice(2));
|
|
1120
|
+
return path.join(home, raw);
|
|
1121
|
+
}
|
|
1122
|
+
|
|
1098
1123
|
/**
|
|
1099
1124
|
* Reset the two 30s caches that back binary detection. Call this after
|
|
1100
1125
|
* install / uninstall so a freshly-created bin dir (e.g. ~/.cursor/bin)
|
|
@@ -1356,6 +1381,7 @@ module.exports = {
|
|
|
1356
1381
|
getRuntimePrefix,
|
|
1357
1382
|
getCorePrefix,
|
|
1358
1383
|
defaultAgentWorkdir,
|
|
1384
|
+
resolveAgentWorkdir,
|
|
1359
1385
|
aiderBinDirs,
|
|
1360
1386
|
uvToolBinDirs,
|
|
1361
1387
|
IS_WINDOWS,
|