@excitedjs/dreamux 0.26.0-beta.241 → 0.26.0-beta.243
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/channel/conversation-projection.js +17 -138
- package/dist/channel/conversation-projection.js.map +1 -1
- package/dist/config/config-helpers.js +7 -20
- package/dist/config/config-helpers.js.map +1 -1
- package/dist/config/config.js +3 -3
- package/dist/config/config.js.map +1 -1
- package/dist/onboard/config-files.js +1 -1
- package/dist/onboard/config-files.js.map +1 -1
- package/dist/platform/logger.js +2 -2
- package/dist/platform/logger.js.map +1 -1
- package/dist/service/worktree/manager.js +4 -4
- package/dist/service/worktree/paths.js +2 -2
- package/dist/service/worktree/paths.js.map +1 -1
- package/package.json +6 -6
- package/skills/dispatcher/dreamux-maintenance/references/config-envelope.md +1 -1
|
@@ -1,33 +1,5 @@
|
|
|
1
|
+
import { redactJson, redactText } from '@excitedjs/dreamux-utils';
|
|
1
2
|
import { errorInfo } from '../platform/error-info.js';
|
|
2
|
-
/**
|
|
3
|
-
* `key: value` / `key=value` pairs whose key names a secret. The value is one
|
|
4
|
-
* quoted string (a JSON string with its escapes, or a shell-style single- or
|
|
5
|
-
* back-quoted one) or one bare word. A bare word stops at whitespace, a
|
|
6
|
-
* separator, a quote, or a closing bracket, so the shape *around* the secret
|
|
7
|
-
* survives: a structured result carries redaction inside its own string and is
|
|
8
|
-
* still the same JSON afterwards (the Channel parses it to decide how to show
|
|
9
|
-
* it), and a `token: xyz` phrase inside a JSON string does not swallow the
|
|
10
|
-
* quote and bracket that close it.
|
|
11
|
-
*/
|
|
12
|
-
const INLINE_SECRET_RE = /(["']?\b(?:secret|password|passwd|token|authorization|cookie|credential|api[_-]?key|private[_-]?key|client[_-]?secret)\b["']?)(\s*[:=]\s*)("(?:[^"\\]|\\.)*"|'[^']*'|`[^`]*`|[^\s,;"'`)\]}]+)/giu;
|
|
13
|
-
const BEARER_RE = /\bBearer\s+[A-Za-z0-9._~+/-]+=*/giu;
|
|
14
|
-
const PRIVATE_KEY_RE = /-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z0-9 ]*PRIVATE KEY-----/giu;
|
|
15
|
-
const JWT_RE = /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\b/gu;
|
|
16
|
-
const COMMON_ACCESS_KEY_RE = /\b(?:AKIA|ASIA|AKLT)[A-Z0-9]{12,}\b/gu;
|
|
17
|
-
/**
|
|
18
|
-
* What may sit inside a path without ending it.
|
|
19
|
-
*
|
|
20
|
-
* A prefix only counts as a path when the characters around it agree that it is
|
|
21
|
-
* one: `~/work` is this operator's home, `/home/alicexyz` is somebody else's
|
|
22
|
-
* directory that merely starts with the same letters, and `not/home/alice` is a
|
|
23
|
-
* fragment of a longer path that was never rooted here. Letters, digits, and
|
|
24
|
-
* the separators/punctuation that appear inside real path segments continue a
|
|
25
|
-
* token; anything else — whitespace, a quote, a colon, a comma — ends it.
|
|
26
|
-
* Two narrower exceptions are handled at a match: a period closes prose only
|
|
27
|
-
* when what follows is already a boundary, and a preceding slash starts a path
|
|
28
|
-
* only when it completes a URL scheme's `://`.
|
|
29
|
-
*/
|
|
30
|
-
const PATH_TOKEN_CHARACTER_RE = /[\p{L}\p{N}_.~\\/-]/u;
|
|
31
3
|
export function createConversationProjection(input) {
|
|
32
4
|
const guarded = (agent, entryPoint, operation) => {
|
|
33
5
|
try {
|
|
@@ -131,14 +103,15 @@ function projectedActivity(activity, cwd, homePathPrefixes) {
|
|
|
131
103
|
};
|
|
132
104
|
}
|
|
133
105
|
case 'tool.call': {
|
|
134
|
-
const
|
|
135
|
-
|
|
136
|
-
|
|
106
|
+
const redact = (text) => text === null ? null : redactText(text, cwd, homePathPrefixes);
|
|
107
|
+
const summary = redact(activity.summary);
|
|
108
|
+
const invocation = redact(activity.invocation);
|
|
137
109
|
const items = activity.items.map((item) => redactText(item, cwd, homePathPrefixes));
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
110
|
+
// A call's payloads arrive as structure, so they are walked rather than
|
|
111
|
+
// read as one string: a key that names a secret is answered by its name,
|
|
112
|
+
// and every string leaf is ordinary text by the time it is redacted.
|
|
113
|
+
const args = redactJson(activity.arguments, cwd, homePathPrefixes);
|
|
114
|
+
const result = redactJson(activity.error ?? activity.result, cwd, homePathPrefixes);
|
|
142
115
|
return {
|
|
143
116
|
kind: 'tool.call',
|
|
144
117
|
event_id: activity.id,
|
|
@@ -146,17 +119,13 @@ function projectedActivity(activity, cwd, homePathPrefixes) {
|
|
|
146
119
|
tool_name: activity.toolName,
|
|
147
120
|
tool_action: activity.action,
|
|
148
121
|
summary: summary?.value ?? null,
|
|
149
|
-
|
|
150
|
-
// is a command nobody can judge — the operator asked to read the real
|
|
151
|
-
// one — so these two members skip the redactor while every payload
|
|
152
|
-
// around them keeps it.
|
|
153
|
-
invocation: activity.invocation,
|
|
122
|
+
invocation: invocation?.value ?? null,
|
|
154
123
|
items: items.map((item) => item.value),
|
|
155
124
|
status: activity.status,
|
|
156
|
-
arguments_json: jsonText(
|
|
157
|
-
result_json: result
|
|
158
|
-
redacted:
|
|
159
|
-
|
|
125
|
+
arguments_json: jsonText(args.value),
|
|
126
|
+
result_json: jsonText(result.value),
|
|
127
|
+
redacted: [summary, invocation, args, result, ...items]
|
|
128
|
+
.some((member) => member?.redacted ?? false),
|
|
160
129
|
};
|
|
161
130
|
}
|
|
162
131
|
case 'turn.ended': {
|
|
@@ -174,103 +143,13 @@ function projectedActivity(activity, cwd, homePathPrefixes) {
|
|
|
174
143
|
}
|
|
175
144
|
/**
|
|
176
145
|
* A structured value travels as its compact JSON text; a value that already is
|
|
177
|
-
* a string travels as itself.
|
|
178
|
-
*
|
|
179
|
-
*
|
|
180
|
-
* inside a JSON string can leave text no parser accepts — so a consumer that
|
|
181
|
-
* wants the structure back treats a parse failure as "this is text", which is
|
|
182
|
-
* what a display does with any payload it cannot read as JSON.
|
|
146
|
+
* a string travels as itself. The text is whole, never cut, and it is written
|
|
147
|
+
* after redaction rather than before, so a structured payload is still valid
|
|
148
|
+
* JSON when it arrives.
|
|
183
149
|
*/
|
|
184
150
|
function jsonText(value) {
|
|
185
151
|
if (value === null)
|
|
186
152
|
return null;
|
|
187
153
|
return typeof value === 'string' ? value : JSON.stringify(value);
|
|
188
154
|
}
|
|
189
|
-
/**
|
|
190
|
-
* Rewrite what a projected conversation must not publish verbatim.
|
|
191
|
-
*
|
|
192
|
-
* Two different jobs share this function. Secrets are *destroyed* — a token has
|
|
193
|
-
* no legible form worth keeping. Paths are only *renamed*: an operator reading
|
|
194
|
-
* a card still needs to know which file was touched, so the workspace becomes
|
|
195
|
-
* `.` and this host's home becomes `~`, exactly the way the operator's own shell
|
|
196
|
-
* prints them. Order matters: the workspace usually sits under the home, so
|
|
197
|
-
* relativizing it first keeps the shorter, more useful form.
|
|
198
|
-
*
|
|
199
|
-
* `homePathPrefixes` is explicit so this pure projection never depends on
|
|
200
|
-
* process-global resolution state.
|
|
201
|
-
*/
|
|
202
|
-
export function redactText(value, cwd, homePaths) {
|
|
203
|
-
let redacted = replacePathPrefix(value, cwd, '.', '', true);
|
|
204
|
-
redacted = redacted.replace(PRIVATE_KEY_RE, '<redacted-private-key>');
|
|
205
|
-
for (const homePath of homePaths) {
|
|
206
|
-
redacted = replacePathPrefix(redacted, homePath, '~', '~', false);
|
|
207
|
-
}
|
|
208
|
-
redacted = redacted.replace(BEARER_RE, 'Bearer <redacted>');
|
|
209
|
-
redacted = redacted.replace(JWT_RE, '<redacted-jwt>');
|
|
210
|
-
redacted = redacted.replace(COMMON_ACCESS_KEY_RE, '<redacted-access-key>');
|
|
211
|
-
redacted = redacted.replace(INLINE_SECRET_RE, (_match, key, separator, secret) => {
|
|
212
|
-
// A quoted secret stays a quoted (now empty of meaning) string, so the
|
|
213
|
-
// text around it keeps whatever grammar it had — JSON included.
|
|
214
|
-
const quote = /^["'`]/u.test(secret) ? secret[0] : '';
|
|
215
|
-
return `${key}${separator}${quote}<redacted>${quote}`;
|
|
216
|
-
});
|
|
217
|
-
return { value: redacted, redacted: redacted !== value };
|
|
218
|
-
}
|
|
219
|
-
/**
|
|
220
|
-
* Replace every occurrence of `rawPrefix` that is actually the head of a path.
|
|
221
|
-
*
|
|
222
|
-
* Scanning for a known prefix is what makes this honest where a regex is not: a
|
|
223
|
-
* pattern like `/home/<name>/...` matches any string of that *shape*, including
|
|
224
|
-
* a directory on some other machine quoted in a log, and blanking those costs
|
|
225
|
-
* legibility for no privacy gain. Only the prefixes this host really uses are
|
|
226
|
-
* offered here, and each hit must still be bounded on both sides — preceded by
|
|
227
|
-
* a non-path character and followed by a separator or the end of a token.
|
|
228
|
-
*
|
|
229
|
-
* A hit with a path continuing after it (`<prefix>/rest`) takes
|
|
230
|
-
* `nestedReplacement`, and `stripNestedSeparator` drops the separator with it so
|
|
231
|
-
* a workspace `<cwd>/rest` turns into `rest`. A hit that ends there takes
|
|
232
|
-
* `exactReplacement`, so a bare workspace becomes `.`.
|
|
233
|
-
*/
|
|
234
|
-
function replacePathPrefix(value, rawPrefix, exactReplacement, nestedReplacement, stripNestedSeparator) {
|
|
235
|
-
const prefix = rawPrefix.replace(/[\\/]+$/u, '');
|
|
236
|
-
if (prefix === '')
|
|
237
|
-
return value;
|
|
238
|
-
let cursor = 0;
|
|
239
|
-
let searchFrom = 0;
|
|
240
|
-
let result = '';
|
|
241
|
-
while (searchFrom < value.length) {
|
|
242
|
-
const matchAt = value.indexOf(prefix, searchFrom);
|
|
243
|
-
if (matchAt < 0)
|
|
244
|
-
break;
|
|
245
|
-
const suffixAt = matchAt + prefix.length;
|
|
246
|
-
const next = value[suffixAt];
|
|
247
|
-
const nested = next === '/' || next === '\\';
|
|
248
|
-
const ends = isPathPrefixEnd(value, suffixAt);
|
|
249
|
-
if (isPathPrefixBoundary(value, matchAt) && (nested || ends)) {
|
|
250
|
-
result += value.slice(cursor, matchAt);
|
|
251
|
-
result += nested ? nestedReplacement : exactReplacement;
|
|
252
|
-
cursor = suffixAt + (nested && stripNestedSeparator ? 1 : 0);
|
|
253
|
-
searchFrom = cursor;
|
|
254
|
-
continue;
|
|
255
|
-
}
|
|
256
|
-
searchFrom = suffixAt;
|
|
257
|
-
}
|
|
258
|
-
return cursor === 0 ? value : result + value.slice(cursor);
|
|
259
|
-
}
|
|
260
|
-
function isPathPrefixBoundary(value, matchAt) {
|
|
261
|
-
if (matchAt === 0 || isPathTokenBoundary(value[matchAt - 1]))
|
|
262
|
-
return true;
|
|
263
|
-
return matchAt >= 3 && value.slice(matchAt - 3, matchAt) === '://';
|
|
264
|
-
}
|
|
265
|
-
function isPathPrefixEnd(value, suffixAt) {
|
|
266
|
-
const next = value[suffixAt];
|
|
267
|
-
if (next === undefined)
|
|
268
|
-
return true;
|
|
269
|
-
return next === '.'
|
|
270
|
-
? isPathTokenBoundary(value[suffixAt + 1])
|
|
271
|
-
: isPathTokenBoundary(next);
|
|
272
|
-
}
|
|
273
|
-
function isPathTokenBoundary(character) {
|
|
274
|
-
return character === undefined || !PATH_TOKEN_CHARACTER_RE.test(character);
|
|
275
|
-
}
|
|
276
155
|
//# sourceMappingURL=conversation-projection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-projection.js","sourceRoot":"","sources":["../../src/channel/conversation-projection.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"conversation-projection.js","sourceRoot":"","sources":["../../src/channel/conversation-projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { homedir } from 'node:os';
|
|
2
2
|
import { isAbsolute, join } from 'node:path';
|
|
3
|
-
import { describeType, isPlainObject, } from '@excitedjs/dreamux-utils';
|
|
3
|
+
import { describeType, isPlainObject, redactSecretKeyValues, } from '@excitedjs/dreamux-utils';
|
|
4
4
|
import { InvalidProviderRefError, ReservedExternalProviderError, UnknownBuiltinProviderError, formatProviderRef, parseProviderRef, } from '../registry/index.js';
|
|
5
|
+
/**
|
|
6
|
+
* What `dreamux config show` must not print. The walk and the secret key names
|
|
7
|
+
* are the one redaction capability in `@excitedjs/dreamux-utils`; this name
|
|
8
|
+
* stays because config is what the CLI asks for.
|
|
9
|
+
*/
|
|
10
|
+
export const redactConfigSecrets = redactSecretKeyValues;
|
|
5
11
|
export function resolveConfigProvider(rawProvider, expectedKind, file, prefix, providerRegistry) {
|
|
6
12
|
try {
|
|
7
13
|
const descriptor = providerRegistry.resolve(rawProvider);
|
|
@@ -82,25 +88,6 @@ export function readOptionalBoolean(obj, key, fallback, file, prefix = '') {
|
|
|
82
88
|
return v;
|
|
83
89
|
throw new Error(`dreamux config error in ${file}: ${prefix}${key} must be a boolean (got ${describeType(v)})`);
|
|
84
90
|
}
|
|
85
|
-
export function redactConfigSecrets(value) {
|
|
86
|
-
if (Array.isArray(value)) {
|
|
87
|
-
for (const item of value)
|
|
88
|
-
redactConfigSecrets(item);
|
|
89
|
-
return;
|
|
90
|
-
}
|
|
91
|
-
if (!isPlainObject(value))
|
|
92
|
-
return;
|
|
93
|
-
for (const [key, child] of Object.entries(value)) {
|
|
94
|
-
if (isSecretConfigKey(key)) {
|
|
95
|
-
value[key] = '<redacted>';
|
|
96
|
-
continue;
|
|
97
|
-
}
|
|
98
|
-
redactConfigSecrets(child);
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
function isSecretConfigKey(key) {
|
|
102
|
-
return /(?:secret|password|passwd|token|authorization|cookie|credential|api[_-]?key|private[_-]?key|client[_-]?secret)/i.test(key);
|
|
103
|
-
}
|
|
104
91
|
export function expandHome(path) {
|
|
105
92
|
if (path === '~')
|
|
106
93
|
return homedir();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAG7C,OAAO,EACL,YAAY,EACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAG7C,OAAO,EACL,YAAY,EACZ,aAAa,EACb,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,2BAA2B,EAC3B,iBAAiB,EACjB,gBAAgB,GAGjB,MAAM,sBAAsB,CAAC;AAE9B;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC;AAEzD,MAAM,UAAU,qBAAqB,CACnC,WAAmB,EACnB,YAAwC,EACxC,IAAY,EACZ,MAAc,EACd,gBAAkC;IAElC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACzD,IAAI,UAAU,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,2BAA2B,IAAI,KAAK,MAAM,aAAa,WAAW,UAAU,UAAU,CAAC,IAAI,uBAAuB,YAAY,EAAE,CACjI,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC;IAChE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,uBAAuB,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,2BAA2B,IAAI,KAAK,MAAM,wBAAwB,GAAG,CAAC,OAAO,EAAE,CAChF,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,YAAY,6BAA6B,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CACb,2BAA2B,IAAI,KAAK,MAAM,aAAa,WAAW,mCAAmC,YAAY,cAAc;gBAC7H,GAAG,CAAC,OAAO,CACd,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,YAAY,2BAA2B,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CACb,2BAA2B,IAAI,KAAK,MAAM,iDAAiD,GAAG,CAAC,EAAE,GAAG,CACrG,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAC5C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC9C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QAAE,OAAO,EAAE,CAAC;IAC3C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;YAAE,SAAS;QACzC,GAAG,CAAC,IAAI,CACN,GAAG,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAC9E,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAgB,EAChB,IAAiD;IAEjD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YAAE,SAAS;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAC3C,IAAI,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAc;IAEd,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC7D,MAAM,SAAS,GAAG,KAA0C,CAAC;IAC7D,IAAI,OAAO,SAAS,CAAC,aAAa,KAAK,UAAU;QAAE,OAAO,IAAI,CAAC;IAC/D,OAAO,KAAiC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,GAA4B,EAC5B,GAAW,EACX,QAAiB,EACjB,IAAY,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IACrC,IAAI,OAAO,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IACrC,MAAM,IAAI,KAAK,CACb,2BAA2B,IAAI,KAAK,MAAM,GAAG,GAAG,2BAA2B,YAAY,CAAC,CAAC,CAAC,GAAG,CAC9F,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,OAAO,EAAE,CAAC;IACnC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/config/config.js
CHANGED
|
@@ -165,18 +165,18 @@ async function mergeWithDefaults(raw, file, providerRegistry) {
|
|
|
165
165
|
}
|
|
166
166
|
function readWorkspaceConfig(rawWorkspace, file, prefix) {
|
|
167
167
|
if (rawWorkspace === undefined)
|
|
168
|
-
return { enabled:
|
|
168
|
+
return { enabled: false };
|
|
169
169
|
if (!isPlainObject(rawWorkspace)) {
|
|
170
170
|
throw new Error(`dreamux config error in ${file}: ${prefix.slice(0, -1)} must be an object (got ${describeType(rawWorkspace)})`);
|
|
171
171
|
}
|
|
172
172
|
rejectUnknownKeys(rawWorkspace, new Set(['enabled']), file, prefix);
|
|
173
173
|
return {
|
|
174
|
-
enabled: readOptionalBoolean(rawWorkspace, 'enabled',
|
|
174
|
+
enabled: readOptionalBoolean(rawWorkspace, 'enabled', false, file, prefix),
|
|
175
175
|
};
|
|
176
176
|
}
|
|
177
177
|
export function defaultWorkspaceEnabled(config, dispatcherId) {
|
|
178
178
|
return (config.dispatchers.find((dispatcher) => dispatcher.id === dispatcherId)?.workspace
|
|
179
|
-
.enabled ??
|
|
179
|
+
.enabled ?? false);
|
|
180
180
|
}
|
|
181
181
|
function rejectTopLevelCodex(raw, file) {
|
|
182
182
|
if (!('codex' in raw))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export function dreamuxConfigFromAnswers(answers, existing) {
|
|
|
13
13
|
const dispatchers = base.dispatchers
|
|
14
14
|
.filter((dispatcher) => dispatcher.id !== answers.dispatcherId)
|
|
15
15
|
.map(cloneDispatcherConfig);
|
|
16
|
-
dispatchers.push(dispatcherConfigFromAnswers(answers, existingDispatcher?.workspace ?? { enabled:
|
|
16
|
+
dispatchers.push(dispatcherConfigFromAnswers(answers, existingDispatcher?.workspace ?? { enabled: false }));
|
|
17
17
|
// Runtime config lands only in agents[]. Onboard creates or updates the
|
|
18
18
|
// selected agent id, preserving provider-owned raw config so the file
|
|
19
19
|
// round-trips after provider parsers normalize defaults.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-files.js","sourceRoot":"","sources":["../../src/onboard/config-files.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,UAAU,sBAAsB,CAAC,OAAuB;IAC5D,OAAO,eAAe,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAAuB,EACvB,QAAwB;IAExB,oBAAoB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAkB,QAAQ,IAAI;QACtC,MAAM,EAAE,EAAE;QACV,WAAW,EAAE,EAAE;KAChB,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAC9C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,OAAO,CAAC,YAAY,CACvD,CAAC;IACF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;SACjC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC;SAC9D,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC9B,WAAW,CAAC,IAAI,CACd,2BAA2B,CACzB,OAAO,EACP,kBAAkB,EAAE,SAAS,IAAI,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config-files.js","sourceRoot":"","sources":["../../src/onboard/config-files.ts"],"names":[],"mappings":"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"}
|
package/dist/platform/logger.js
CHANGED
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
* inject a tmp `filePath`; they must not expect an env var to move logs.
|
|
37
37
|
*/
|
|
38
38
|
import { chmod } from 'node:fs/promises';
|
|
39
|
+
import { isSecretKeyName } from '@excitedjs/dreamux-utils';
|
|
39
40
|
import pino from 'pino';
|
|
40
41
|
import { errorInfo } from './error-info.js';
|
|
41
42
|
/**
|
|
@@ -50,7 +51,6 @@ import { errorInfo } from './error-info.js';
|
|
|
50
51
|
const _pinoSatisfiesContract = pino();
|
|
51
52
|
void _pinoSatisfiesContract;
|
|
52
53
|
const REDACTED_VALUE = '[REDACTED]';
|
|
53
|
-
const SECRET_KEY_RE = /(secret|password|passwd|token|authorization|cookie|credential)/i;
|
|
54
54
|
function resolveLevel(level) {
|
|
55
55
|
if (level !== undefined)
|
|
56
56
|
return level;
|
|
@@ -120,7 +120,7 @@ function redactLogValue(value, seen = new WeakSet()) {
|
|
|
120
120
|
seen.add(value);
|
|
121
121
|
const out = {};
|
|
122
122
|
for (const [key, entry] of Object.entries(value)) {
|
|
123
|
-
out[key] =
|
|
123
|
+
out[key] = isSecretKeyName(key)
|
|
124
124
|
? REDACTED_VALUE
|
|
125
125
|
: redactLogValue(entry, seen);
|
|
126
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/platform/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,OAAO,IAGN,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;;;;GAQG;AACH,MAAM,sBAAsB,GAAkB,IAAI,EAAE,CAAC;AACrD,KAAK,sBAAsB,CAAC;AA8B5B,MAAM,cAAc,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/platform/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,10 +113,10 @@ export class WorktreeManager {
|
|
|
113
113
|
* Prepare the default (no-`repo`) workspace for a concrete TeamMate/Team name
|
|
114
114
|
* (issue #199): either a plain `<dispatcherWorkspace>/.workspace/work/<slug>/`
|
|
115
115
|
* directory when workspace isolation is enabled, or the dispatcher workspace
|
|
116
|
-
* itself when
|
|
117
|
-
*
|
|
118
|
-
*
|
|
119
|
-
*
|
|
116
|
+
* itself when disabled. Neither mode creates a git worktree. The dispatcher
|
|
117
|
+
* cwd need not be a git repo — no git command runs — so `source_repo` is
|
|
118
|
+
* reported as null even if the directory happens to sit inside a repo. The
|
|
119
|
+
* `.workspace/` boundary is only created for the isolated mode.
|
|
120
120
|
*/
|
|
121
121
|
async prepareDefaultWorkspace(input) {
|
|
122
122
|
const dispatcherWorkspace = await realpath(input.dispatcherWorkspace);
|
|
@@ -30,7 +30,7 @@ export function managedWorkspaceGitignorePath(dispatcherWorkspace) {
|
|
|
30
30
|
export function managedWorktreeRoot(dispatcherWorkspace) {
|
|
31
31
|
return join(managedWorkspaceDir(dispatcherWorkspace), WORKTREE_SUBDIR);
|
|
32
32
|
}
|
|
33
|
-
/** `<workspace>/.workspace/work` — root of
|
|
33
|
+
/** `<workspace>/.workspace/work` — root of isolated (non-git) per-name work dirs. */
|
|
34
34
|
function managedWorkRoot(dispatcherWorkspace) {
|
|
35
35
|
return join(managedWorkspaceDir(dispatcherWorkspace), WORK_SUBDIR);
|
|
36
36
|
}
|
|
@@ -39,7 +39,7 @@ export function directWorkspaceWorkPath(input) {
|
|
|
39
39
|
return input.dispatcherWorkspace;
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
|
-
* Absolute path of the
|
|
42
|
+
* Absolute path of the isolated (no-`repo`) plain work directory for a concrete
|
|
43
43
|
* TeamMate/Team name under a dispatcher workspace (issue #199). Unlike a managed
|
|
44
44
|
* worktree this is a plain `mkdir`'d directory, not a git worktree — so the
|
|
45
45
|
* dispatcher cwd need not be a git repo — and it shares the self-ignored
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/service/worktree/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;;;;;;;GAYG;AAEH,sEAAsE;AACtE,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAC;AACtD,MAAM,eAAe,GAAG,UAAU,CAAC;AACnC,MAAM,WAAW,GAAG,MAAM,CAAC;AAE3B,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CAAC,mBAA2B;IAC7D,OAAO,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;AAC9D,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,6BAA6B,CAAC,mBAA2B;IACvE,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,mBAAmB,CAAC,mBAA2B;IAC7D,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAC,CAAC;AACzE,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/service/worktree/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D;;;;;;;;;;;;GAYG;AAEH,sEAAsE;AACtE,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAC;AACtD,MAAM,eAAe,GAAG,UAAU,CAAC;AACnC,MAAM,WAAW,GAAG,MAAM,CAAC;AAE3B,2EAA2E;AAC3E,MAAM,UAAU,mBAAmB,CAAC,mBAA2B;IAC7D,OAAO,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;AAC9D,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,6BAA6B,CAAC,mBAA2B;IACvE,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,mBAAmB,CAAC,mBAA2B;IAC7D,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAC,CAAC;AACzE,CAAC;AAED,qFAAqF;AACrF,SAAS,eAAe,CAAC,mBAA2B;IAClD,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,uBAAuB,CAAC,KAGvC;IACC,OAAO,KAAK,CAAC,mBAAmB,CAAC;AACnC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAGxC;IACC,OAAO,IAAI,CACT,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAC1C,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAChC,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,iBAAyB;IAC7D,MAAM,IAAI,GAAG,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC;IACxE,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvF,OAAO,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAInC;IACC,OAAO,IAAI,CACT,mBAAmB,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAC9C,qBAAqB,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAC9C,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAChC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@excitedjs/dreamux",
|
|
3
|
-
"version": "0.26.0-beta.
|
|
3
|
+
"version": "0.26.0-beta.243",
|
|
4
4
|
"description": "Dreamux core host for multi-dispatcher agent orchestration through provider interfaces.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
"CHANGELOG.json"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@excitedjs/agent-runtime-claude-code": "0.7.1-beta.
|
|
30
|
-
"@excitedjs/agent-runtime-codex": "0.6.1-beta.
|
|
31
|
-
"@excitedjs/dreamux-types": "0.11.0-beta.
|
|
32
|
-
"@excitedjs/dreamux-utils": "0.
|
|
33
|
-
"@excitedjs/feishu-channel": "6.3.0-beta.
|
|
29
|
+
"@excitedjs/agent-runtime-claude-code": "0.7.1-beta.243",
|
|
30
|
+
"@excitedjs/agent-runtime-codex": "0.6.1-beta.243",
|
|
31
|
+
"@excitedjs/dreamux-types": "0.11.0-beta.243",
|
|
32
|
+
"@excitedjs/dreamux-utils": "0.6.0-beta.243",
|
|
33
|
+
"@excitedjs/feishu-channel": "6.3.0-beta.243",
|
|
34
34
|
"@modelcontextprotocol/server": "2.0.0",
|
|
35
35
|
"acorn": "^8.16.0",
|
|
36
36
|
"croner": "^10.0.1",
|
|
@@ -22,7 +22,7 @@ The complete current host envelope has independently optional `agents` and
|
|
|
22
22
|
- schema-optional or null `cwd`; every enabled Dispatcher must nevertheless
|
|
23
23
|
have an explicit non-empty usable `cwd` before server startup;
|
|
24
24
|
- optional boolean `enabled`, default `true`;
|
|
25
|
-
- optional `workspace.enabled`, default `
|
|
25
|
+
- optional `workspace.enabled`, default `false`;
|
|
26
26
|
- required non-empty `channels[]`;
|
|
27
27
|
- required non-empty `agentRuntime` matching an `agents[].id`.
|
|
28
28
|
|