typeclaw 0.39.7 → 0.41.0
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/scripts/dump-system-prompt.ts +4 -50
- package/src/agent/auth-reloadable.ts +24 -0
- package/src/agent/auth.ts +12 -0
- package/src/agent/index.ts +18 -58
- package/src/agent/multimodal/look-at.ts +87 -0
- package/src/bundled-plugins/guard/policies/non-workspace-write.ts +0 -2
- package/src/bundled-plugins/guard/policy.ts +0 -5
- package/src/bundled-plugins/memory/README.md +26 -37
- package/src/bundled-plugins/memory/index.ts +32 -147
- package/src/bundled-plugins/memory/load-memory.ts +7 -121
- package/src/bundled-plugins/memory/memory-logger.ts +8 -2
- package/src/bundled-plugins/memory/search-command.ts +2 -11
- package/src/bundled-plugins/memory/vector/doctor.ts +1 -1
- package/src/bundled-plugins/memory/vector/embedder.ts +4 -5
- package/src/bundled-plugins/memory/vector/hybrid.ts +47 -5
- package/src/bundled-plugins/memory/vector/index-on-write.ts +25 -20
- package/src/bundled-plugins/memory/vector/reference-index-on-write.ts +28 -23
- package/src/bundled-plugins/memory/vector/relevance-gate.ts +11 -7
- package/src/bundled-plugins/memory/vector/script.ts +87 -0
- package/src/bundled-plugins/memory/vector/store.ts +2 -0
- package/src/bundled-plugins/planner/planner.ts +4 -2
- package/src/bundled-plugins/reviewer/reviewer.ts +9 -1
- package/src/channels/adapters/describe-error.ts +40 -0
- package/src/channels/adapters/discord.ts +9 -12
- package/src/channels/adapters/kakaotalk-classify.ts +31 -6
- package/src/channels/adapters/kakaotalk.ts +15 -18
- package/src/channels/adapters/line.ts +11 -14
- package/src/channels/adapters/slack-bot.ts +15 -18
- package/src/channels/adapters/slack.ts +45 -21
- package/src/channels/adapters/telegram-bot.ts +15 -18
- package/src/channels/adapters/webex-bot.ts +13 -14
- package/src/channels/adapters/webex.ts +14 -15
- package/src/cli/compose.ts +20 -0
- package/src/cli/docker-preflight.ts +42 -0
- package/src/cli/hostd.ts +12 -3
- package/src/cli/init.ts +24 -22
- package/src/cli/logs.ts +7 -0
- package/src/cli/provider.ts +8 -1
- package/src/cli/reload.ts +6 -0
- package/src/cli/restart.ts +7 -0
- package/src/cli/shell.ts +7 -0
- package/src/cli/start.ts +7 -0
- package/src/cli/status.ts +9 -0
- package/src/cli/stop.ts +7 -0
- package/src/cli/tui.ts +6 -0
- package/src/config/config.ts +31 -8
- package/src/container/docker-app.ts +253 -0
- package/src/container/index.ts +11 -0
- package/src/container/start.ts +85 -41
- package/src/hostd/current-host-daemon.ts +21 -0
- package/src/hostd/daemon.ts +75 -15
- package/src/hostd/kakao-renewal-manager.ts +35 -10
- package/src/hostd/supervisor.ts +18 -3
- package/src/hostd/tailscale.ts +41 -5
- package/src/hostd/webex-renewal-manager.ts +13 -4
- package/src/plugin/hooks.ts +3 -4
- package/src/plugin/index.ts +1 -0
- package/src/plugin/manager.ts +14 -0
- package/src/plugin/registry.ts +12 -0
- package/src/plugin/types.ts +5 -1
- package/src/run/channel-session-factory.ts +3 -5
- package/src/run/index.ts +63 -36
- package/src/server/command-runner.ts +2 -11
- package/src/skills/typeclaw-memory/SKILL.md +2 -2
- package/src/skills/typeclaw-plugins/SKILL.md +1 -1
- package/src/test-helpers/rm-temp-dir.ts +24 -0
- package/typeclaw.schema.json +1 -23
- package/src/bundled-plugins/guard/policies/memory-retrieval-cache-write.ts +0 -43
- package/src/bundled-plugins/memory/memory-retrieval.ts +0 -111
- package/src/bundled-plugins/memory/vector/cache-write.ts +0 -19
- package/src/bundled-plugins/memory/vector/config.ts +0 -28
|
@@ -32,6 +32,7 @@ import type {
|
|
|
32
32
|
import { chunkMarkdown } from '@/markdown'
|
|
33
33
|
import type { SlackAccountRecord } from '@/secrets/schema'
|
|
34
34
|
|
|
35
|
+
import { describeError } from './describe-error'
|
|
35
36
|
import { createSlackAuthorResolver } from './slack-author-resolver'
|
|
36
37
|
import { slackTsToMillis } from './slack-bot-time'
|
|
37
38
|
import { createSlackChannelResolver } from './slack-channel-resolver'
|
|
@@ -50,6 +51,8 @@ const consoleLogger: SlackAdapterLogger = {
|
|
|
50
51
|
error: (m) => console.error(m),
|
|
51
52
|
}
|
|
52
53
|
|
|
54
|
+
const LISTENER_CONNECT_TIMEOUT_MS = 15_000
|
|
55
|
+
|
|
53
56
|
export type SlackCredentialStore = {
|
|
54
57
|
getAccount(id?: string): Promise<SlackAccountRecord | null>
|
|
55
58
|
}
|
|
@@ -102,7 +105,7 @@ export function createSlackOutboundCallback(deps: {
|
|
|
102
105
|
}
|
|
103
106
|
return { ok: true }
|
|
104
107
|
} catch (err) {
|
|
105
|
-
const message =
|
|
108
|
+
const message = describeError(err)
|
|
106
109
|
deps.logger.error(`[slack] outbound failed: ${message}`)
|
|
107
110
|
return { ok: false, error: message }
|
|
108
111
|
}
|
|
@@ -118,7 +121,7 @@ export function createSlackHistoryCallback(deps: {
|
|
|
118
121
|
const messages = await deps.client.getMessages(args.chat, { limit: clampLimit(args.limit, 100) })
|
|
119
122
|
return { ok: true, messages: messages.map(mapSlackHistoryMessage).reverse() }
|
|
120
123
|
} catch (err) {
|
|
121
|
-
const message =
|
|
124
|
+
const message = describeError(err)
|
|
122
125
|
deps.logger.warn(`[slack] history fetch failed: ${message}`)
|
|
123
126
|
return { ok: false, error: message }
|
|
124
127
|
}
|
|
@@ -150,7 +153,9 @@ export function createSlackMembershipResolver(deps: {
|
|
|
150
153
|
if (truncated) return { humans: humanMemberIds.length, bots, fetchedAt: now(), truncated }
|
|
151
154
|
return { humans: humanMemberIds.length, bots, fetchedAt: now(), truncated, humanMemberIds }
|
|
152
155
|
} catch (err) {
|
|
153
|
-
deps.logger.warn(
|
|
156
|
+
deps.logger.warn(
|
|
157
|
+
`[slack] membership channel=${key.chat} failed: ${describeError(err)}; deriving from recent history`,
|
|
158
|
+
)
|
|
154
159
|
return await deriveMembershipFromHistory({
|
|
155
160
|
fetchHistory: (limit) => deps.historyCallback({ chat: key.chat, thread: key.thread, limit }),
|
|
156
161
|
now,
|
|
@@ -174,7 +179,7 @@ export function createSlackFetchAttachmentCallback(deps: {
|
|
|
174
179
|
size: buffer.length,
|
|
175
180
|
}
|
|
176
181
|
} catch (err) {
|
|
177
|
-
const message =
|
|
182
|
+
const message = describeError(err)
|
|
178
183
|
deps.logger.error(`[slack] fetchAttachment failed for ${ref}: ${message}`)
|
|
179
184
|
return { ok: false, error: message }
|
|
180
185
|
}
|
|
@@ -239,7 +244,7 @@ export function createSlackAdapter(options: SlackAdapterOptions): SlackAdapter {
|
|
|
239
244
|
logger.info(`[slack] routed id=${event.ts} ${tag} mention=${payload.isBotMention}`)
|
|
240
245
|
await options.router.route(payload)
|
|
241
246
|
} catch (err) {
|
|
242
|
-
logger.error(`[slack] handleInbound failed: ${
|
|
247
|
+
logger.error(`[slack] handleInbound failed: ${describeError(err)}`)
|
|
243
248
|
} finally {
|
|
244
249
|
inflightInbounds--
|
|
245
250
|
if (inflightInbounds === 0 && stopWaiters.length > 0) {
|
|
@@ -274,26 +279,52 @@ export function createSlackAdapter(options: SlackAdapterOptions): SlackAdapter {
|
|
|
274
279
|
started = false
|
|
275
280
|
selfUserId = null
|
|
276
281
|
teamId = ''
|
|
277
|
-
logger.error(`[slack] login failed: ${
|
|
282
|
+
logger.error(`[slack] login failed: ${describeError(err)}`)
|
|
278
283
|
throw err
|
|
279
284
|
}
|
|
280
285
|
|
|
281
286
|
listener = createListener(client)
|
|
282
287
|
let listenerConnected = false
|
|
283
288
|
let listenerStartupError: Error | null = null
|
|
289
|
+
|
|
290
|
+
// SlackListener.start() resolves as soon as the WebSocket is opened, but
|
|
291
|
+
// 'connected' is only emitted later when Slack sends the `hello` frame. A
|
|
292
|
+
// synchronous post-start check therefore always fails the race. Gate
|
|
293
|
+
// startup on a deferred settled by the 'connected'/'error' handlers below.
|
|
294
|
+
let settleStartup: (() => void) | null = null
|
|
295
|
+
let failStartup: ((err: Error) => void) | null = null
|
|
296
|
+
const startupTimer = setTimeout(() => {
|
|
297
|
+
failStartup?.(new Error(`listener did not connect within ${LISTENER_CONNECT_TIMEOUT_MS}ms`))
|
|
298
|
+
}, LISTENER_CONNECT_TIMEOUT_MS)
|
|
299
|
+
const connectedPromise = new Promise<void>((resolve, reject) => {
|
|
300
|
+
settleStartup = () => {
|
|
301
|
+
clearTimeout(startupTimer)
|
|
302
|
+
resolve()
|
|
303
|
+
}
|
|
304
|
+
failStartup = (err) => {
|
|
305
|
+
clearTimeout(startupTimer)
|
|
306
|
+
reject(err)
|
|
307
|
+
}
|
|
308
|
+
})
|
|
309
|
+
|
|
284
310
|
listener.on('connected', (info) => {
|
|
285
311
|
listenerConnected = true
|
|
286
312
|
connected = true
|
|
287
313
|
selfUserId = info.self.id
|
|
288
314
|
teamId = info.team.id
|
|
315
|
+
settleStartup?.()
|
|
289
316
|
})
|
|
290
317
|
listener.on('disconnected', () => {
|
|
291
318
|
connected = false
|
|
292
319
|
logger.warn('[slack] disconnected')
|
|
293
320
|
})
|
|
294
321
|
listener.on('error', (err) => {
|
|
295
|
-
|
|
296
|
-
|
|
322
|
+
const error = err instanceof Error ? err : new Error(describeError(err))
|
|
323
|
+
if (!listenerConnected && listenerStartupError === null) {
|
|
324
|
+
listenerStartupError = error
|
|
325
|
+
failStartup?.(error)
|
|
326
|
+
}
|
|
327
|
+
logger.error(`[slack] listener error: ${describeError(err)}`)
|
|
297
328
|
})
|
|
298
329
|
listener.on('message', (event) => void handleMessage(event))
|
|
299
330
|
listener.on('reaction_added', (event) => handleReaction('added', event))
|
|
@@ -319,25 +350,22 @@ export function createSlackAdapter(options: SlackAdapterOptions): SlackAdapter {
|
|
|
319
350
|
options.router.unregisterMembership('slack', membershipResolver)
|
|
320
351
|
options.router.unregisterReaction('slack', reactionCallback)
|
|
321
352
|
options.router.unregisterRemoveReaction('slack', removeReactionCallback)
|
|
353
|
+
clearTimeout(startupTimer)
|
|
322
354
|
listener?.stop()
|
|
323
355
|
listener = null
|
|
324
356
|
selfUserId = null
|
|
325
357
|
connected = false
|
|
326
358
|
started = false
|
|
327
|
-
logger.error(`[slack] ${reason}: ${
|
|
359
|
+
logger.error(`[slack] ${reason}: ${describeError(cause)}`)
|
|
328
360
|
throw cause
|
|
329
361
|
}
|
|
330
362
|
|
|
331
363
|
try {
|
|
332
|
-
await listener.start()
|
|
364
|
+
await Promise.all([listener.start(), connectedPromise])
|
|
333
365
|
} catch (err) {
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
rollbackStart(
|
|
338
|
-
'listener start failed silently',
|
|
339
|
-
listenerStartupError ?? new Error('listener.start() returned without emitting connected'),
|
|
340
|
-
)
|
|
366
|
+
const cause = err instanceof Error ? err : new Error(describeError(err))
|
|
367
|
+
const reason = listenerStartupError !== null ? 'listener start failed' : 'listener start threw'
|
|
368
|
+
rollbackStart(reason, cause)
|
|
341
369
|
}
|
|
342
370
|
},
|
|
343
371
|
|
|
@@ -399,10 +427,6 @@ function clampLimit(requested: number, max: number): number {
|
|
|
399
427
|
return Math.min(Math.floor(requested), max)
|
|
400
428
|
}
|
|
401
429
|
|
|
402
|
-
function describe(err: unknown): string {
|
|
403
|
-
return err instanceof Error ? err.message : String(err)
|
|
404
|
-
}
|
|
405
|
-
|
|
406
430
|
function dropHint(reason: InboundDropReason): string {
|
|
407
431
|
switch (reason) {
|
|
408
432
|
case 'empty_text':
|
|
@@ -16,6 +16,7 @@ import type {
|
|
|
16
16
|
TypingTarget,
|
|
17
17
|
} from '@/channels/types'
|
|
18
18
|
|
|
19
|
+
import { describeError } from './describe-error'
|
|
19
20
|
import { classifyInbound, type InboundDropReason, TELEGRAM_WORKSPACE } from './telegram-bot-classify'
|
|
20
21
|
import { toTelegramMarkdownV2 } from './telegram-bot-format'
|
|
21
22
|
|
|
@@ -105,7 +106,7 @@ export function createTypingCallback(deps: {
|
|
|
105
106
|
logger.warn(`[telegram-bot] typing ${tag} status=${response.status}`)
|
|
106
107
|
}
|
|
107
108
|
} catch (err) {
|
|
108
|
-
logger.warn(`[telegram-bot] typing ${tag} failed: ${
|
|
109
|
+
logger.warn(`[telegram-bot] typing ${tag} failed: ${describeError(err)}`)
|
|
109
110
|
}
|
|
110
111
|
}
|
|
111
112
|
}
|
|
@@ -187,7 +188,7 @@ export function createTelegramMembershipResolver(deps: {
|
|
|
187
188
|
truncated: true,
|
|
188
189
|
}
|
|
189
190
|
} catch (err) {
|
|
190
|
-
deps.logger.warn(`[telegram-bot] membership chat=${key.chat} failed: ${
|
|
191
|
+
deps.logger.warn(`[telegram-bot] membership chat=${key.chat} failed: ${describeError(err)}`)
|
|
191
192
|
return { kind: 'transient' } satisfies MembershipResolverFailure
|
|
192
193
|
}
|
|
193
194
|
}
|
|
@@ -240,7 +241,7 @@ export function createOutboundCallback(deps: {
|
|
|
240
241
|
)
|
|
241
242
|
}
|
|
242
243
|
} catch (err) {
|
|
243
|
-
const message =
|
|
244
|
+
const message = describeError(err)
|
|
244
245
|
logger.error(`[telegram-bot] sendDocument failed for ${path}: ${message}`)
|
|
245
246
|
return { ok: false, error: `sendDocument failed: ${message}` }
|
|
246
247
|
}
|
|
@@ -263,7 +264,7 @@ export function createOutboundCallback(deps: {
|
|
|
263
264
|
const id = String(sent.message_id)
|
|
264
265
|
return { ok: true, messageId: id, messageIds: [id] }
|
|
265
266
|
} catch (err) {
|
|
266
|
-
const message =
|
|
267
|
+
const message = describeError(err)
|
|
267
268
|
logger.error(`[telegram-bot] sendMessage failed: ${message}`)
|
|
268
269
|
return { ok: false, error: message }
|
|
269
270
|
}
|
|
@@ -319,7 +320,7 @@ export function createFetchAttachmentCallback(deps: {
|
|
|
319
320
|
try {
|
|
320
321
|
metaResponse = await fetchImpl(`${TELEGRAM_API_BASE}/bot${token}/getFile?file_id=${encodeURIComponent(ref)}`)
|
|
321
322
|
} catch (err) {
|
|
322
|
-
const message =
|
|
323
|
+
const message = describeError(err)
|
|
323
324
|
logger.error(`[telegram-bot] getFile failed for ${ref}: ${message}`)
|
|
324
325
|
return { ok: false, error: `getFile failed: ${message}` }
|
|
325
326
|
}
|
|
@@ -333,7 +334,7 @@ export function createFetchAttachmentCallback(deps: {
|
|
|
333
334
|
try {
|
|
334
335
|
meta = (await metaResponse.json()) as TelegramFileResponse
|
|
335
336
|
} catch (err) {
|
|
336
|
-
return { ok: false, error: `getFile parse failed: ${
|
|
337
|
+
return { ok: false, error: `getFile parse failed: ${describeError(err)}` }
|
|
337
338
|
}
|
|
338
339
|
if (!meta.ok || meta.result === undefined || meta.result.file_path === undefined) {
|
|
339
340
|
const message = meta.description ?? 'getFile returned no file_path'
|
|
@@ -345,7 +346,7 @@ export function createFetchAttachmentCallback(deps: {
|
|
|
345
346
|
try {
|
|
346
347
|
response = await fetchImpl(downloadUrl)
|
|
347
348
|
} catch (err) {
|
|
348
|
-
const message =
|
|
349
|
+
const message = describeError(err)
|
|
349
350
|
logger.error(`[telegram-bot] download failed for ${ref}: ${message}`)
|
|
350
351
|
return { ok: false, error: message }
|
|
351
352
|
}
|
|
@@ -449,7 +450,7 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
449
450
|
)
|
|
450
451
|
await options.router.route(verdict.payload)
|
|
451
452
|
} catch (err) {
|
|
452
|
-
logger.error(`[telegram-bot] handleInbound failed: ${
|
|
453
|
+
logger.error(`[telegram-bot] handleInbound failed: ${describeError(err)}`)
|
|
453
454
|
} finally {
|
|
454
455
|
inflightInbounds--
|
|
455
456
|
if (inflightInbounds === 0 && stopWaiters.length > 0) {
|
|
@@ -468,7 +469,7 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
468
469
|
await client.login({ token: options.token })
|
|
469
470
|
} catch (err) {
|
|
470
471
|
started = false
|
|
471
|
-
logger.error(`[telegram-bot] login failed: ${
|
|
472
|
+
logger.error(`[telegram-bot] login failed: ${describeError(err)}`)
|
|
472
473
|
throw err
|
|
473
474
|
}
|
|
474
475
|
|
|
@@ -486,7 +487,7 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
486
487
|
} catch (err) {
|
|
487
488
|
started = false
|
|
488
489
|
botUser = null
|
|
489
|
-
logger.error(`[telegram-bot] getMe failed (likely invalid token): ${
|
|
490
|
+
logger.error(`[telegram-bot] getMe failed (likely invalid token): ${describeError(err)}`)
|
|
490
491
|
throw err
|
|
491
492
|
}
|
|
492
493
|
|
|
@@ -515,11 +516,11 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
515
516
|
logger.warn('[telegram-bot] disconnected; SDK will reconnect with backoff')
|
|
516
517
|
})
|
|
517
518
|
listener.on('error', (err) => {
|
|
518
|
-
const error = err instanceof Error ? err : new Error(
|
|
519
|
+
const error = err instanceof Error ? err : new Error(describeError(err))
|
|
519
520
|
if (!listenerConnected && listenerStartupError === null) {
|
|
520
521
|
listenerStartupError = error
|
|
521
522
|
}
|
|
522
|
-
logger.error(`[telegram-bot] listener error: ${
|
|
523
|
+
logger.error(`[telegram-bot] listener error: ${describeError(err)}`)
|
|
523
524
|
})
|
|
524
525
|
listener.on('message', (event) => {
|
|
525
526
|
void handleMessage(event)
|
|
@@ -548,14 +549,14 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
548
549
|
listener = null
|
|
549
550
|
botUser = null
|
|
550
551
|
started = false
|
|
551
|
-
logger.error(`[telegram-bot] ${reason}: ${
|
|
552
|
+
logger.error(`[telegram-bot] ${reason}: ${describeError(cause)}`)
|
|
552
553
|
throw cause
|
|
553
554
|
}
|
|
554
555
|
|
|
555
556
|
try {
|
|
556
557
|
await listener.start()
|
|
557
558
|
} catch (err) {
|
|
558
|
-
rollbackStart('listener start threw', err instanceof Error ? err : new Error(
|
|
559
|
+
rollbackStart('listener start threw', err instanceof Error ? err : new Error(describeError(err)))
|
|
559
560
|
}
|
|
560
561
|
if (!listenerConnected) {
|
|
561
562
|
const cause = listenerStartupError ?? new Error('listener.start() returned without emitting connected')
|
|
@@ -599,10 +600,6 @@ export function createTelegramBotAdapter(options: TelegramBotAdapterOptions): Te
|
|
|
599
600
|
}
|
|
600
601
|
}
|
|
601
602
|
|
|
602
|
-
function describe(err: unknown): string {
|
|
603
|
-
return err instanceof Error ? err.message : String(err)
|
|
604
|
-
}
|
|
605
|
-
|
|
606
603
|
function dropHint(reason: InboundDropReason): string {
|
|
607
604
|
switch (reason) {
|
|
608
605
|
case 'no_user':
|
|
@@ -29,6 +29,7 @@ import type {
|
|
|
29
29
|
SendResult,
|
|
30
30
|
} from '@/channels/types'
|
|
31
31
|
|
|
32
|
+
import { describeError } from './describe-error'
|
|
32
33
|
import { createWebexChannelNameResolver } from './webex-bot-channel-resolver'
|
|
33
34
|
import { classifyInbound, type InboundDropReason, type WebexInboundMessage } from './webex-bot-classify'
|
|
34
35
|
import { enrichWebexMessageReference } from './webex-bot-reference'
|
|
@@ -129,7 +130,7 @@ export function createOutboundCallback(deps: {
|
|
|
129
130
|
logger.info(`[webex-bot] sent id=${sent.ref} ${tag}`)
|
|
130
131
|
return { ok: true, messageId: sent.ref, messageIds: [sent.ref] }
|
|
131
132
|
} catch (err) {
|
|
132
|
-
const message =
|
|
133
|
+
const message = describeError(err)
|
|
133
134
|
logger.error(`[webex-bot] outbound failed: ${message}`)
|
|
134
135
|
return { ok: false, error: message }
|
|
135
136
|
}
|
|
@@ -168,7 +169,7 @@ export function createWebexHistoryCallback(deps: {
|
|
|
168
169
|
}
|
|
169
170
|
return toHistory(outcome.value)
|
|
170
171
|
} catch (err) {
|
|
171
|
-
const message =
|
|
172
|
+
const message = describeError(err)
|
|
172
173
|
if (args.prefetch === true && isWebexRateLimitError(err)) {
|
|
173
174
|
deps.logger.info(`[webex-bot] history prefetch skipped: rate limited (${message})`)
|
|
174
175
|
return { ok: false, error: message, skipReason: 'rate-limited' }
|
|
@@ -215,7 +216,9 @@ export function createWebexMembershipResolver(deps: {
|
|
|
215
216
|
}
|
|
216
217
|
return { humans: humanMemberIds.length, bots, fetchedAt: now(), truncated, humanMemberIds }
|
|
217
218
|
} catch (err) {
|
|
218
|
-
deps.logger.warn(
|
|
219
|
+
deps.logger.warn(
|
|
220
|
+
`[webex-bot] membership room=${key.chat} failed: ${describeError(err)}; deriving from recent history`,
|
|
221
|
+
)
|
|
219
222
|
return await deriveMembershipFromHistory({
|
|
220
223
|
fetchHistory: (limit) => deps.historyCallback({ chat: key.chat, thread: key.thread, limit, prefetch: true }),
|
|
221
224
|
now,
|
|
@@ -267,7 +270,7 @@ export function createFetchAttachmentCallback(deps: {
|
|
|
267
270
|
size: buffer.length,
|
|
268
271
|
}
|
|
269
272
|
} catch (err) {
|
|
270
|
-
const message =
|
|
273
|
+
const message = describeError(err)
|
|
271
274
|
deps.logger.error(`[webex-bot] fetchAttachment failed for ${url.toString()}: ${message}`)
|
|
272
275
|
return { ok: false, error: message }
|
|
273
276
|
}
|
|
@@ -340,7 +343,7 @@ export function createWebexBotAdapter(options: WebexBotAdapterOptions): WebexBot
|
|
|
340
343
|
)
|
|
341
344
|
await options.router.route(payload)
|
|
342
345
|
} catch (err) {
|
|
343
|
-
logger.error(`[webex-bot] handleInbound failed: ${
|
|
346
|
+
logger.error(`[webex-bot] handleInbound failed: ${describeError(err)}`)
|
|
344
347
|
} finally {
|
|
345
348
|
inflightInbounds--
|
|
346
349
|
if (inflightInbounds === 0 && stopWaiters.length > 0) {
|
|
@@ -362,7 +365,7 @@ export function createWebexBotAdapter(options: WebexBotAdapterOptions): WebexBot
|
|
|
362
365
|
} catch (err) {
|
|
363
366
|
started = false
|
|
364
367
|
botPerson = null
|
|
365
|
-
logger.error(`[webex-bot] login failed: ${
|
|
368
|
+
logger.error(`[webex-bot] login failed: ${describeError(err)}`)
|
|
366
369
|
throw err
|
|
367
370
|
}
|
|
368
371
|
|
|
@@ -378,9 +381,9 @@ export function createWebexBotAdapter(options: WebexBotAdapterOptions): WebexBot
|
|
|
378
381
|
logger.warn(`[webex-bot] disconnected: ${reason}`)
|
|
379
382
|
})
|
|
380
383
|
listener.on('error', (err) => {
|
|
381
|
-
const error = err instanceof Error ? err : new Error(
|
|
384
|
+
const error = err instanceof Error ? err : new Error(describeError(err))
|
|
382
385
|
if (!listenerConnected && listenerStartupError === null) listenerStartupError = error
|
|
383
|
-
logger.error(`[webex-bot] listener error: ${
|
|
386
|
+
logger.error(`[webex-bot] listener error: ${describeError(err)}`)
|
|
384
387
|
})
|
|
385
388
|
listener.on('message_created', (event: WebexBotListenerEventMap['message_created'][0]) => {
|
|
386
389
|
void handleMessage(event)
|
|
@@ -405,14 +408,14 @@ export function createWebexBotAdapter(options: WebexBotAdapterOptions): WebexBot
|
|
|
405
408
|
botPerson = null
|
|
406
409
|
connected = false
|
|
407
410
|
started = false
|
|
408
|
-
logger.error(`[webex-bot] ${reason}: ${
|
|
411
|
+
logger.error(`[webex-bot] ${reason}: ${describeError(cause)}`)
|
|
409
412
|
throw cause
|
|
410
413
|
}
|
|
411
414
|
|
|
412
415
|
try {
|
|
413
416
|
await listener.start()
|
|
414
417
|
} catch (err) {
|
|
415
|
-
rollbackStart('listener start threw', err instanceof Error ? err : new Error(
|
|
418
|
+
rollbackStart('listener start threw', err instanceof Error ? err : new Error(describeError(err)))
|
|
416
419
|
}
|
|
417
420
|
if (!listenerConnected) {
|
|
418
421
|
rollbackStart(
|
|
@@ -474,10 +477,6 @@ function clampLimit(requested: number, max: number): number {
|
|
|
474
477
|
return Math.min(Math.floor(requested), max)
|
|
475
478
|
}
|
|
476
479
|
|
|
477
|
-
function describe(err: unknown): string {
|
|
478
|
-
return err instanceof Error ? err.message : String(err)
|
|
479
|
-
}
|
|
480
|
-
|
|
481
480
|
function dropHint(reason: InboundDropReason): string {
|
|
482
481
|
switch (reason) {
|
|
483
482
|
case 'empty_content':
|
|
@@ -34,6 +34,7 @@ import type {
|
|
|
34
34
|
} from '@/channels/types'
|
|
35
35
|
import type { WebexAccountRecord } from '@/secrets/schema'
|
|
36
36
|
|
|
37
|
+
import { describeError } from './describe-error'
|
|
37
38
|
import { createWebexChannelNameResolver } from './webex-channel-resolver'
|
|
38
39
|
import { classifyInbound, type InboundDropReason, type WebexInboundMessage } from './webex-classify'
|
|
39
40
|
import { resolveWebexBodyText } from './webex-format'
|
|
@@ -136,7 +137,7 @@ export function createOutboundCallback(deps: {
|
|
|
136
137
|
logger.info(`[webex] sent id=${sent.ref} ${tag}`)
|
|
137
138
|
return { ok: true, messageId: sent.ref, messageIds: [sent.ref] }
|
|
138
139
|
} catch (err) {
|
|
139
|
-
const message =
|
|
140
|
+
const message = describeError(err)
|
|
140
141
|
logger.error(`[webex] outbound failed: ${message}`)
|
|
141
142
|
return { ok: false, error: message }
|
|
142
143
|
}
|
|
@@ -178,7 +179,7 @@ export function createTypingCallback(deps: {
|
|
|
178
179
|
.then(() => client.setTyping(target.chat, typing))
|
|
179
180
|
.catch(async (err: unknown) => {
|
|
180
181
|
const tag = formatChannelTag ? await formatChannelTag(target.chat) : `room=${target.chat}`
|
|
181
|
-
logger.warn(`[webex] typing ${tag} phase=${target.phase} failed: ${
|
|
182
|
+
logger.warn(`[webex] typing ${tag} phase=${target.phase} failed: ${describeError(err)}`)
|
|
182
183
|
})
|
|
183
184
|
queues.set(target.chat, next)
|
|
184
185
|
void next.finally(() => {
|
|
@@ -217,7 +218,7 @@ export function createWebexHistoryCallback(deps: {
|
|
|
217
218
|
}
|
|
218
219
|
return toHistory(outcome.value)
|
|
219
220
|
} catch (err) {
|
|
220
|
-
const message =
|
|
221
|
+
const message = describeError(err)
|
|
221
222
|
if (args.prefetch === true && isWebexRateLimitError(err)) {
|
|
222
223
|
deps.logger.info(`[webex] history prefetch skipped: rate limited (${message})`)
|
|
223
224
|
return { ok: false, error: message, skipReason: 'rate-limited' }
|
|
@@ -264,7 +265,9 @@ export function createWebexMembershipResolver(deps: {
|
|
|
264
265
|
}
|
|
265
266
|
return { humans: humanMemberIds.length, bots, fetchedAt: now(), truncated, humanMemberIds }
|
|
266
267
|
} catch (err) {
|
|
267
|
-
deps.logger.warn(
|
|
268
|
+
deps.logger.warn(
|
|
269
|
+
`[webex] membership room=${key.chat} failed: ${describeError(err)}; deriving from recent history`,
|
|
270
|
+
)
|
|
268
271
|
return await deriveMembershipFromHistory({
|
|
269
272
|
fetchHistory: (limit) => deps.historyCallback({ chat: key.chat, thread: key.thread, limit, prefetch: true }),
|
|
270
273
|
now,
|
|
@@ -318,7 +321,7 @@ export function createFetchAttachmentCallback(deps: {
|
|
|
318
321
|
size: buffer.length,
|
|
319
322
|
}
|
|
320
323
|
} catch (err) {
|
|
321
|
-
const message =
|
|
324
|
+
const message = describeError(err)
|
|
322
325
|
deps.logger.error(`[webex] fetchAttachment failed for ${url.toString()}: ${message}`)
|
|
323
326
|
return { ok: false, error: message }
|
|
324
327
|
}
|
|
@@ -391,7 +394,7 @@ export function createWebexAdapter(options: WebexAdapterOptions): WebexAdapter {
|
|
|
391
394
|
)
|
|
392
395
|
await options.router.route(payload)
|
|
393
396
|
} catch (err) {
|
|
394
|
-
logger.error(`[webex] handleInbound failed: ${
|
|
397
|
+
logger.error(`[webex] handleInbound failed: ${describeError(err)}`)
|
|
395
398
|
} finally {
|
|
396
399
|
inflightInbounds--
|
|
397
400
|
if (inflightInbounds === 0 && stopWaiters.length > 0) {
|
|
@@ -419,7 +422,7 @@ export function createWebexAdapter(options: WebexAdapterOptions): WebexAdapter {
|
|
|
419
422
|
started = false
|
|
420
423
|
currentToken = null
|
|
421
424
|
botPerson = null
|
|
422
|
-
logger.error(`[webex] login failed: ${
|
|
425
|
+
logger.error(`[webex] login failed: ${describeError(err)}`)
|
|
423
426
|
throw err
|
|
424
427
|
}
|
|
425
428
|
|
|
@@ -438,9 +441,9 @@ export function createWebexAdapter(options: WebexAdapterOptions): WebexAdapter {
|
|
|
438
441
|
logger.warn(`[webex] disconnected: ${reason}`)
|
|
439
442
|
})
|
|
440
443
|
listener.on('error', (err: unknown) => {
|
|
441
|
-
const error = err instanceof Error ? err : new Error(
|
|
444
|
+
const error = err instanceof Error ? err : new Error(describeError(err))
|
|
442
445
|
if (!listenerConnected && listenerStartupError === null) listenerStartupError = error
|
|
443
|
-
logger.error(`[webex] listener error: ${
|
|
446
|
+
logger.error(`[webex] listener error: ${describeError(err)}`)
|
|
444
447
|
})
|
|
445
448
|
listener.on('message_created', (event: WebexListenerEventMap['message_created'][0]) => {
|
|
446
449
|
void handleMessage(event)
|
|
@@ -470,14 +473,14 @@ export function createWebexAdapter(options: WebexAdapterOptions): WebexAdapter {
|
|
|
470
473
|
currentToken = null
|
|
471
474
|
connected = false
|
|
472
475
|
started = false
|
|
473
|
-
logger.error(`[webex] ${reason}: ${
|
|
476
|
+
logger.error(`[webex] ${reason}: ${describeError(cause)}`)
|
|
474
477
|
throw cause
|
|
475
478
|
}
|
|
476
479
|
|
|
477
480
|
try {
|
|
478
481
|
await listener.start()
|
|
479
482
|
} catch (err) {
|
|
480
|
-
rollbackStart('listener start threw', err instanceof Error ? err : new Error(
|
|
483
|
+
rollbackStart('listener start threw', err instanceof Error ? err : new Error(describeError(err)))
|
|
481
484
|
}
|
|
482
485
|
if (!listenerConnected) {
|
|
483
486
|
rollbackStart(
|
|
@@ -554,10 +557,6 @@ function clampLimit(requested: number, max: number): number {
|
|
|
554
557
|
return Math.min(Math.floor(requested), max)
|
|
555
558
|
}
|
|
556
559
|
|
|
557
|
-
function describe(err: unknown): string {
|
|
558
|
-
return err instanceof Error ? err.message : String(err)
|
|
559
|
-
}
|
|
560
|
-
|
|
561
560
|
function dropHint(reason: InboundDropReason): string {
|
|
562
561
|
switch (reason) {
|
|
563
562
|
case 'empty_content':
|
package/src/cli/compose.ts
CHANGED
|
@@ -17,9 +17,23 @@ import { formatJson, formatReport } from '@/doctor'
|
|
|
17
17
|
|
|
18
18
|
import { formatComposeStatus } from './compose-status'
|
|
19
19
|
import { formatComposeUsage, formatComposeUsageJson } from './compose-usage'
|
|
20
|
+
import { preflightDocker, printDockerGuidance } from './docker-preflight'
|
|
20
21
|
import { c, errorLine, spinner } from './ui'
|
|
21
22
|
import { parseSince, parseUntil } from './usage-args'
|
|
22
23
|
|
|
24
|
+
// Compose fans a docker command out across every agent folder. A down daemon
|
|
25
|
+
// would otherwise surface as N identical raw-stderr rows (one per agent) instead
|
|
26
|
+
// of one actionable message, so gate the whole fleet operation on a single
|
|
27
|
+
// preflight up front. usage reads only local session files and never touches
|
|
28
|
+
// docker, so it is intentionally not gated.
|
|
29
|
+
async function requireDockerOrExit(): Promise<void> {
|
|
30
|
+
const preflight = await preflightDocker()
|
|
31
|
+
if (!preflight.ok) {
|
|
32
|
+
printDockerGuidance(preflight)
|
|
33
|
+
process.exit(1)
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
23
37
|
const startSub = defineCommand({
|
|
24
38
|
meta: { name: 'start', description: 'start every agent in immediate subdirectories of cwd' },
|
|
25
39
|
args: {
|
|
@@ -35,6 +49,7 @@ const startSub = defineCommand({
|
|
|
35
49
|
},
|
|
36
50
|
},
|
|
37
51
|
async run({ args }) {
|
|
52
|
+
await requireDockerOrExit()
|
|
38
53
|
const board = makeBoard('Starting agents')
|
|
39
54
|
const s = spinner()
|
|
40
55
|
const { agents, results } = await composeStart({
|
|
@@ -63,6 +78,7 @@ const startSub = defineCommand({
|
|
|
63
78
|
const stopSub = defineCommand({
|
|
64
79
|
meta: { name: 'stop', description: 'stop every agent in immediate subdirectories of cwd' },
|
|
65
80
|
async run() {
|
|
81
|
+
await requireDockerOrExit()
|
|
66
82
|
const board = makeBoard('Stopping agents')
|
|
67
83
|
const s = spinner()
|
|
68
84
|
const { agents, results } = await composeStop({
|
|
@@ -100,6 +116,7 @@ const restartSub = defineCommand({
|
|
|
100
116
|
},
|
|
101
117
|
},
|
|
102
118
|
async run({ args }) {
|
|
119
|
+
await requireDockerOrExit()
|
|
103
120
|
const board = makeBoard('Restarting agents')
|
|
104
121
|
const s = spinner()
|
|
105
122
|
const { agents, results } = await composeRestart({
|
|
@@ -130,6 +147,7 @@ const restartSub = defineCommand({
|
|
|
130
147
|
const statusSub = defineCommand({
|
|
131
148
|
meta: { name: 'status', description: 'show status of every agent in immediate subdirectories of cwd' },
|
|
132
149
|
async run() {
|
|
150
|
+
await requireDockerOrExit()
|
|
133
151
|
const result = await composeStatus(process.cwd())
|
|
134
152
|
const useColor = Boolean(process.stdout.isTTY) && process.env.NO_COLOR === undefined
|
|
135
153
|
process.stdout.write(`${formatComposeStatus(result, { useColor })}\n`)
|
|
@@ -162,6 +180,8 @@ const logsSub = defineCommand({
|
|
|
162
180
|
tail = parsed.value
|
|
163
181
|
}
|
|
164
182
|
|
|
183
|
+
await requireDockerOrExit()
|
|
184
|
+
|
|
165
185
|
const controller = new AbortController()
|
|
166
186
|
const onSig = (): void => controller.abort()
|
|
167
187
|
process.once('SIGINT', onSig)
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import {
|
|
2
|
+
checkDockerAvailable,
|
|
3
|
+
detectInstalledDockerApps,
|
|
4
|
+
pickRuntimeToNudge,
|
|
5
|
+
renderDockerUnavailableGuidance,
|
|
6
|
+
type DockerExec,
|
|
7
|
+
} from '@/container'
|
|
8
|
+
|
|
9
|
+
import { c, errorLine } from './ui'
|
|
10
|
+
|
|
11
|
+
export type DockerPreflightResult = { ok: true } | { ok: false; summary: string; guidance: string[] }
|
|
12
|
+
|
|
13
|
+
// Single host-side gate every Docker-dependent CLI command calls before it
|
|
14
|
+
// spawns docker. Without it the raw daemon-down stderr (an unactionable socket
|
|
15
|
+
// path) leaks straight to the user. This probes once via checkDockerAvailable,
|
|
16
|
+
// then hands the friendly, runtime-specific guidance back to the caller so each
|
|
17
|
+
// command renders it in its own style (spinner vs console) — no process.exit
|
|
18
|
+
// here, that belongs to the command.
|
|
19
|
+
export async function preflightDocker(exec?: DockerExec): Promise<DockerPreflightResult> {
|
|
20
|
+
const availability = exec ? await checkDockerAvailable(exec) : await checkDockerAvailable()
|
|
21
|
+
if (availability.ok) return { ok: true }
|
|
22
|
+
|
|
23
|
+
const detail = availability.reason === 'daemon-down' ? availability.detail : undefined
|
|
24
|
+
const installed = detectInstalledDockerApps()
|
|
25
|
+
const nudge = pickRuntimeToNudge(process.env, detail, installed)
|
|
26
|
+
const { summary, lines } = renderDockerUnavailableGuidance(availability, {
|
|
27
|
+
platform: process.platform,
|
|
28
|
+
nudge,
|
|
29
|
+
installed,
|
|
30
|
+
})
|
|
31
|
+
return { ok: false, summary, guidance: lines }
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// Prints the friendly guidance to stderr in the standard CLI error style
|
|
35
|
+
// (red ✖ summary, then dimmed guidance lines). Shared by every command's
|
|
36
|
+
// non-spinner failure path so the look is identical everywhere.
|
|
37
|
+
export function printDockerGuidance(failure: Extract<DockerPreflightResult, { ok: false }>): void {
|
|
38
|
+
console.error(errorLine(failure.summary))
|
|
39
|
+
for (const line of failure.guidance) {
|
|
40
|
+
console.error(line === '' ? '' : c.dim(line))
|
|
41
|
+
}
|
|
42
|
+
}
|