@raidiant/notifai 9.3.0 → 10.1.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/CHANGELOG.md +40 -0
- package/README.md +1 -1
- package/dist/client.d.ts +3 -1
- package/dist/client.js +2 -0
- package/dist/client.js.map +1 -1
- package/dist/commands-agent-sessions.d.ts +6 -0
- package/dist/commands-agent-sessions.js +51 -0
- package/dist/commands-agent-sessions.js.map +1 -0
- package/dist/commands-auth.js +4 -4
- package/dist/commands-auth.js.map +1 -1
- package/dist/commands-config.js +11 -4
- package/dist/commands-config.js.map +1 -1
- package/dist/commands-core.d.ts +5 -0
- package/dist/commands-core.js +2 -0
- package/dist/commands-core.js.map +1 -1
- package/dist/commands-doctor.js +121 -40
- package/dist/commands-doctor.js.map +1 -1
- package/dist/commands-harness-context.d.ts +15 -2
- package/dist/commands-harness-context.js +40 -1
- package/dist/commands-harness-context.js.map +1 -1
- package/dist/commands-hooks.d.ts +4 -3
- package/dist/commands-hooks.js +139 -16
- package/dist/commands-hooks.js.map +1 -1
- package/dist/commands-init.js +10 -5
- package/dist/commands-init.js.map +1 -1
- package/dist/commands-send-support.js +18 -1
- package/dist/commands-send-support.js.map +1 -1
- package/dist/commands-send.js +2 -2
- package/dist/commands-send.js.map +1 -1
- package/dist/commands-sounds.d.ts +12 -0
- package/dist/commands-sounds.js +35 -0
- package/dist/commands-sounds.js.map +1 -0
- package/dist/commands.d.ts +2 -0
- package/dist/commands.js +2 -0
- package/dist/commands.js.map +1 -1
- package/dist/config-schema.js +5 -2
- package/dist/config-schema.js.map +1 -1
- package/dist/config.d.ts +3 -4
- package/dist/config.js +5 -2
- package/dist/config.js.map +1 -1
- package/dist/credentials.js +4 -1
- package/dist/credentials.js.map +1 -1
- package/dist/harnesses.d.ts +49 -7
- package/dist/harnesses.js +110 -24
- package/dist/harnesses.js.map +1 -1
- package/dist/hooks.d.ts +2 -2
- package/dist/hooks.js +2 -2
- package/dist/hooks.js.map +1 -1
- package/dist/install-hooks.d.ts +10 -11
- package/dist/install-hooks.js +18 -13
- package/dist/install-hooks.js.map +1 -1
- package/dist/interactive.js +20 -23
- package/dist/interactive.js.map +1 -1
- package/dist/invocation-context.d.ts +2 -2
- package/dist/openclaw-plugin.d.ts +49 -0
- package/dist/openclaw-plugin.js +350 -0
- package/dist/openclaw-plugin.js.map +1 -0
- package/dist/orca-session-title.d.ts +10 -0
- package/dist/orca-session-title.js +98 -0
- package/dist/orca-session-title.js.map +1 -0
- package/dist/program.d.ts +3 -1
- package/dist/program.js +37 -13
- package/dist/program.js.map +1 -1
- package/dist/send.js +11 -14
- package/dist/send.js.map +1 -1
- package/dist/session-activation.js +1 -1
- package/dist/session-activation.js.map +1 -1
- package/dist/session-labels.d.ts +18 -2
- package/dist/session-labels.js +79 -8
- package/dist/session-labels.js.map +1 -1
- package/dist/sound-ref.d.ts +23 -0
- package/dist/sound-ref.js +28 -0
- package/dist/sound-ref.js.map +1 -0
- package/dist/ui/help.d.ts +4 -5
- package/dist/ui/help.js +5 -6
- package/dist/ui/help.js.map +1 -1
- package/package.json +3 -3
- package/src/client.test.ts +12 -0
- package/src/client.ts +8 -0
- package/src/commands-agent-sessions.ts +72 -0
- package/src/commands-auth.ts +4 -3
- package/src/commands-config.ts +10 -4
- package/src/commands-core.ts +6 -0
- package/src/commands-doctor.ts +143 -38
- package/src/commands-harness-context.ts +56 -2
- package/src/commands-hooks.ts +180 -20
- package/src/commands-init.ts +10 -4
- package/src/commands-send-support.ts +23 -1
- package/src/commands-send.ts +2 -2
- package/src/commands-sounds.test.ts +106 -0
- package/src/commands-sounds.ts +49 -0
- package/src/commands.test.ts +529 -17
- package/src/commands.ts +5 -0
- package/src/config-schema.test.ts +1 -0
- package/src/config-schema.ts +5 -2
- package/src/config.test.ts +42 -20
- package/src/config.ts +6 -5
- package/src/credentials.test.ts +20 -0
- package/src/credentials.ts +4 -1
- package/src/fixtures/hermes-0.20.6-classic-cli-local.json +50 -0
- package/src/fixtures/openclaw-2026.7.1-2-agent-local.json +57 -0
- package/src/harness-integration.test.ts +294 -0
- package/src/harnesses.test.ts +115 -8
- package/src/harnesses.ts +133 -30
- package/src/hooks.test.ts +4 -3
- package/src/hooks.ts +4 -4
- package/src/install-hooks.test.ts +213 -4
- package/src/install-hooks.ts +38 -30
- package/src/interactive.test.ts +31 -0
- package/src/interactive.ts +20 -26
- package/src/invocation-context.ts +2 -2
- package/src/openclaw-plugin.ts +409 -0
- package/src/orca-session-title.test.ts +54 -0
- package/src/orca-session-title.ts +103 -0
- package/src/program.test.ts +27 -0
- package/src/program.ts +47 -12
- package/src/send.ts +10 -19
- package/src/session-activation.ts +1 -1
- package/src/session-labels.test.ts +58 -9
- package/src/session-labels.ts +95 -12
- package/src/skill.test.ts +14 -3
- package/src/sound-ref.test.ts +31 -0
- package/src/sound-ref.ts +34 -0
- package/src/ui/config-view.test.ts +1 -0
- package/src/ui/help.test.ts +16 -0
- package/src/ui/help.ts +6 -7
|
@@ -0,0 +1,409 @@
|
|
|
1
|
+
import path from 'node:path'
|
|
2
|
+
import { hookHostPlatform, type HookHostPlatform } from './hook-adapter.js'
|
|
3
|
+
import { harnessAccountHome } from './install-hooks.js'
|
|
4
|
+
import {
|
|
5
|
+
MISSING_LIFECYCLE_GUIDANCE_CONTEXT,
|
|
6
|
+
WORKER_ACTIVATION_CONTEXT,
|
|
7
|
+
} from './session-activation.js'
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* The OpenClaw adapter.
|
|
11
|
+
*
|
|
12
|
+
* OpenClaw's extension point is an in-process Gateway plugin, not a command
|
|
13
|
+
* hook. The generated module shells out to the same `notifai hook <event>`
|
|
14
|
+
* commands every other harness invokes, so presence, activation, and
|
|
15
|
+
* retirement stay in the CLI.
|
|
16
|
+
*
|
|
17
|
+
* before_prompt_build -> session-start / subagent-start (first owner/worker)
|
|
18
|
+
* message_received -> user-prompt-submit (User is present)
|
|
19
|
+
* agent_end -> stop (the turn ended)
|
|
20
|
+
* session_end -> session-end (retire local state)
|
|
21
|
+
* resolve_exec_env -> NOTIFAI_ACTIVE_* markers (exact Source Context)
|
|
22
|
+
*
|
|
23
|
+
* `command:stop` is a User abort and is deliberately not wired. Asynchronous
|
|
24
|
+
* ask is unsupported until a live continuation probe.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
export const OPENCLAW_PLUGIN_MARKER = '// notifai managed openclaw plugin'
|
|
28
|
+
export const OPENCLAW_PLUGIN_ID = 'notifai'
|
|
29
|
+
export const OPENCLAW_PLUGIN_FILENAME = 'index.js'
|
|
30
|
+
export const OPENCLAW_PLUGIN_MANIFEST = 'openclaw.plugin.json'
|
|
31
|
+
export const OPENCLAW_PLUGIN_PACKAGE = 'package.json'
|
|
32
|
+
|
|
33
|
+
const OPENCLAW_ADAPTER_VERSION = 1
|
|
34
|
+
|
|
35
|
+
export const OPENCLAW_EVENTS = [
|
|
36
|
+
['SessionStart', 'session-start'],
|
|
37
|
+
['SubagentStart', 'subagent-start'],
|
|
38
|
+
['UserPromptSubmit', 'user-prompt-submit'],
|
|
39
|
+
['Stop', 'stop'],
|
|
40
|
+
['SessionEnd', 'session-end'],
|
|
41
|
+
] as const
|
|
42
|
+
|
|
43
|
+
export function openclawStateDir(
|
|
44
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
45
|
+
platform: NodeJS.Platform | HookHostPlatform = process.platform,
|
|
46
|
+
): string {
|
|
47
|
+
const override = env['OPENCLAW_STATE_DIR']
|
|
48
|
+
if (override !== undefined && override !== '') return override
|
|
49
|
+
const homeOverride = env['OPENCLAW_HOME']
|
|
50
|
+
if (homeOverride !== undefined && homeOverride !== '') {
|
|
51
|
+
return path.join(homeOverride, '.openclaw')
|
|
52
|
+
}
|
|
53
|
+
return path.join(harnessAccountHome(env, platform), '.openclaw')
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function openclawConfigPath(
|
|
57
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
58
|
+
platform: NodeJS.Platform | HookHostPlatform = process.platform,
|
|
59
|
+
): string {
|
|
60
|
+
const override = env['OPENCLAW_CONFIG_PATH']
|
|
61
|
+
if (override !== undefined && override !== '') return override
|
|
62
|
+
return path.join(openclawStateDir(env, platform), 'openclaw.json')
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export function openclawPluginDir(
|
|
66
|
+
global: boolean,
|
|
67
|
+
cwd: string,
|
|
68
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
69
|
+
platform: NodeJS.Platform | HookHostPlatform = process.platform,
|
|
70
|
+
): string {
|
|
71
|
+
return global
|
|
72
|
+
? path.join(openclawStateDir(env, platform), 'extensions', OPENCLAW_PLUGIN_ID)
|
|
73
|
+
: path.join(cwd, '.openclaw', 'extensions', OPENCLAW_PLUGIN_ID)
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export function openclawPluginPath(
|
|
77
|
+
global: boolean,
|
|
78
|
+
cwd: string,
|
|
79
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
80
|
+
platform: NodeJS.Platform | HookHostPlatform = process.platform,
|
|
81
|
+
): string {
|
|
82
|
+
return path.join(openclawPluginDir(global, cwd, env, platform), OPENCLAW_PLUGIN_FILENAME)
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export interface OpenclawPluginOptions {
|
|
86
|
+
adapterPath: string
|
|
87
|
+
timeoutSeconds: number
|
|
88
|
+
platform?: NodeJS.Platform | HookHostPlatform
|
|
89
|
+
nodePath?: string
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
export function openclawPluginManifest(): string {
|
|
93
|
+
return `${JSON.stringify(
|
|
94
|
+
{
|
|
95
|
+
id: OPENCLAW_PLUGIN_ID,
|
|
96
|
+
name: 'Notifai',
|
|
97
|
+
description: 'Notifai lifecycle activation, Source Context, and session observation.',
|
|
98
|
+
activation: { onStartup: true },
|
|
99
|
+
configSchema: { type: 'object', additionalProperties: false },
|
|
100
|
+
},
|
|
101
|
+
null,
|
|
102
|
+
2,
|
|
103
|
+
)}\n`
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export function openclawPluginPackage(): string {
|
|
107
|
+
return `${JSON.stringify(
|
|
108
|
+
{
|
|
109
|
+
name: 'notifai-openclaw',
|
|
110
|
+
version: '1.0.0',
|
|
111
|
+
type: 'module',
|
|
112
|
+
openclaw: { extensions: [`./${OPENCLAW_PLUGIN_FILENAME}`] },
|
|
113
|
+
},
|
|
114
|
+
null,
|
|
115
|
+
2,
|
|
116
|
+
)}\n`
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
export function openclawPluginSource(options: OpenclawPluginOptions): string {
|
|
120
|
+
const { adapterPath, timeoutSeconds } = options
|
|
121
|
+
const win32 = hookHostPlatform(options.platform) === 'win32'
|
|
122
|
+
const nodeConstant = win32
|
|
123
|
+
? `const NODE = ${JSON.stringify(options.nodePath ?? process.execPath)}\n`
|
|
124
|
+
: ''
|
|
125
|
+
const spawnArguments = win32
|
|
126
|
+
? 'NODE, [ADAPTER, "hook", event, "--owner", "notifai", "--harness", "openclaw"]'
|
|
127
|
+
: 'ADAPTER, ["hook", event, "--owner", "notifai", "--harness", "openclaw"]'
|
|
128
|
+
const windowsHide = win32 ? '\n windowsHide: true,' : ''
|
|
129
|
+
return `${OPENCLAW_PLUGIN_MARKER}
|
|
130
|
+
// Generated by \`notifai hooks install --harness openclaw\`. Edits are lost on
|
|
131
|
+
// the next install; change the CLI instead, which is where the logic lives.
|
|
132
|
+
import { spawn } from "node:child_process"
|
|
133
|
+
|
|
134
|
+
${nodeConstant}const ADAPTER = ${JSON.stringify(adapterPath)}
|
|
135
|
+
const TIMEOUT_MS = ${timeoutSeconds * 1000}
|
|
136
|
+
const ADAPTER_VERSION = ${OPENCLAW_ADAPTER_VERSION}
|
|
137
|
+
const MISSING_LIFECYCLE_GUIDANCE_CONTEXT = ${JSON.stringify(MISSING_LIFECYCLE_GUIDANCE_CONTEXT)}
|
|
138
|
+
const WORKER_ACTIVATION_CONTEXT = ${JSON.stringify(WORKER_ACTIVATION_CONTEXT)}
|
|
139
|
+
|
|
140
|
+
function runHook(event, envelope) {
|
|
141
|
+
return new Promise((resolve) => {
|
|
142
|
+
let child
|
|
143
|
+
try {
|
|
144
|
+
child = spawn(${spawnArguments}, {
|
|
145
|
+
env: process.env,
|
|
146
|
+
shell: false,${windowsHide}
|
|
147
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
148
|
+
})
|
|
149
|
+
} catch {
|
|
150
|
+
resolve(null)
|
|
151
|
+
return
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
let stdout = ""
|
|
155
|
+
let settled = false
|
|
156
|
+
const finish = (value) => {
|
|
157
|
+
if (settled) return
|
|
158
|
+
settled = true
|
|
159
|
+
clearTimeout(timer)
|
|
160
|
+
resolve(value)
|
|
161
|
+
}
|
|
162
|
+
const timer = setTimeout(() => {
|
|
163
|
+
child.kill("SIGTERM")
|
|
164
|
+
finish(null)
|
|
165
|
+
}, TIMEOUT_MS)
|
|
166
|
+
|
|
167
|
+
child.stdout?.setEncoding("utf-8")
|
|
168
|
+
child.stdout?.on("data", (chunk) => {
|
|
169
|
+
stdout += chunk
|
|
170
|
+
})
|
|
171
|
+
child.stderr?.resume()
|
|
172
|
+
child.on("error", () => finish(null))
|
|
173
|
+
child.on("close", () => finish(stdout))
|
|
174
|
+
|
|
175
|
+
try {
|
|
176
|
+
child.stdin?.end(JSON.stringify(envelope))
|
|
177
|
+
} catch {
|
|
178
|
+
finish(null)
|
|
179
|
+
}
|
|
180
|
+
})
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
function sessionKeyOf(event, ctx) {
|
|
184
|
+
const key = ctx?.sessionKey ?? event?.sessionKey ?? event?.context?.sessionKey
|
|
185
|
+
return typeof key === "string" ? key.trim() : ""
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
function workspaceDirOf(event, ctx) {
|
|
189
|
+
const dir = ctx?.workspaceDir ?? event?.workspaceDir ?? event?.context?.workspaceDir
|
|
190
|
+
return typeof dir === "string" && dir.length > 0 ? dir : process.cwd()
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
function isWorkerSession(sessionKey, ctx) {
|
|
194
|
+
if (sessionKey === "") return true
|
|
195
|
+
if (sessionKey.includes(":subagent:")) return true
|
|
196
|
+
if (sessionKey.includes(":acp:")) return true
|
|
197
|
+
if (ctx?.targetKind === "acp" || ctx?.dispatchKind === "acp") return true
|
|
198
|
+
if (typeof ctx?.parentSessionKey === "string" && ctx.parentSessionKey.length > 0) return true
|
|
199
|
+
return false
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
function isUserMessage(event, ctx) {
|
|
203
|
+
const from = event?.from ?? event?.context?.from ?? ctx?.senderId
|
|
204
|
+
if (typeof from !== "string" || from.trim().length === 0) return false
|
|
205
|
+
const trigger = ctx?.trigger ?? event?.trigger
|
|
206
|
+
if (trigger === "cron" || trigger === "heartbeat") return false
|
|
207
|
+
return true
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
function register(api) {
|
|
211
|
+
const activated = new Set()
|
|
212
|
+
api.on("before_prompt_build", async (event, ctx) => {
|
|
213
|
+
const sessionKey = sessionKeyOf(event, ctx)
|
|
214
|
+
if (sessionKey === "") return { prependContext: WORKER_ACTIVATION_CONTEXT }
|
|
215
|
+
if (activated.has(sessionKey)) return
|
|
216
|
+
const worker = isWorkerSession(sessionKey, ctx)
|
|
217
|
+
const resolved = await runHook(worker ? "subagent-start" : "session-start", {
|
|
218
|
+
session_id: sessionKey,
|
|
219
|
+
cwd: workspaceDirOf(event, ctx),
|
|
220
|
+
hook_event_name: worker ? "SubagentStart" : "SessionStart",
|
|
221
|
+
})
|
|
222
|
+
const context = typeof resolved === "string" && resolved.trim().length > 0
|
|
223
|
+
? resolved.trim()
|
|
224
|
+
: worker ? WORKER_ACTIVATION_CONTEXT : MISSING_LIFECYCLE_GUIDANCE_CONTEXT
|
|
225
|
+
activated.add(sessionKey)
|
|
226
|
+
return { prependContext: context }
|
|
227
|
+
})
|
|
228
|
+
|
|
229
|
+
api.on("message_received", async (event, ctx) => {
|
|
230
|
+
if (!isUserMessage(event, ctx)) return
|
|
231
|
+
const sessionKey = sessionKeyOf(event, ctx)
|
|
232
|
+
if (sessionKey === "") return
|
|
233
|
+
await runHook("user-prompt-submit", {
|
|
234
|
+
session_id: sessionKey,
|
|
235
|
+
cwd: workspaceDirOf(event, ctx),
|
|
236
|
+
hook_event_name: "UserPromptSubmit",
|
|
237
|
+
})
|
|
238
|
+
})
|
|
239
|
+
|
|
240
|
+
api.on("agent_end", async (event, ctx) => {
|
|
241
|
+
const sessionKey = sessionKeyOf(event, ctx)
|
|
242
|
+
if (sessionKey === "") return
|
|
243
|
+
await runHook("stop", {
|
|
244
|
+
session_id: sessionKey,
|
|
245
|
+
cwd: workspaceDirOf(event, ctx),
|
|
246
|
+
hook_event_name: "Stop",
|
|
247
|
+
})
|
|
248
|
+
})
|
|
249
|
+
|
|
250
|
+
api.on("session_end", async (event, ctx) => {
|
|
251
|
+
const sessionKey = sessionKeyOf(event, ctx)
|
|
252
|
+
if (sessionKey === "") return
|
|
253
|
+
activated.delete(sessionKey)
|
|
254
|
+
await runHook("session-end", {
|
|
255
|
+
session_id: sessionKey,
|
|
256
|
+
cwd: workspaceDirOf(event, ctx),
|
|
257
|
+
hook_event_name: "SessionEnd",
|
|
258
|
+
})
|
|
259
|
+
})
|
|
260
|
+
|
|
261
|
+
api.on("resolve_exec_env", (event, ctx) => {
|
|
262
|
+
const sessionKey = sessionKeyOf(event, ctx)
|
|
263
|
+
if (sessionKey === "") return
|
|
264
|
+
return {
|
|
265
|
+
NOTIFAI_ACTIVE_HARNESS: "openclaw",
|
|
266
|
+
NOTIFAI_ACTIVE_SESSION_ID: sessionKey,
|
|
267
|
+
}
|
|
268
|
+
})
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
export default {
|
|
272
|
+
id: ${JSON.stringify(OPENCLAW_PLUGIN_ID)},
|
|
273
|
+
name: "Notifai",
|
|
274
|
+
register,
|
|
275
|
+
}
|
|
276
|
+
`
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
export function isOurOpenclawPlugin(contents: string): boolean {
|
|
280
|
+
return contents.includes(OPENCLAW_PLUGIN_MARKER)
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
export function openclawPluginTarget(
|
|
284
|
+
contents: string,
|
|
285
|
+
): { adapter: string; current: boolean; timeoutSeconds?: number; nodePath?: string } | null {
|
|
286
|
+
if (!isOurOpenclawPlugin(contents)) return null
|
|
287
|
+
const adapter = /^const ADAPTER = (".*")$/m.exec(contents)?.[1]
|
|
288
|
+
const node = /^const NODE = (".*")$/m.exec(contents)?.[1]
|
|
289
|
+
const version = Number(/^const ADAPTER_VERSION = (\d+)$/m.exec(contents)?.[1] ?? 0)
|
|
290
|
+
const timeoutMs = Number(/^const TIMEOUT_MS = (\d+)$/m.exec(contents)?.[1] ?? Number.NaN)
|
|
291
|
+
if (adapter === undefined) return null
|
|
292
|
+
try {
|
|
293
|
+
return {
|
|
294
|
+
adapter: JSON.parse(adapter) as string,
|
|
295
|
+
current: version === OPENCLAW_ADAPTER_VERSION,
|
|
296
|
+
...(Number.isFinite(timeoutMs) ? { timeoutSeconds: timeoutMs / 1000 } : {}),
|
|
297
|
+
...(node === undefined ? {} : { nodePath: JSON.parse(node) as string }),
|
|
298
|
+
}
|
|
299
|
+
} catch {
|
|
300
|
+
return null
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
export function parseOpenclawConfig(source: string): Record<string, unknown> {
|
|
305
|
+
try {
|
|
306
|
+
const parsed: unknown = JSON.parse(source)
|
|
307
|
+
if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) {
|
|
308
|
+
return parsed as Record<string, unknown>
|
|
309
|
+
}
|
|
310
|
+
} catch {
|
|
311
|
+
const stripped = source
|
|
312
|
+
.replace(/\/\*[\s\S]*?\*\//g, '')
|
|
313
|
+
.replace(/^\s*\/\/.*$/gm, '')
|
|
314
|
+
.replace(/,(\s*[}\]])/g, '$1')
|
|
315
|
+
const parsed: unknown = JSON.parse(stripped)
|
|
316
|
+
if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) {
|
|
317
|
+
return parsed as Record<string, unknown>
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
throw new Error('OpenClaw config is not a JSON object')
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
export function mergeOpenclawNotifaiEntry(
|
|
324
|
+
config: Record<string, unknown>,
|
|
325
|
+
pluginDir: string,
|
|
326
|
+
global: boolean,
|
|
327
|
+
): Record<string, unknown> {
|
|
328
|
+
const plugins =
|
|
329
|
+
config.plugins !== null && typeof config.plugins === 'object' && !Array.isArray(config.plugins)
|
|
330
|
+
? { ...(config.plugins as Record<string, unknown>) }
|
|
331
|
+
: {}
|
|
332
|
+
const entries =
|
|
333
|
+
plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
|
|
334
|
+
? { ...(plugins.entries as Record<string, unknown>) }
|
|
335
|
+
: {}
|
|
336
|
+
const existing =
|
|
337
|
+
entries[OPENCLAW_PLUGIN_ID] !== null &&
|
|
338
|
+
typeof entries[OPENCLAW_PLUGIN_ID] === 'object' &&
|
|
339
|
+
!Array.isArray(entries[OPENCLAW_PLUGIN_ID])
|
|
340
|
+
? { ...(entries[OPENCLAW_PLUGIN_ID] as Record<string, unknown>) }
|
|
341
|
+
: {}
|
|
342
|
+
const hooks =
|
|
343
|
+
existing.hooks !== null && typeof existing.hooks === 'object' && !Array.isArray(existing.hooks)
|
|
344
|
+
? { ...(existing.hooks as Record<string, unknown>) }
|
|
345
|
+
: {}
|
|
346
|
+
entries[OPENCLAW_PLUGIN_ID] = {
|
|
347
|
+
...existing,
|
|
348
|
+
enabled: true,
|
|
349
|
+
hooks: { ...hooks, allowConversationAccess: true },
|
|
350
|
+
}
|
|
351
|
+
plugins.entries = entries
|
|
352
|
+
if (!global) {
|
|
353
|
+
const load =
|
|
354
|
+
plugins.load !== null && typeof plugins.load === 'object' && !Array.isArray(plugins.load)
|
|
355
|
+
? { ...(plugins.load as Record<string, unknown>) }
|
|
356
|
+
: {}
|
|
357
|
+
const paths = Array.isArray(load.paths) ? [...load.paths] : []
|
|
358
|
+
if (!paths.includes(pluginDir)) paths.push(pluginDir)
|
|
359
|
+
load.paths = paths
|
|
360
|
+
plugins.load = load
|
|
361
|
+
}
|
|
362
|
+
return { ...config, plugins }
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
export function removeOpenclawNotifaiEntry(
|
|
366
|
+
config: Record<string, unknown>,
|
|
367
|
+
pluginDir: string,
|
|
368
|
+
): Record<string, unknown> {
|
|
369
|
+
const plugins =
|
|
370
|
+
config.plugins !== null && typeof config.plugins === 'object' && !Array.isArray(config.plugins)
|
|
371
|
+
? { ...(config.plugins as Record<string, unknown>) }
|
|
372
|
+
: {}
|
|
373
|
+
const entries =
|
|
374
|
+
plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
|
|
375
|
+
? { ...(plugins.entries as Record<string, unknown>) }
|
|
376
|
+
: {}
|
|
377
|
+
delete entries[OPENCLAW_PLUGIN_ID]
|
|
378
|
+
if (Object.keys(entries).length > 0) plugins.entries = entries
|
|
379
|
+
else delete plugins.entries
|
|
380
|
+
const load =
|
|
381
|
+
plugins.load !== null && typeof plugins.load === 'object' && !Array.isArray(plugins.load)
|
|
382
|
+
? { ...(plugins.load as Record<string, unknown>) }
|
|
383
|
+
: {}
|
|
384
|
+
if (Array.isArray(load.paths)) {
|
|
385
|
+
const paths = load.paths.filter((value) => value !== pluginDir)
|
|
386
|
+
if (paths.length > 0) load.paths = paths
|
|
387
|
+
else delete load.paths
|
|
388
|
+
}
|
|
389
|
+
if (Object.keys(load).length > 0) plugins.load = load
|
|
390
|
+
else delete plugins.load
|
|
391
|
+
if (Object.keys(plugins).length > 0) return { ...config, plugins }
|
|
392
|
+
const next = { ...config }
|
|
393
|
+
delete next.plugins
|
|
394
|
+
return next
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
/** Config-directory presence is not ownership. These files mean OpenClaw is actually configured. */
|
|
398
|
+
export function openclawHasGlobalEvidence(
|
|
399
|
+
exists: (file: string) => boolean,
|
|
400
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
401
|
+
platform: NodeJS.Platform | HookHostPlatform = process.platform,
|
|
402
|
+
): boolean {
|
|
403
|
+
const state = openclawStateDir(env, platform)
|
|
404
|
+
return (
|
|
405
|
+
exists(openclawConfigPath(env, platform)) ||
|
|
406
|
+
exists(path.join(state, 'agents')) ||
|
|
407
|
+
exists(path.join(state, 'workspace'))
|
|
408
|
+
)
|
|
409
|
+
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest'
|
|
2
|
+
import { readOrcaSessionTitle, type OrcaCommand } from './orca-session-title.js'
|
|
3
|
+
|
|
4
|
+
const worktreeId = 'repo-123::/worktrees/agent-session-labels'
|
|
5
|
+
|
|
6
|
+
function response(overrides: Record<string, unknown> = {}): string {
|
|
7
|
+
return JSON.stringify({
|
|
8
|
+
ok: true,
|
|
9
|
+
result: {
|
|
10
|
+
worktree: {
|
|
11
|
+
id: worktreeId,
|
|
12
|
+
path: '/worktrees/agent-session-labels',
|
|
13
|
+
displayName: 'Agent Session context labels',
|
|
14
|
+
...overrides,
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
})
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
describe('Orca Agent Session title context', () => {
|
|
21
|
+
it('accepts only the User-facing title returned for the exact managed worktree', () => {
|
|
22
|
+
const calls: { executable: string; args: readonly string[] }[] = []
|
|
23
|
+
const command: OrcaCommand = (executable, args) => {
|
|
24
|
+
calls.push({ executable, args })
|
|
25
|
+
return response()
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
expect(
|
|
29
|
+
readOrcaSessionTitle({ TERM_PROGRAM: 'Orca', ORCA_WORKTREE_ID: worktreeId }, command),
|
|
30
|
+
).toBe('Agent Session context labels')
|
|
31
|
+
expect(calls).toEqual([
|
|
32
|
+
{
|
|
33
|
+
executable: 'orca',
|
|
34
|
+
args: ['worktree', 'show', '--worktree', `id:${worktreeId}`, '--json'],
|
|
35
|
+
},
|
|
36
|
+
])
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
it.each([
|
|
40
|
+
['command failure', () => null],
|
|
41
|
+
['malformed JSON', () => '{not json}'],
|
|
42
|
+
['failed response', () => JSON.stringify({ ok: false })],
|
|
43
|
+
['different worktree id', () => response({ id: 'repo-123::/worktrees/other' })],
|
|
44
|
+
['different worktree path', () => response({ path: '/private/untrusted' })],
|
|
45
|
+
['blank display name', () => response({ displayName: ' ' })],
|
|
46
|
+
])('leaves the generated fallback exceptional when context is unavailable: %s', (_name, command) => {
|
|
47
|
+
expect(
|
|
48
|
+
readOrcaSessionTitle(
|
|
49
|
+
{ TERM_PROGRAM: 'Orca', ORCA_WORKTREE_ID: worktreeId },
|
|
50
|
+
command,
|
|
51
|
+
),
|
|
52
|
+
).toBeUndefined()
|
|
53
|
+
})
|
|
54
|
+
})
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process'
|
|
2
|
+
import path from 'node:path'
|
|
3
|
+
|
|
4
|
+
export type OrcaSessionTitleLookup = (env: NodeJS.ProcessEnv) => string | undefined
|
|
5
|
+
export type OrcaCommand = (executable: string, args: readonly string[]) => string | null
|
|
6
|
+
|
|
7
|
+
const runOrcaCommand: OrcaCommand = (executable, args) => {
|
|
8
|
+
try {
|
|
9
|
+
return execFileSync(executable, args, {
|
|
10
|
+
encoding: 'utf8',
|
|
11
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
12
|
+
timeout: 2_000,
|
|
13
|
+
maxBuffer: 512 * 1024,
|
|
14
|
+
windowsHide: true,
|
|
15
|
+
}).trim()
|
|
16
|
+
} catch {
|
|
17
|
+
return null
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function containsControlCharacter(value: string): boolean {
|
|
22
|
+
return Array.from(value).some((character) => {
|
|
23
|
+
const codePoint = character.codePointAt(0) ?? 0
|
|
24
|
+
return codePoint < 32 || codePoint === 127
|
|
25
|
+
})
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function worktreePathFromId(value: string): string | null {
|
|
29
|
+
if (value.length === 0 || value.length > 4_096 || containsControlCharacter(value)) return null
|
|
30
|
+
const separator = value.indexOf('::')
|
|
31
|
+
if (separator <= 0) return null
|
|
32
|
+
const repoId = value.slice(0, separator)
|
|
33
|
+
const worktreePath = value.slice(separator + 2)
|
|
34
|
+
if (!/^[A-Za-z0-9._-]+$/u.test(repoId) || worktreePath.length === 0) return null
|
|
35
|
+
return path.posix.isAbsolute(worktreePath) || path.win32.isAbsolute(worktreePath)
|
|
36
|
+
? worktreePath
|
|
37
|
+
: null
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function orcaExecutable(env: NodeJS.ProcessEnv): string | null {
|
|
41
|
+
const configured = env['ORCA_CLI_COMMAND']?.trim()
|
|
42
|
+
if (configured !== undefined && configured.length > 0) {
|
|
43
|
+
return containsControlCharacter(configured) ? null : configured
|
|
44
|
+
}
|
|
45
|
+
return env['ORCA_DEV_REPO_ROOT'] === undefined ? 'orca' : 'orca-dev'
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* Read the User-facing task name assigned to this exact Orca worktree.
|
|
50
|
+
*
|
|
51
|
+
* The environment contributes only an opaque selector. Orca must return that
|
|
52
|
+
* exact id and its matching path before its display name becomes trusted; no
|
|
53
|
+
* path component or identifier is ever promoted into an Agent Session label.
|
|
54
|
+
*/
|
|
55
|
+
export function readOrcaSessionTitle(
|
|
56
|
+
env: NodeJS.ProcessEnv,
|
|
57
|
+
command: OrcaCommand = runOrcaCommand,
|
|
58
|
+
): string | undefined {
|
|
59
|
+
if (env['TERM_PROGRAM'] !== 'Orca') return undefined
|
|
60
|
+
const worktreeId = env['ORCA_WORKTREE_ID']
|
|
61
|
+
if (worktreeId === undefined) return undefined
|
|
62
|
+
const expectedPath = worktreePathFromId(worktreeId)
|
|
63
|
+
if (expectedPath === null) return undefined
|
|
64
|
+
const executable = orcaExecutable(env)
|
|
65
|
+
if (executable === null) return undefined
|
|
66
|
+
|
|
67
|
+
let output: string | null
|
|
68
|
+
try {
|
|
69
|
+
output = command(executable, [
|
|
70
|
+
'worktree',
|
|
71
|
+
'show',
|
|
72
|
+
'--worktree',
|
|
73
|
+
`id:${worktreeId}`,
|
|
74
|
+
'--json',
|
|
75
|
+
])
|
|
76
|
+
} catch {
|
|
77
|
+
return undefined
|
|
78
|
+
}
|
|
79
|
+
if (output === null || output === '') return undefined
|
|
80
|
+
|
|
81
|
+
let parsed: unknown
|
|
82
|
+
try {
|
|
83
|
+
parsed = JSON.parse(output)
|
|
84
|
+
} catch {
|
|
85
|
+
return undefined
|
|
86
|
+
}
|
|
87
|
+
if (typeof parsed !== 'object' || parsed === null) return undefined
|
|
88
|
+
const response = parsed as {
|
|
89
|
+
ok?: unknown
|
|
90
|
+
result?: { worktree?: { id?: unknown; path?: unknown; displayName?: unknown } }
|
|
91
|
+
}
|
|
92
|
+
const worktree = response.result?.worktree
|
|
93
|
+
if (
|
|
94
|
+
response.ok !== true ||
|
|
95
|
+
worktree?.id !== worktreeId ||
|
|
96
|
+
worktree.path !== expectedPath ||
|
|
97
|
+
typeof worktree.displayName !== 'string' ||
|
|
98
|
+
worktree.displayName.trim().length === 0
|
|
99
|
+
) {
|
|
100
|
+
return undefined
|
|
101
|
+
}
|
|
102
|
+
return worktree.displayName
|
|
103
|
+
}
|
package/src/program.test.ts
CHANGED
|
@@ -116,6 +116,33 @@ describe('program argv parsing', () => {
|
|
|
116
116
|
expect(enabled).toBe(1)
|
|
117
117
|
})
|
|
118
118
|
|
|
119
|
+
it('dispatches the current Agent Session rename without exposing an id override', async () => {
|
|
120
|
+
let label: string | undefined
|
|
121
|
+
const result = await parse(['session', 'rename', 'Hermes Support'], {
|
|
122
|
+
agentSessionRename: (async (_deps, value) => ((label = value), 0)) as ProgramRunners['agentSessionRename'],
|
|
123
|
+
})
|
|
124
|
+
expect(result.exitCode).toBe(0)
|
|
125
|
+
expect(label).toBe('Hermes Support')
|
|
126
|
+
})
|
|
127
|
+
|
|
128
|
+
it('dispatches sounds --json onto soundsCommand', async () => {
|
|
129
|
+
let seen: Record<string, unknown> | undefined
|
|
130
|
+
const result = await parse(['sounds', '--json'], {
|
|
131
|
+
sounds: (async (_deps, flags) => ((seen = flags as Record<string, unknown>), 0)) as ProgramRunners['sounds'],
|
|
132
|
+
})
|
|
133
|
+
expect(result.exitCode).toBe(0)
|
|
134
|
+
expect(seen).toMatchObject({ json: true })
|
|
135
|
+
})
|
|
136
|
+
|
|
137
|
+
it('passes a custom sound name through --sound', async () => {
|
|
138
|
+
let seen: Record<string, unknown> | undefined
|
|
139
|
+
await parse(
|
|
140
|
+
['send', '--kind', 'done', '--title', 'T', '--body', 'B', '--sound', 'Kitchen timer'],
|
|
141
|
+
{ send: (async (_deps, flags) => ((seen = flags as Record<string, unknown>), 0)) as ProgramRunners['send'] },
|
|
142
|
+
)
|
|
143
|
+
expect(seen).toMatchObject({ sound: 'Kitchen timer' })
|
|
144
|
+
})
|
|
145
|
+
|
|
119
146
|
it('drops empty collector defaults so "not passed" stays absent', async () => {
|
|
120
147
|
let seen: Record<string, unknown> | undefined
|
|
121
148
|
await parse(
|