@raidiant/notifai 10.0.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 +14 -0
- package/README.md +1 -1
- package/dist/commands-auth.js +4 -4
- package/dist/commands-auth.js.map +1 -1
- package/dist/commands-core.d.ts +2 -0
- package/dist/commands-core.js +2 -0
- package/dist/commands-core.js.map +1 -1
- package/dist/commands-doctor.js +79 -36
- package/dist/commands-doctor.js.map +1 -1
- package/dist/commands-harness-context.js +8 -0
- package/dist/commands-harness-context.js.map +1 -1
- package/dist/commands-hooks.js +122 -5
- 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/harnesses.d.ts +2 -2
- package/dist/harnesses.js +22 -2
- package/dist/harnesses.js.map +1 -1
- package/dist/install-hooks.js +15 -9
- package/dist/install-hooks.js.map +1 -1
- package/dist/interactive.js +20 -23
- package/dist/interactive.js.map +1 -1
- 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/program.js +9 -8
- package/dist/program.js.map +1 -1
- package/dist/session-activation.js +1 -1
- package/dist/session-activation.js.map +1 -1
- 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 +2 -2
- package/src/commands-auth.ts +4 -3
- package/src/commands-core.ts +3 -0
- package/src/commands-doctor.ts +95 -34
- package/src/commands-harness-context.ts +8 -0
- package/src/commands-hooks.ts +144 -2
- package/src/commands-init.ts +10 -4
- package/src/commands.test.ts +185 -6
- package/src/fixtures/openclaw-2026.7.1-2-agent-local.json +57 -0
- package/src/harness-integration.test.ts +82 -0
- package/src/harnesses.test.ts +9 -1
- package/src/harnesses.ts +24 -2
- package/src/install-hooks.test.ts +208 -0
- package/src/install-hooks.ts +19 -9
- package/src/interactive.test.ts +31 -0
- package/src/interactive.ts +20 -26
- package/src/openclaw-plugin.ts +409 -0
- package/src/program.ts +9 -8
- package/src/session-activation.ts +1 -1
- package/src/skill.test.ts +2 -2
- 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
|
+
}
|
package/src/program.ts
CHANGED
|
@@ -180,11 +180,12 @@ export function buildProgram(deps: CommandDeps, options: BuildProgramOptions = {
|
|
|
180
180
|
/**
|
|
181
181
|
* Bare `notifai`.
|
|
182
182
|
*
|
|
183
|
-
* At a human terminal this opens the interactive app
|
|
184
|
-
*
|
|
185
|
-
*
|
|
186
|
-
*
|
|
187
|
-
*
|
|
183
|
+
* At a human terminal this opens the interactive app, which enters `init`
|
|
184
|
+
* when the machine is not yet paired and otherwise offers daily actions.
|
|
185
|
+
* Anywhere else it prints help exactly as before. The check is the same one
|
|
186
|
+
* every other prompt in this CLI is gated on — stdin and stdout both TTYs,
|
|
187
|
+
* not CI, `NOTIFAI_NO_INPUT` unset — because an agent that reaches a prompt
|
|
188
|
+
* does not fail, it hangs for ever waiting on a stdin nobody is typing into.
|
|
188
189
|
*/
|
|
189
190
|
/**
|
|
190
191
|
* An unrecognised subcommand reaches the root as an excess argument, and
|
|
@@ -292,7 +293,7 @@ export function buildProgram(deps: CommandDeps, options: BuildProgramOptions = {
|
|
|
292
293
|
|
|
293
294
|
program
|
|
294
295
|
.command('login')
|
|
295
|
-
.helpGroup(GROUP.
|
|
296
|
+
.helpGroup(GROUP.advanced)
|
|
296
297
|
.summary('Sign in and pair this machine')
|
|
297
298
|
.description('Pair this machine with your Notifai account via browser approval')
|
|
298
299
|
.option('--name <name>', 'machine name shown in the dashboard (default: hostname)')
|
|
@@ -641,7 +642,7 @@ export function buildProgram(deps: CommandDeps, options: BuildProgramOptions = {
|
|
|
641
642
|
.description('Wire this harness to route registered questions to your devices')
|
|
642
643
|
.option(
|
|
643
644
|
'--harness <name>',
|
|
644
|
-
'claude-code | codex | cursor | opencode (default: every detected harness)',
|
|
645
|
+
'claude-code | codex | cursor | opencode | openclaw (default: every detected harness)',
|
|
645
646
|
)
|
|
646
647
|
.option('--global', 'install for every project instead of just this one')
|
|
647
648
|
.action((opts: { harness?: string; global?: boolean }) => {
|
|
@@ -650,7 +651,7 @@ export function buildProgram(deps: CommandDeps, options: BuildProgramOptions = {
|
|
|
650
651
|
hooks
|
|
651
652
|
.command('uninstall')
|
|
652
653
|
.description('Remove the hooks this CLI installed')
|
|
653
|
-
.option('--harness <name>', 'claude-code | codex | cursor | opencode (default: detected)')
|
|
654
|
+
.option('--harness <name>', 'claude-code | codex | cursor | opencode | openclaw (default: detected)')
|
|
654
655
|
.option('--global', 'remove the machine-wide install')
|
|
655
656
|
.action((opts: { harness?: string; global?: boolean }) => {
|
|
656
657
|
exit(runners.hooksUninstall(deps, opts))
|
|
@@ -31,7 +31,7 @@ export function sessionActivationOutput(
|
|
|
31
31
|
const context = hookEventName === 'SubagentStart'
|
|
32
32
|
? WORKER_ACTIVATION_CONTEXT
|
|
33
33
|
: rootActivationContext(cwd, env)
|
|
34
|
-
if (harness === 'opencode') return context
|
|
34
|
+
if (harness === 'opencode' || harness === 'openclaw') return context
|
|
35
35
|
if (harness === 'cursor') {
|
|
36
36
|
return JSON.stringify({ additional_context: context })
|
|
37
37
|
}
|
package/src/skill.test.ts
CHANGED
|
@@ -252,7 +252,7 @@ describe('Notifai agent skill', () => {
|
|
|
252
252
|
// Harness names may appear only in setup/routing material, where the
|
|
253
253
|
// harness IS the subject.
|
|
254
254
|
for (const heading of ['## Decide whether to notify', '## Send', '## Ask a question', '## When the answer arrives']) {
|
|
255
|
-
expect(section(heading), heading).not.toMatch(/OpenCode|Orca|Cursor|Codex|Hermes/)
|
|
255
|
+
expect(section(heading), heading).not.toMatch(/OpenCode|OpenClaw|Orca|Cursor|Codex|Hermes/)
|
|
256
256
|
}
|
|
257
257
|
})
|
|
258
258
|
|
|
@@ -397,7 +397,7 @@ describe('Notifai agent skill', () => {
|
|
|
397
397
|
it('moves per-harness mechanics into progressive disclosure', () => {
|
|
398
398
|
expect(skill).toContain('[Harness setup and recovery](references/harness-setup.md)')
|
|
399
399
|
expect(skill).toMatch(/read it when you are\s+installing hooks or diagnosing routing/i)
|
|
400
|
-
for (const harness of ['Claude Code', 'Codex', 'Cursor', 'OpenCode', 'Hermes']) {
|
|
400
|
+
for (const harness of ['Claude Code', 'Codex', 'Cursor', 'OpenCode', 'OpenClaw', 'Hermes']) {
|
|
401
401
|
expect(harnessReference).toContain(`**${harness}:**`)
|
|
402
402
|
}
|
|
403
403
|
expect(harnessReference).toMatch(/exact `HERMES_SESSION_ID`/i)
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest'
|
|
2
|
+
import { rootHelpFooter } from './help.js'
|
|
3
|
+
|
|
4
|
+
function stripAnsi(text: string): string {
|
|
5
|
+
return text.replace(/\u001B\[[0-9;]*m/g, '')
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
describe('rootHelpFooter', () => {
|
|
9
|
+
it('leads first-run with init, not the interactive app', () => {
|
|
10
|
+
const footer = stripAnsi(rootHelpFooter())
|
|
11
|
+
const start = footer.slice(footer.indexOf('Start here'))
|
|
12
|
+
const firstCommand = start.match(/notifai(?: init)?/)?.[0]
|
|
13
|
+
expect(firstCommand).toBe('notifai init')
|
|
14
|
+
expect(start.indexOf('notifai init')).toBeLessThan(start.search(/notifai\s{2,}/))
|
|
15
|
+
})
|
|
16
|
+
})
|
package/src/ui/help.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Help that answers "what can I do here", not "what strings does argv accept".
|
|
3
3
|
*
|
|
4
|
-
* The old help listed seventeen commands in one flat column, with the
|
|
5
|
-
* user needs (`init
|
|
4
|
+
* The old help listed seventeen commands in one flat column, with the one a new
|
|
5
|
+
* user needs (`init`) sitting between a platform capability dump and
|
|
6
6
|
* an entry point marked "Internal:". Everything was equally prominent, which is
|
|
7
7
|
* the same as nothing being prominent.
|
|
8
8
|
*
|
|
@@ -102,18 +102,17 @@ export const helpConfiguration: HelpConfiguration = {
|
|
|
102
102
|
/**
|
|
103
103
|
* Footer for the root help.
|
|
104
104
|
*
|
|
105
|
-
*
|
|
106
|
-
*
|
|
107
|
-
* there.
|
|
105
|
+
* First-run is `notifai init`. The interactive app is what a human opens
|
|
106
|
+
* later, once setup is no longer the thing in the way.
|
|
108
107
|
*/
|
|
109
108
|
export function rootHelpFooter(): string {
|
|
110
109
|
const lines = [
|
|
111
110
|
'',
|
|
112
111
|
style.heading('Start here'),
|
|
112
|
+
` ${style.code('notifai init')} ${style.dim(`${glyph.arrow} set this project up, step by step`)}`,
|
|
113
113
|
` ${style.code('notifai')} ${style.dim(
|
|
114
|
-
`${glyph.arrow}
|
|
114
|
+
`${glyph.arrow} after setup: status, settings, devices, test sends`,
|
|
115
115
|
)}`,
|
|
116
|
-
` ${style.code('notifai init')} ${style.dim(`${glyph.arrow} set this project up, step by step`)}`,
|
|
117
116
|
'',
|
|
118
117
|
style.heading('First call, for an agent'),
|
|
119
118
|
` ${style.code('notifai send --kind done --title "All 42 tests passed" --body "Finished in 3m 10s. Next: review the release candidate."')}`,
|