cli-jaw 2.2.18 → 2.2.20
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/README.md +106 -3
- package/dist/bin/cli-jaw.js +1 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/dispatch.js +14 -4
- package/dist/bin/commands/dispatch.js.map +1 -1
- package/dist/bin/commands/service.js +322 -222
- package/dist/bin/commands/service.js.map +1 -1
- package/dist/bin/postinstall.js +20 -4
- package/dist/bin/postinstall.js.map +1 -1
- package/dist/server.js +39 -2
- package/dist/server.js.map +1 -1
- package/dist/src/agent/spawn/process-kill.js +96 -2
- package/dist/src/agent/spawn/process-kill.js.map +1 -1
- package/dist/src/agent/spawn.js +35 -77
- package/dist/src/agent/spawn.js.map +1 -1
- package/dist/src/bgtask/runner.js +26 -21
- package/dist/src/bgtask/runner.js.map +1 -1
- package/dist/src/cli/acp-client.js +11 -5
- package/dist/src/cli/acp-client.js.map +1 -1
- package/dist/src/cli/cli-status-worker.js +59 -6
- package/dist/src/cli/cli-status-worker.js.map +1 -1
- package/dist/src/cli/employee-handler.js +3 -2
- package/dist/src/cli/employee-handler.js.map +1 -1
- package/dist/src/code-mode/acp-host.js +22 -10
- package/dist/src/code-mode/acp-host.js.map +1 -1
- package/dist/src/core/cli-detect.js +54 -8
- package/dist/src/core/cli-detect.js.map +1 -1
- package/dist/src/core/config.js +24 -0
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +16 -0
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/employees.js +22 -4
- package/dist/src/core/employees.js.map +1 -1
- package/dist/src/core/instance-lifecycle.js +120 -0
- package/dist/src/core/instance-lifecycle.js.map +1 -0
- package/dist/src/core/runtime-path.js +92 -12
- package/dist/src/core/runtime-path.js.map +1 -1
- package/dist/src/core/runtime-settings.js +4 -1
- package/dist/src/core/runtime-settings.js.map +1 -1
- package/dist/src/core/settings-watch.js +12 -1
- package/dist/src/core/settings-watch.js.map +1 -1
- package/dist/src/core/windows-shell.js +63 -0
- package/dist/src/core/windows-shell.js.map +1 -0
- package/dist/src/discord/bot.js +199 -147
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/gateway-supervisor.js +303 -0
- package/dist/src/discord/gateway-supervisor.js.map +1 -0
- package/dist/src/discord/rest-scheduler.js +448 -0
- package/dist/src/discord/rest-scheduler.js.map +1 -0
- package/dist/src/discord/send-only-client.js +59 -43
- package/dist/src/discord/send-only-client.js.map +1 -1
- package/dist/src/manager/lifecycle.js +7 -2
- package/dist/src/manager/lifecycle.js.map +1 -1
- package/dist/src/manager/notes/capabilities.js +9 -7
- package/dist/src/manager/notes/capabilities.js.map +1 -1
- package/dist/src/memory/bootstrap.js +5 -1
- package/dist/src/memory/bootstrap.js.map +1 -1
- package/dist/src/memory/host-toolchain.js +156 -0
- package/dist/src/memory/host-toolchain.js.map +1 -0
- package/dist/src/messaging/channel-capabilities.js +30 -0
- package/dist/src/messaging/channel-capabilities.js.map +1 -0
- package/dist/src/messaging/delivery-outcome.js +73 -0
- package/dist/src/messaging/delivery-outcome.js.map +1 -0
- package/dist/src/messaging/draft-stream.js +154 -0
- package/dist/src/messaging/draft-stream.js.map +1 -0
- package/dist/src/messaging/runtime.js +3 -9
- package/dist/src/messaging/runtime.js.map +1 -1
- package/dist/src/messaging/send.js +40 -8
- package/dist/src/messaging/send.js.map +1 -1
- package/dist/src/messaging/types.js +22 -1
- package/dist/src/messaging/types.js.map +1 -1
- package/dist/src/notes/search.js +31 -6
- package/dist/src/notes/search.js.map +1 -1
- package/dist/src/prompt/builder.js +169 -13
- package/dist/src/prompt/builder.js.map +1 -1
- package/dist/src/prompt/conversation-context.js +23 -0
- package/dist/src/prompt/conversation-context.js.map +1 -0
- package/dist/src/prompt/templates/a1-system.md +28 -12
- package/dist/src/prompt/templates/control-system.md +19 -6
- package/dist/src/prompt/templates/employee.md +16 -3
- package/dist/src/routes/settings.js +8 -1
- package/dist/src/routes/settings.js.map +1 -1
- package/dist/src/routes/system.js +5 -1
- package/dist/src/routes/system.js.map +1 -1
- package/dist/src/routes/wiki.js +17 -12
- package/dist/src/routes/wiki.js.map +1 -1
- package/dist/src/search/coordinator.js +13 -5
- package/dist/src/search/coordinator.js.map +1 -1
- package/dist/src/search/provider.js.map +1 -1
- package/dist/src/search/providers/wiki.js +17 -9
- package/dist/src/search/providers/wiki.js.map +1 -1
- package/dist/src/security/path-guards.js +124 -27
- package/dist/src/security/path-guards.js.map +1 -1
- package/dist/src/slack/api.js +38 -5
- package/dist/src/slack/api.js.map +1 -1
- package/dist/src/slack/bot.js +214 -35
- package/dist/src/slack/bot.js.map +1 -1
- package/dist/src/slack/context.js +192 -0
- package/dist/src/slack/context.js.map +1 -0
- package/dist/src/slack/conversation.js +275 -0
- package/dist/src/slack/conversation.js.map +1 -0
- package/dist/src/slack/enrichment-cache.js +334 -0
- package/dist/src/slack/enrichment-cache.js.map +1 -0
- package/dist/src/slack/history.js +47 -8
- package/dist/src/slack/history.js.map +1 -1
- package/dist/src/slack/identity.js +99 -190
- package/dist/src/slack/identity.js.map +1 -1
- package/dist/src/slack/ingress.js +78 -2
- package/dist/src/slack/ingress.js.map +1 -1
- package/dist/src/slack/manifest.js +14 -3
- package/dist/src/slack/manifest.js.map +1 -1
- package/dist/src/slack/progress.js +39 -51
- package/dist/src/slack/progress.js.map +1 -1
- package/dist/src/slack/thread-tracker.js +78 -0
- package/dist/src/slack/thread-tracker.js.map +1 -1
- package/dist/src/telegram/bot.js +105 -56
- package/dist/src/telegram/bot.js.map +1 -1
- package/dist/src/telegram/update-offset.js +152 -0
- package/dist/src/telegram/update-offset.js.map +1 -0
- package/dist/src/wiki/config.js +42 -14
- package/dist/src/wiki/config.js.map +1 -1
- package/dist/src/wiki/prompt.js +2 -2
- package/dist/src/wiki/prompt.js.map +1 -1
- package/package.json +1 -1
- package/public/dist/assets/Agent-C5EvX-_v.js +1 -0
- package/public/dist/assets/{app-DqSJmDwP.js → app-is76CHGZ.js} +4 -4
- package/public/dist/assets/{bgtask-badge-D6XYRFI5.js → bgtask-badge-B0B1nXUs.js} +1 -1
- package/public/dist/assets/bgtask-badge-B2jUZ5mC.js +1 -0
- package/public/dist/assets/{employees-B_wKPfTO.js → employees-eiW0cC8z.js} +1 -1
- package/public/dist/assets/{iframe-renderer-D1-zDg8V.js → iframe-renderer-C7qQJX4c.js} +2 -2
- package/public/dist/assets/iframe-renderer-D7PB_yrC.js +1 -0
- package/public/dist/assets/{manager-Bjuh1jpq.js → manager-CP-Au860.js} +1 -1
- package/public/dist/assets/{memory-CNUpXWEC.js → memory--Q8Tb5SZ.js} +1 -1
- package/public/dist/assets/memory-rsKN0aa2.js +1 -0
- package/public/dist/assets/message-history-BttkY77h.js +1 -0
- package/public/dist/assets/{message-history-DB1rynP-.js → message-history-CfAHmCDW.js} +1 -1
- package/public/dist/assets/{render-DXwQzjsJ.js → render-BDso7Yb5.js} +1 -1
- package/public/dist/assets/{settings-CXndjCad.js → settings-CqnIqxkG.js} +1 -1
- package/public/dist/assets/{settings-core-t5yYVRrv.js → settings-core-BxuFkt4a.js} +4 -4
- package/public/dist/assets/settings-core-CdZ7oKhM.js +1 -0
- package/public/dist/assets/settings-pPMHNs0G.js +1 -0
- package/public/dist/assets/{sidebar-DgIj-LuT.js → sidebar-BNT58qR0.js} +3 -3
- package/public/dist/assets/{skills-QqxjqDHg.js → skills-CwRBcm3m.js} +1 -1
- package/public/dist/assets/skills-DiVoaVdS.js +1 -0
- package/public/dist/assets/slash-commands-Bx4saHwR.js +1 -0
- package/public/dist/assets/{slash-commands-B2V_jngP.js → slash-commands-cm0U58n7.js} +1 -1
- package/public/dist/assets/{trace-drawer-CBe9nRjS.js → trace-drawer-BuwO4m2P.js} +1 -1
- package/public/dist/assets/{ui-CDozpEQt.js → ui-C-LHMki1.js} +1 -1
- package/public/dist/assets/ui-XPQDPe-5.js +1 -0
- package/public/dist/index.html +1 -1
- package/public/dist/manager/index.html +1 -1
- package/public/js/features/channel-onboarding.ts +8 -5
- package/public/locales/en.json +3 -2
- package/public/locales/ja.json +3 -2
- package/public/locales/ko.json +3 -2
- package/public/locales/zh.json +3 -2
- package/public/manager/src/settings/cli-status-polling.ts +84 -0
- package/public/manager/src/settings/pages/Agent.tsx +84 -5
- package/scripts/install-officecli.ps1 +38 -2
- package/scripts/install-officecli.sh +28 -0
- package/scripts/install.ps1 +1 -1
- package/public/dist/assets/Agent-nMPZsMfN.js +0 -1
- package/public/dist/assets/bgtask-badge-CjWz0F6U.js +0 -1
- package/public/dist/assets/iframe-renderer-qRVLHPnT.js +0 -1
- package/public/dist/assets/memory-CcWGiPy_.js +0 -1
- package/public/dist/assets/message-history-BamMPUnL.js +0 -1
- package/public/dist/assets/settings-RGpifFHy.js +0 -1
- package/public/dist/assets/settings-core-X_5UHfr3.js +0 -1
- package/public/dist/assets/skills-CbwIimit.js +0 -1
- package/public/dist/assets/slash-commands-tCNRlNTC.js +0 -1
- package/public/dist/assets/ui-o-VpvrSv.js +0 -1
|
@@ -12,6 +12,20 @@ export const DEFAULT_EMPLOYEES = [
|
|
|
12
12
|
{ name: 'Backend', role: 'API, DB, server logic' },
|
|
13
13
|
{ name: 'Docs', role: 'Documentation, README, API docs' },
|
|
14
14
|
];
|
|
15
|
+
/**
|
|
16
|
+
* A boolean cannot express `darwin | win32`. Rather than let the legacy field
|
|
17
|
+
* drift from the real constraint, we compute it: it is true only when darwin is
|
|
18
|
+
* the sole supported platform. Enforcement itself never reads it — that is
|
|
19
|
+
* `checkRuntimeHints`, which the dispatch route turns into a 412.
|
|
20
|
+
*/
|
|
21
|
+
export function withDerivedRuntimeHints(hints) {
|
|
22
|
+
if (!hints)
|
|
23
|
+
return hints;
|
|
24
|
+
const platforms = hints.supportedPlatforms;
|
|
25
|
+
if (!platforms || platforms.length === 0)
|
|
26
|
+
return hints;
|
|
27
|
+
return { ...hints, requiresDarwin: platforms.length === 1 && platforms[0] === 'darwin' };
|
|
28
|
+
}
|
|
15
29
|
function resumeKeyPart(value) {
|
|
16
30
|
return String(value ?? '');
|
|
17
31
|
}
|
|
@@ -103,7 +117,10 @@ export const STATIC_EMPLOYEES = [
|
|
|
103
117
|
skills: ['desktop-control', 'screen-capture', 'codex-imagegen'],
|
|
104
118
|
systemPromptPatchFile: 'control-system.md',
|
|
105
119
|
runtimeHints: {
|
|
106
|
-
|
|
120
|
+
// Computer Use runs on macOS (app-scoped API) and on Windows
|
|
121
|
+
// (window-scoped API). Linux and WSL have no Computer Use host, and
|
|
122
|
+
// a WSL process reports `linux`, so both stay denied. See #308.
|
|
123
|
+
supportedPlatforms: ['darwin', 'win32'],
|
|
107
124
|
},
|
|
108
125
|
delegation: {
|
|
109
126
|
mode: 'preferred_for_long_sessions',
|
|
@@ -126,8 +143,9 @@ export function checkRuntimeHints(spec, platform = process.platform) {
|
|
|
126
143
|
const hints = spec.runtimeHints;
|
|
127
144
|
if (!hints)
|
|
128
145
|
return out;
|
|
129
|
-
|
|
130
|
-
|
|
146
|
+
const platforms = hints.supportedPlatforms;
|
|
147
|
+
if (platforms && platforms.length > 0 && !platforms.includes(platform)) {
|
|
148
|
+
out.fail.push(`${spec.name} supports ${platforms.join(', ')} (current: ${platform})`);
|
|
131
149
|
}
|
|
132
150
|
return out;
|
|
133
151
|
}
|
|
@@ -202,7 +220,7 @@ export async function listEmployees() {
|
|
|
202
220
|
model,
|
|
203
221
|
role: s.description,
|
|
204
222
|
source: 'static',
|
|
205
|
-
runtimeHints: s.runtimeHints,
|
|
223
|
+
runtimeHints: withDerivedRuntimeHints(s.runtimeHints),
|
|
206
224
|
skills: s.skills,
|
|
207
225
|
systemPromptPatchFile: s.systemPromptPatchFile,
|
|
208
226
|
delegation: s.delegation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"employees.js","sourceRoot":"","sources":["../../../src/core/employees.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,qEAAqE;AAErE,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,EAAE,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAC3H,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,wBAAwB,EAAE;IACpD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,uBAAuB,EAAE;IAClD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iCAAiC,EAAE;CAC5D,CAAC;
|
|
1
|
+
{"version":3,"file":"employees.js","sourceRoot":"","sources":["../../../src/core/employees.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import { dirname } from 'node:path';
|
|
4
|
+
import { PIDFILE_PATH } from './config.js';
|
|
5
|
+
export function probePid(pid, kill = process.kill) {
|
|
6
|
+
if (!Number.isInteger(pid) || pid <= 0)
|
|
7
|
+
return { status: 'dead' };
|
|
8
|
+
try {
|
|
9
|
+
kill(pid, 0);
|
|
10
|
+
return { status: 'alive' };
|
|
11
|
+
}
|
|
12
|
+
catch (error) {
|
|
13
|
+
const code = error.code ?? '';
|
|
14
|
+
return code === 'EPERM' ? { status: 'permission-denied', code } : { status: 'dead' };
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
const SOURCES = new Set(['linux-proc', 'macos-ps', 'windows-filetime']);
|
|
18
|
+
function readPidfile(deps) {
|
|
19
|
+
const raw = deps.readFile(PIDFILE_PATH);
|
|
20
|
+
if (raw === null)
|
|
21
|
+
return null;
|
|
22
|
+
try {
|
|
23
|
+
const r = JSON.parse(raw);
|
|
24
|
+
const s = r.startedAt;
|
|
25
|
+
if (!Number.isInteger(r.pid) || (r.pid ?? 0) <= 0 || !Number.isInteger(r.port) || (r.port ?? 0) <= 0)
|
|
26
|
+
return null;
|
|
27
|
+
if (!s || typeof s.value !== 'string' || !s.value || !SOURCES.has(String(s.source)))
|
|
28
|
+
return null;
|
|
29
|
+
if (typeof r.home !== 'string' || !r.home || typeof r.version !== 'string' || !r.version)
|
|
30
|
+
return null;
|
|
31
|
+
return r;
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function sameStartTime(a, b) {
|
|
38
|
+
return a.source === b.source && a.value === b.value;
|
|
39
|
+
}
|
|
40
|
+
export function verifyOwnership(home, deps) {
|
|
41
|
+
const record = readPidfile(deps);
|
|
42
|
+
if (!record)
|
|
43
|
+
return { status: 'no-pidfile' };
|
|
44
|
+
if (record.home !== home)
|
|
45
|
+
return { status: 'foreign', record, reason: `pidfile belongs to ${record.home}` };
|
|
46
|
+
const probe = deps.probe(record.pid);
|
|
47
|
+
if (probe.status === 'dead')
|
|
48
|
+
return { status: 'already-stopped', record };
|
|
49
|
+
if (probe.status === 'permission-denied')
|
|
50
|
+
return { status: 'permission-denied', record };
|
|
51
|
+
const actual = deps.processStartedAt(record.pid);
|
|
52
|
+
if (!actual)
|
|
53
|
+
return { status: 'unverifiable', record, reason: `OS start time unavailable for pid ${record.pid}` };
|
|
54
|
+
if (!sameStartTime(record.startedAt, actual))
|
|
55
|
+
return { status: 'stale', record, reason: `pid ${record.pid} start time does not match the pidfile` };
|
|
56
|
+
return { status: 'owned', record };
|
|
57
|
+
}
|
|
58
|
+
export function writePidfile(record, deps) {
|
|
59
|
+
deps.writeFileAtomic(PIDFILE_PATH, `${JSON.stringify(record, null, 2)}\n`);
|
|
60
|
+
}
|
|
61
|
+
export function clearPidfileIfOurs(record, deps) {
|
|
62
|
+
const current = readPidfile(deps);
|
|
63
|
+
if (!current || current.pid !== record.pid || !sameStartTime(current.startedAt, record.startedAt))
|
|
64
|
+
return false;
|
|
65
|
+
deps.removeFile(PIDFILE_PATH);
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
export function parseWindowsStartTime(raw) {
|
|
69
|
+
const value = raw.trim();
|
|
70
|
+
return /^\d+$/.test(value) ? { value, source: 'windows-filetime' } : null;
|
|
71
|
+
}
|
|
72
|
+
export function parsePosixStartTime(raw) {
|
|
73
|
+
const parsed = Date.parse(raw.trim());
|
|
74
|
+
return Number.isFinite(parsed) ? { value: String(Math.trunc(parsed / 1000) * 1000), source: 'macos-ps' } : null;
|
|
75
|
+
}
|
|
76
|
+
function parseLinuxStartTime(raw) {
|
|
77
|
+
const end = raw.lastIndexOf(')');
|
|
78
|
+
const value = end < 0 ? undefined : raw.slice(end + 1).trim().split(/\s+/)[19];
|
|
79
|
+
return value && /^\d+$/.test(value) ? { value, source: 'linux-proc' } : null;
|
|
80
|
+
}
|
|
81
|
+
export function processStartedAt(pid) {
|
|
82
|
+
if (!Number.isInteger(pid) || pid <= 0)
|
|
83
|
+
return null;
|
|
84
|
+
try {
|
|
85
|
+
if (process.platform === 'linux')
|
|
86
|
+
return parseLinuxStartTime(fs.readFileSync(`/proc/${pid}/stat`, 'utf8'));
|
|
87
|
+
if (process.platform === 'darwin')
|
|
88
|
+
return parsePosixStartTime(execFileSync('ps', ['-o', 'lstart=', '-p', String(pid)], { encoding: 'utf8', env: { ...process.env, LC_ALL: 'C' } }));
|
|
89
|
+
if (process.platform === 'win32')
|
|
90
|
+
return parseWindowsStartTime(execFileSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', `(Get-Process -Id ${pid}).StartTime.ToFileTimeUtc()`], { encoding: 'utf8' }));
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
export const defaultLifecycleDeps = {
|
|
98
|
+
readFile: path => { try {
|
|
99
|
+
return fs.readFileSync(path, 'utf8');
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
return null;
|
|
103
|
+
} },
|
|
104
|
+
writeFileAtomic: (path, data) => {
|
|
105
|
+
fs.mkdirSync(dirname(path), { recursive: true });
|
|
106
|
+
const tmp = `${path}.tmp-${process.pid}`;
|
|
107
|
+
fs.writeFileSync(tmp, data, { mode: 0o600 });
|
|
108
|
+
fs.renameSync(tmp, path);
|
|
109
|
+
},
|
|
110
|
+
removeFile: path => { try {
|
|
111
|
+
fs.unlinkSync(path);
|
|
112
|
+
}
|
|
113
|
+
catch (error) {
|
|
114
|
+
if (error.code !== 'ENOENT')
|
|
115
|
+
throw error;
|
|
116
|
+
} },
|
|
117
|
+
probe: pid => probePid(pid),
|
|
118
|
+
processStartedAt,
|
|
119
|
+
};
|
|
120
|
+
//# sourceMappingURL=instance-lifecycle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instance-lifecycle.js","sourceRoot":"","sources":["../../../src/core/instance-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,96 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import os from 'node:os';
|
|
3
|
-
import { basename,
|
|
4
|
-
function uniquePaths(paths) {
|
|
3
|
+
import { basename, dirname, join, resolve, win32 as pathWin32 } from 'node:path';
|
|
4
|
+
function uniquePaths(paths, caseInsensitive = false) {
|
|
5
5
|
const seen = new Set();
|
|
6
6
|
const out = [];
|
|
7
7
|
for (const entry of paths) {
|
|
8
8
|
const trimmed = String(entry || '').trim();
|
|
9
|
-
if (!trimmed
|
|
9
|
+
if (!trimmed)
|
|
10
10
|
continue;
|
|
11
|
-
|
|
11
|
+
const key = caseInsensitive ? trimmed.toLowerCase() : trimmed;
|
|
12
|
+
if (seen.has(key))
|
|
13
|
+
continue;
|
|
14
|
+
seen.add(key);
|
|
12
15
|
out.push(trimmed);
|
|
13
16
|
}
|
|
14
17
|
return out;
|
|
15
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* Split a PATH string using the delimiter its producer actually used.
|
|
21
|
+
*
|
|
22
|
+
* A win32 process can inherit a POSIX-delimited PATH from MSYS/git-bash.
|
|
23
|
+
* Splitting that on ';' yields one giant entry that resolves nothing (#273).
|
|
24
|
+
*
|
|
25
|
+
* Colon splitting has one ambiguity: 'C:\x' contains a delimiter-looking
|
|
26
|
+
* colon. Splitting on ':' turns it into ['C', '\x'], so any single-letter
|
|
27
|
+
* fragment followed by a non-empty fragment is rejoined. The rejoin does NOT
|
|
28
|
+
* require a leading separator: 'C:tools' and 'C:.\node_modules\.bin' are
|
|
29
|
+
* drive-RELATIVE and equally valid Windows PATH entries.
|
|
30
|
+
* A whole-string "every part starts with /" test is NOT enough: a real
|
|
31
|
+
* git-bash PATH mixes POSIX entries with inherited Windows ones, e.g.
|
|
32
|
+
* '/mingw64/bin:/usr/bin:C:\\Users\\u\\AppData\\Roaming\\npm'.
|
|
33
|
+
*/
|
|
34
|
+
export function splitPathList(raw, platform = process.platform) {
|
|
35
|
+
const value = String(raw || '').trim();
|
|
36
|
+
if (!value)
|
|
37
|
+
return [];
|
|
38
|
+
if (platform !== 'win32')
|
|
39
|
+
return value.split(':').map(s => s.trim()).filter(Boolean);
|
|
40
|
+
// A semicolon is unambiguous on Windows: the producer used the native
|
|
41
|
+
// delimiter, so no colon interpretation is needed.
|
|
42
|
+
if (value.includes(';'))
|
|
43
|
+
return value.split(';').map(s => s.trim()).filter(Boolean);
|
|
44
|
+
if (!value.includes(':'))
|
|
45
|
+
return [value];
|
|
46
|
+
const raws = value.split(':');
|
|
47
|
+
const out = [];
|
|
48
|
+
for (let i = 0; i < raws.length; i++) {
|
|
49
|
+
const part = (raws[i] ?? '').trim();
|
|
50
|
+
if (!part)
|
|
51
|
+
continue;
|
|
52
|
+
const next = raws[i + 1];
|
|
53
|
+
// Rejoin any drive-qualified entry, absolute ('C:\tools') or
|
|
54
|
+
// drive-relative ('C:tools', 'C:.\node_modules\.bin'). Windows accepts
|
|
55
|
+
// both, and path.win32.resolve treats the latter as a real path, so a
|
|
56
|
+
// rejoin rule that only accepted a following separator would split one
|
|
57
|
+
// valid entry into two invalid ones.
|
|
58
|
+
if (/^[A-Za-z]$/.test(part) && next !== undefined && next !== '') {
|
|
59
|
+
out.push(`${part}:${next.trim()}`);
|
|
60
|
+
i++;
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
out.push(part);
|
|
64
|
+
}
|
|
65
|
+
return out.filter(Boolean);
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Windows system directories a spawned process cannot work without.
|
|
69
|
+
*
|
|
70
|
+
* Omitting System32 is what #294 reported: without it the agent cannot
|
|
71
|
+
* resolve powershell, where, or cmd, and silently works around the gap.
|
|
72
|
+
*/
|
|
73
|
+
function windowsSystemDirs(env) {
|
|
74
|
+
const systemRoot = env['SystemRoot'] || env['windir'] || 'C:\\WINDOWS';
|
|
75
|
+
const system32 = pathWin32.join(systemRoot, 'System32');
|
|
76
|
+
return [
|
|
77
|
+
system32,
|
|
78
|
+
systemRoot,
|
|
79
|
+
pathWin32.join(system32, 'Wbem'),
|
|
80
|
+
pathWin32.join(system32, 'WindowsPowerShell', 'v1.0'),
|
|
81
|
+
];
|
|
82
|
+
}
|
|
83
|
+
function windowsUserDirs(env, homeDir) {
|
|
84
|
+
const appData = env['APPDATA'] || pathWin32.join(homeDir, 'AppData', 'Roaming');
|
|
85
|
+
const localAppData = env['LOCALAPPDATA'] || pathWin32.join(homeDir, 'AppData', 'Local');
|
|
86
|
+
return [
|
|
87
|
+
pathWin32.join(appData, 'npm'),
|
|
88
|
+
pathWin32.join(localAppData, 'Microsoft', 'WindowsApps'),
|
|
89
|
+
pathWin32.join(homeDir, '.local', 'bin'),
|
|
90
|
+
pathWin32.join(homeDir, '.cargo', 'bin'),
|
|
91
|
+
pathWin32.join(homeDir, '.bun', 'bin'),
|
|
92
|
+
];
|
|
93
|
+
}
|
|
16
94
|
function listManagedNodeBins(homeDir) {
|
|
17
95
|
const out = [];
|
|
18
96
|
for (const root of [
|
|
@@ -52,13 +130,11 @@ export function resolveBundledNodePath(anchorPath = process.argv[1] || '', platf
|
|
|
52
130
|
dir = parent;
|
|
53
131
|
}
|
|
54
132
|
}
|
|
55
|
-
export function buildServicePath(seedPath = process.env["PATH"] || '', extraDirs = [], homeDir = os.homedir()) {
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const defaults = [
|
|
61
|
-
dirname(process.execPath),
|
|
133
|
+
export function buildServicePath(seedPath = process.env["PATH"] || '', extraDirs = [], homeDir = os.homedir(), platform = process.platform, env = process.env) {
|
|
134
|
+
const isWindows = platform === 'win32';
|
|
135
|
+
const seeded = splitPathList(seedPath, platform);
|
|
136
|
+
const common = [dirname(process.execPath)];
|
|
137
|
+
const unixDefaults = [
|
|
62
138
|
join(homeDir, '.local', 'bin'),
|
|
63
139
|
join(homeDir, '.claude', 'local', 'bin'),
|
|
64
140
|
join(homeDir, 'bin'),
|
|
@@ -86,6 +162,10 @@ export function buildServicePath(seedPath = process.env["PATH"] || '', extraDirs
|
|
|
86
162
|
'/sbin',
|
|
87
163
|
...listManagedNodeBins(homeDir),
|
|
88
164
|
];
|
|
89
|
-
|
|
165
|
+
const defaults = isWindows
|
|
166
|
+
? [...common, ...windowsSystemDirs(env), ...windowsUserDirs(env, homeDir)]
|
|
167
|
+
: [...common, ...unixDefaults];
|
|
168
|
+
const listDelimiter = isWindows ? ';' : ':';
|
|
169
|
+
return uniquePaths([...seeded, ...extraDirs, ...defaults], isWindows).join(listDelimiter);
|
|
90
170
|
}
|
|
91
171
|
//# sourceMappingURL=runtime-path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-path.js","sourceRoot":"","sources":["../../../src/core/runtime-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"runtime-path.js","sourceRoot":"","sources":["../../../src/core/runtime-path.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { loadUnifiedMcp, syncToAll, ensureWorkingDirSkillsLinks, initMcpConfig, } from '../../lib/mcp-sync.js';
|
|
2
2
|
import { syncCodexContextWindow } from './codex-config.js';
|
|
3
|
-
import { settings, persistAndCommit, snapshotSettingsState, migrateSettings, normalizeProjectDirs, RUNTIME_DEFAULT_MIGRATION_ID, MULTI_SESSION_DEFAULT_MIGRATION_ID, slackEnvironmentManagedPatchPaths, } from './config.js';
|
|
3
|
+
import { settings, persistAndCommit, snapshotSettingsState, migrateSettings, normalizeProjectDirs, RUNTIME_DEFAULT_MIGRATION_ID, MULTI_SESSION_DEFAULT_MIGRATION_ID, slackEnvironmentManagedPatchPaths, wikiRouteManagedPatchPaths, } from './config.js';
|
|
4
4
|
import { broadcast } from './bus.js';
|
|
5
5
|
import { syncMainSessionToSettings } from './main-session.js';
|
|
6
6
|
import { mergeSettingsPatch, sanitizeSettingsInput } from './settings-merge.js';
|
|
@@ -264,6 +264,9 @@ async function applyRuntimeSettingsPatchSerialised(rawPatch = {}, opts = {}) {
|
|
|
264
264
|
throw new Error('invalid_settings_field');
|
|
265
265
|
}
|
|
266
266
|
const patch = sanitized.value;
|
|
267
|
+
if (!opts.allowWikiLifecycle && wikiRouteManagedPatchPaths(patch).length > 0) {
|
|
268
|
+
throw new Error('wiki_configuration_requires_wiki_route');
|
|
269
|
+
}
|
|
267
270
|
if (slackEnvironmentManagedPatchPaths(patch).length > 0) {
|
|
268
271
|
throw new Error('slack_connection_managed_by_environment');
|
|
269
272
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-settings.js","sourceRoot":"","sources":["../../../src/core/runtime-settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runtime-settings.js","sourceRoot":"","sources":["../../../src/core/runtime-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// in-memory reload + broadcast.
|
|
8
8
|
import fs from 'node:fs';
|
|
9
9
|
import path from 'node:path';
|
|
10
|
-
import { SETTINGS_PATH, settings, replaceSettings, migrateSettings, normalizeProjectDirs, getLastSavedSettingsRaw, slackEnvironmentManagedPatchPaths, slackEnvironmentManagedSettingKeys, } from './config.js';
|
|
10
|
+
import { SETTINGS_PATH, settings, replaceSettings, migrateSettings, normalizeProjectDirs, getLastSavedSettingsRaw, slackEnvironmentManagedPatchPaths, slackEnvironmentManagedSettingKeys, wikiRouteManagedPatchPaths, WIKI_ROUTE_MANAGED_SETTING_KEYS, } from './config.js';
|
|
11
11
|
import { mergeSettingsPatch, sanitizeSettingsInput } from './settings-merge.js';
|
|
12
12
|
import { broadcast } from './bus.js';
|
|
13
13
|
export const SETTINGS_WATCH_DEBOUNCE_MS = 300;
|
|
@@ -70,6 +70,17 @@ export function reloadSettingsFromDisk(options = {}) {
|
|
|
70
70
|
console.warn(`[settings-watch] ignored invalid settings fields: ${sanitized.invalidPaths.join(', ')}`);
|
|
71
71
|
}
|
|
72
72
|
const externalPatch = { ...sanitized.value };
|
|
73
|
+
const wikiManagedPaths = wikiRouteManagedPatchPaths(externalPatch);
|
|
74
|
+
if (wikiManagedPaths.length > 0) {
|
|
75
|
+
const wiki = { ...externalPatch['wiki'] };
|
|
76
|
+
for (const key of WIKI_ROUTE_MANAGED_SETTING_KEYS)
|
|
77
|
+
delete wiki[key];
|
|
78
|
+
if (Object.keys(wiki).length > 0)
|
|
79
|
+
externalPatch['wiki'] = wiki;
|
|
80
|
+
else
|
|
81
|
+
delete externalPatch['wiki'];
|
|
82
|
+
console.warn(`[settings-watch] ignored wiki route-managed settings fields: ${wikiManagedPaths.join(', ')}`);
|
|
83
|
+
}
|
|
73
84
|
const environmentManagedSlackPaths = slackEnvironmentManagedPatchPaths(externalPatch);
|
|
74
85
|
if (environmentManagedSlackPaths.length > 0) {
|
|
75
86
|
const slack = { ...externalPatch["slack"] };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-watch.js","sourceRoot":"","sources":["../../../src/core/settings-watch.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,sEAAsE;AACtE,uEAAuE;AACvE,sEAAsE;AACtE,yEAAyE;AACzE,wEAAwE;AACxE,gCAAgC;AAEhC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACH,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EACzD,oBAAoB,EAAE,uBAAuB,EAC7C,iCAAiC,EAAE,kCAAkC,
|
|
1
|
+
{"version":3,"file":"settings-watch.js","sourceRoot":"","sources":["../../../src/core/settings-watch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { win32 as pathWin32 } from 'node:path';
|
|
4
|
+
const defaultProbes = {
|
|
5
|
+
commandExists(command) {
|
|
6
|
+
try {
|
|
7
|
+
execFileSync('where.exe', [command], {
|
|
8
|
+
stdio: 'ignore',
|
|
9
|
+
timeout: 2_000,
|
|
10
|
+
windowsHide: true,
|
|
11
|
+
});
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
pathExists(candidate) {
|
|
19
|
+
return existsSync(candidate);
|
|
20
|
+
},
|
|
21
|
+
env: process.env,
|
|
22
|
+
};
|
|
23
|
+
export function windowsGitBashPaths(env = process.env) {
|
|
24
|
+
const candidates = [
|
|
25
|
+
env['ProgramW6432'],
|
|
26
|
+
env['ProgramFiles'],
|
|
27
|
+
env['ProgramFiles(x86)'],
|
|
28
|
+
'C:\\Program Files',
|
|
29
|
+
'C:\\Program Files (x86)',
|
|
30
|
+
]
|
|
31
|
+
.filter((root) => Boolean(root))
|
|
32
|
+
.map(root => pathWin32.join(root, 'Git', 'bin', 'bash.exe'));
|
|
33
|
+
if (env['LOCALAPPDATA']) {
|
|
34
|
+
candidates.push(pathWin32.join(env['LOCALAPPDATA'], 'Programs', 'Git', 'bin', 'bash.exe'));
|
|
35
|
+
}
|
|
36
|
+
return [...new Set(candidates)];
|
|
37
|
+
}
|
|
38
|
+
export function detectWindowsShell(probes = {}) {
|
|
39
|
+
const commandExists = probes.commandExists ?? defaultProbes.commandExists;
|
|
40
|
+
const pathExists = probes.pathExists ?? defaultProbes.pathExists;
|
|
41
|
+
const env = probes.env ?? defaultProbes.env;
|
|
42
|
+
if (commandExists('pwsh.exe'))
|
|
43
|
+
return 'pwsh7';
|
|
44
|
+
if (commandExists('powershell.exe'))
|
|
45
|
+
return 'powershell5';
|
|
46
|
+
if (windowsGitBashPaths(env).some(pathExists))
|
|
47
|
+
return 'gitbash';
|
|
48
|
+
return 'cmd';
|
|
49
|
+
}
|
|
50
|
+
export function shellInvocationArgs(shell, scriptPath) {
|
|
51
|
+
switch (shell) {
|
|
52
|
+
case 'powershell5':
|
|
53
|
+
case 'pwsh7':
|
|
54
|
+
return ['-NoLogo', '-NoProfile', '-File', scriptPath];
|
|
55
|
+
case 'cmd':
|
|
56
|
+
return ['/d', '/c', scriptPath];
|
|
57
|
+
case 'gitbash':
|
|
58
|
+
return ['--login', scriptPath];
|
|
59
|
+
case 'unknown':
|
|
60
|
+
return [scriptPath];
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=windows-shell.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"windows-shell.js","sourceRoot":"","sources":["../../../src/core/windows-shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAU/C,MAAM,aAAa,GAAuB;IACtC,aAAa,CAAC,OAAO;QACjB,IAAI,CAAC;YACD,YAAY,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE;gBACjC,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IACD,UAAU,CAAC,SAAS;QAChB,OAAO,UAAU,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IACD,GAAG,EAAE,OAAO,CAAC,GAAG;CACnB,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACpE,MAAM,UAAU,GAAG;QACf,GAAG,CAAC,cAAc,CAAC;QACnB,GAAG,CAAC,cAAc,CAAC;QACnB,GAAG,CAAC,mBAAmB,CAAC;QACxB,mBAAmB;QACnB,yBAAyB;KAC5B;SACI,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/C,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAEjE,IAAI,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,SAAsC,EAAE;IACvE,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,aAAa,CAAC,aAAa,CAAC;IAC1E,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,aAAa,CAAC,GAAG,CAAC;IAE5C,IAAI,aAAa,CAAC,UAAU,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,IAAI,aAAa,CAAC,gBAAgB,CAAC;QAAE,OAAO,aAAa,CAAC;IAC1D,IAAI,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAC;IAChE,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAuB,EAAE,UAAkB;IAC3E,QAAQ,KAAK,EAAE,CAAC;QACZ,KAAK,aAAa,CAAC;QACnB,KAAK,OAAO;YACR,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1D,KAAK,KAAK;YACN,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACpC,KAAK,SAAS;YACV,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACnC,KAAK,SAAS;YACV,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;AACL,CAAC"}
|