@raidiant/notifai 9.3.0 → 10.1.0

package/src/install-hooks.ts

@@ -20,15 +20,19 @@ import {
   type HookHostPlatform,
 } from './hook-adapter.js'
 import { opencodePluginPath, opencodePluginTarget } from './opencode-plugin.js'
-import { HARNESSES, type Harness } from './harnesses.js'
+import {
+  OPENCLAW_EVENTS,
+  openclawHasGlobalEvidence,
+  openclawPluginPath,
+  openclawPluginTarget,
+} from './openclaw-plugin.js'
+import { HOOK_INSTALLABLE_HARNESSES, type HookInstallableHarness } from './harnesses.js'
 import { accountHome } from './platform.js'
 import {
   NON_ROUTING_STOP_TIMEOUT_SECONDS,
   QUESTION_STOP_TIMEOUT_SECONDS,
 } from './question-timing.js'
 
-export { HARNESSES, type Harness } from './harnesses.js'
-
 /**
  * The three joints the OpenCode plugin hooks into, as (harness event, the
  * `notifai hook` event it runs). The plugin is a module and has no settings
@@ -73,7 +77,7 @@ export interface HookGroup {
 export type HookConfig = Record<string, HookGroup[]>
 
 export interface InstallPlan {
-  harness: Harness
+  harness: HookInstallableHarness
   /** Absolute path of the settings file that will be written. */
   file: string
   /** True when the file is machine-wide rather than per-project. */
@@ -97,7 +101,7 @@ export interface HookCommandOptions {
 export function hookCommand(
   adapterPath: string,
   event: string,
-  harness?: Harness,
+  harness?: HookInstallableHarness,
   options: HookCommandOptions = {},
 ): string {
   return (
@@ -174,7 +178,7 @@ export interface BuildOptions {
   /** Stable user-level executable installed by the hook adapter module. */
   adapterPath: string
   /** The installed adapter stamps its exact harness into project pointers. */
-  harness?: Harness
+  harness?: HookInstallableHarness
   platform?: NodeJS.Platform | HookHostPlatform
   /** Registered Node named first in Windows hook commands. */
   nodePath?: string
@@ -195,7 +199,7 @@ export { QUESTION_STOP_TIMEOUT_SECONDS } from './question-timing.js'
  * `question-timing.ts`.
  */
 export function stopHandlerIsDetached(
-  harness: Harness | undefined,
+  harness: HookInstallableHarness | undefined,
   platform?: Parameters<typeof hookHostPlatform>[0],
 ): boolean {
   return harness === 'claude-code' && hookHostPlatform(platform) === 'posix'
@@ -213,7 +217,7 @@ export function stopHandlerIsDetached(
  */
 function stopHandler(
   adapterPath: string,
-  harness: Harness | undefined,
+  harness: HookInstallableHarness | undefined,
   options: HookCommandOptions,
 ): HookHandler {
   const command = hookCommand(adapterPath, 'stop', harness, options)
@@ -355,7 +359,7 @@ export function buildCursorHookConfig(options: BuildOptions): CursorHookConfig {
  * questions pushed to is not a property of the repository.
  */
 export function settingsFile(
-  harness: Harness,
+  harness: HookInstallableHarness,
   global: boolean,
   cwd: string,
   env: NodeJS.ProcessEnv = process.env,
@@ -366,6 +370,8 @@ export function settingsFile(
     // generated plugin module, so it owns a whole file instead.
     case 'opencode':
       return opencodePluginPath(global, cwd, env, platform)
+    case 'openclaw':
+      return openclawPluginPath(global, cwd, env, platform)
     case 'cursor': {
       const home = harnessAccountHome(env, platform)
       return global
@@ -606,7 +612,7 @@ export function withCodexLayerTransaction<T>(
 
 /** Every file in this layer Codex might already be reading hooks from. */
 export function hookDefinitionFiles(
-  harness: Harness,
+  harness: HookInstallableHarness,
   global: boolean,
   cwd: string,
   env: NodeJS.ProcessEnv = process.env,
@@ -741,14 +747,15 @@ function ourHandlerEvents(document: SettingsDocument | null): string[] {
  * document. Treating it as evidence of any one harness would be a guess
  * dressed up as detection.
  */
-function localHarnessEvidence(cwd: string): Harness[] {
-  const found: Harness[] = []
+function localHarnessEvidence(cwd: string): HookInstallableHarness[] {
+  const found: HookInstallableHarness[] = []
   if (existsSync(path.join(cwd, '.claude')) || existsSync(path.join(cwd, 'CLAUDE.md'))) {
     found.push('claude-code')
   }
   if (existsSync(path.join(cwd, '.codex'))) found.push('codex')
   if (existsSync(path.join(cwd, '.cursor'))) found.push('cursor')
   if (existsSync(path.join(cwd, '.opencode'))) found.push('opencode')
+  if (existsSync(path.join(cwd, '.openclaw'))) found.push('openclaw')
   return found
 }
 
@@ -756,13 +763,14 @@ function localHarnessEvidence(cwd: string): Harness[] {
 function globalHarnessEvidence(
   env: NodeJS.ProcessEnv = process.env,
   platform: NodeJS.Platform | HookHostPlatform = process.platform,
-): Harness[] {
+): HookInstallableHarness[] {
   const home = harnessAccountHome(env, platform)
-  const found: Harness[] = []
+  const found: HookInstallableHarness[] = []
   if (existsSync(path.join(home, '.claude'))) found.push('claude-code')
   if (existsSync(codexGlobalDir(env, platform))) found.push('codex')
   if (existsSync(path.join(home, '.cursor'))) found.push('cursor')
   if (existsSync(path.join(home, '.config', 'opencode'))) found.push('opencode')
+  if (openclawHasGlobalEvidence(existsSync, env, platform)) found.push('openclaw')
   return found
 }
 
@@ -777,12 +785,12 @@ export function detectedHarnesses(
   cwd: string,
   env: NodeJS.ProcessEnv = process.env,
   platform: NodeJS.Platform | HookHostPlatform = process.platform,
-): Harness[] {
-  const seen = new Set<Harness>([
+): HookInstallableHarness[] {
+  const seen = new Set<HookInstallableHarness>([
     ...localHarnessEvidence(cwd),
     ...globalHarnessEvidence(env, platform),
   ])
-  return HARNESSES.filter((harness) => seen.has(harness))
+  return HOOK_INSTALLABLE_HARNESSES.filter((harness) => seen.has(harness))
 }
 
 /**
@@ -798,7 +806,7 @@ export function detectHarness(
   cwd: string,
   env: NodeJS.ProcessEnv = process.env,
   platform: NodeJS.Platform | HookHostPlatform = process.platform,
-): Harness | null {
+): HookInstallableHarness | null {
   const local = localHarnessEvidence(cwd)
   if (local.length > 0) return local.length === 1 ? local[0]! : null
   const global = globalHarnessEvidence(env, platform)
@@ -1193,7 +1201,7 @@ export interface InstalledHandler {
 }
 
 export interface Installation {
-  harness: Harness
+  harness: HookInstallableHarness
   file: string
   global: boolean
   handlers: InstalledHandler[]
@@ -1331,7 +1339,7 @@ export function findInstallations(
     ...(nodePath === undefined ? {} : { nodePath }),
   }
   const found: Installation[] = []
-  for (const harness of HARNESSES) {
+  for (const harness of HOOK_INSTALLABLE_HARNESSES) {
     for (const global of [false, true]) {
       const files = hookDefinitionFiles(harness, global, cwd, env, platform)
       for (const file of files) {
@@ -1339,38 +1347,38 @@ export function findInstallations(
       // OpenCode's adapter is a plugin module, not a settings document, so it
       // is reported as one installation covering all three events rather than
       // parsed for handlers.
-      if (harness === 'opencode') {
+      if (harness === 'opencode' || harness === 'openclaw') {
         let source: string
         try {
           source = readOwnedRegularFile(file)
         } catch {
           continue
         }
-        const target = opencodePluginTarget(source)
+        const target =
+          harness === 'openclaw' ? openclawPluginTarget(source) : opencodePluginTarget(source)
         if (target === null) continue
+        const label = harness === 'openclaw' ? 'OpenClaw' : 'OpenCode'
         const problems = [
           ...(!target.current
-            ? ['obsolete OpenCode event wiring; rerun `notifai hooks install --harness opencode`']
+            ? [`obsolete ${label} event wiring; rerun \`notifai hooks install --harness ${harness}\``]
             : []),
           ...(target.adapter !== hookAdapterPath(adapterHome)
             ? [
-                'OpenCode still names a mutable CLI or runtime path; rerun `notifai hooks install --harness opencode`',
+                `${label} still names a mutable CLI or runtime path; rerun \`notifai hooks install --harness ${harness}\``,
               ]
             : []),
         ]
+        const events = harness === 'openclaw' ? OPENCLAW_EVENTS : OPENCODE_EVENTS
         found.push({
           harness,
           file,
           global,
           ...(problems.length > 0 ? { problems } : {}),
-          // Reported as the command line the plugin will actually run, not as
-          // the plugin's own path: every check downstream asks which build a
-          // handler invokes, and for a module that answer lives inside it.
-          handlers: OPENCODE_EVENTS.map(([event, hookEvent]) => ({
+          handlers: events.map(([event, hookEvent]) => ({
             event,
             groupIndex: 0,
             handlerIndex: 0,
-            command: hookCommand(target.adapter, hookEvent, 'opencode', {
+            command: hookCommand(target.adapter, hookEvent, harness, {
               ...commandOptions,
               ...(target.nodePath === undefined ? {} : { nodePath: target.nodePath }),
             }),
@@ -1411,7 +1419,7 @@ export function findInstallations(
 }
 
 function harnessMarkerProblems(
-  harness: Harness,
+  harness: HookInstallableHarness,
   handlers: InstalledHandler[],
   adapterHome?: string,
   options: HookCommandOptions = {},

package/src/interactive.test.ts

@@ -226,6 +226,37 @@ describe('interactiveCommand', () => {
     answers = []
   })
 
+  it('enters init on first-run instead of a parallel Sign in path', async () => {
+    const cwd = mkdtempSync(path.join(os.tmpdir(), 'notifai-interactive-first-run-'))
+    const out: string[] = []
+    const deps = makeDeps(cwd)
+    deps.store.load = () => null
+    deps.io.out = (line: string) => {
+      out.push(line)
+    }
+    answers = [CANCEL]
+
+    expect(await interactiveCommand(deps, '0.0.0-test')).toBe(EXIT.ok)
+    expect(out.join('\n')).toContain('Next: This machine')
+    expect(out.join('\n')).toContain('notifai init')
+    expect(out.join('\n')).not.toContain('notifai login')
+    const menu = promptLog.find((entry) => entry.message === 'What would you like to do?')
+    expect(menu?.options?.[0]).toMatchObject({ value: 'setup', label: 'Finish setup' })
+    expect(optionLabels(menu!)).not.toContain('Sign in')
+    expect(optionLabels(menu!)).not.toContain('Add a device')
+  })
+
+  it('offers Finish setup instead of a parallel Add a device path', async () => {
+    const cwd = mkdtempSync(path.join(os.tmpdir(), 'notifai-interactive-finish-setup-'))
+    answers = [CANCEL]
+
+    expect(await interactiveCommand(makeDeps(cwd), '0.0.0-test')).toBe(EXIT.ok)
+    const menu = promptLog.find((entry) => entry.message === 'What would you like to do?')
+    expect(menu?.options?.[0]).toMatchObject({ value: 'setup', label: 'Finish setup' })
+    expect(optionLabels(menu!)).not.toContain('Add a device')
+    expect(optionLabels(menu!)).not.toContain('Sign in')
+  })
+
   it('quits from the root menu on Escape', async () => {
     const cwd = mkdtempSync(path.join(os.tmpdir(), 'notifai-interactive-root-esc-'))
     answers = [CANCEL]

package/src/interactive.ts

@@ -15,10 +15,11 @@
  *
  * Three things shape the layout:
  *
- * The menu leads with whatever is actually in the way. Someone who is not
- * signed in is offered sign-in first; someone with no device that can receive
- * is offered a device; everyone else is offered the test notification, because
- * seeing the thing arrive on your device is what makes the product real.
+ * First-run is `init`, not a second sign-in/device split. An unsigned machine
+ * enters that journey immediately; a remaining blocker is offered as Finish
+ * setup. Once send-prerequisites are ready, the menu leads with the test
+ * notification, because seeing the thing arrive on a device is what makes the
+ * product real.
  *
  * Detail is earned, not given. A settings group shows fourteen one-line
  * summaries, and the paragraph explaining a key appears once the reader has
@@ -180,6 +181,10 @@ export async function interactiveCommand(deps: CommandDeps, version: string): Pr
   process.stdout.write(`  ${tagline(version)}\n`)
 
   let readiness = await assess(deps)
+  if (stateById(readiness, 'credential')?.status !== 'ready') {
+    await initCommand(deps, {})
+    readiness = await assess(deps)
+  }
   let first = true
 
   for (;;) {
@@ -362,15 +367,13 @@ function menuFor(readiness: Readiness): { value: Screen; label: string; hint?: s
 
   const options: { value: Screen; label: string; hint?: string }[] = []
 
-  if (!signedIn) {
-    options.push({ value: 'account', label: 'Sign in', hint: 'approve this machine in your browser' })
-  } else if (!hasDevice) {
+  if (blocker !== null) {
     options.push({
-      value: 'devices',
-      label: 'Add a device',
-      hint: 'install a supported Companion App',
+      value: 'setup',
+      label: 'Finish setup',
+      hint: shorten(blocker.title.toLowerCase(), 40),
     })
-  } else {
+  } else if (signedIn && hasDevice) {
     options.push({
       value: 'test',
       label: 'Send a test notification',
@@ -378,10 +381,6 @@ function menuFor(readiness: Readiness): { value: Screen; label: string; hint?: s
     })
   }
 
-  if (blocker !== null && signedIn) {
-    options.push({ value: 'setup', label: 'Finish setup', hint: shorten(blocker.title.toLowerCase(), 40) })
-  }
-
   options.push(
     { value: 'settings', label: 'Settings', hint: 'sounds, timing, presence, project' },
     {
@@ -393,11 +392,11 @@ function menuFor(readiness: Readiness): { value: Screen; label: string; hint?: s
   if (signedIn && hasDevice) {
     options.push({ value: 'devices', label: 'Devices', hint: 'what can receive right now' })
   }
-  options.push(
-    { value: 'doctor', label: 'Run diagnostics', hint: 'check every part of the setup' },
-    { value: 'account', label: 'Account', hint: signedIn ? 'plan, machine, sign out' : 'sign in' },
-    { value: 'quit', label: 'Quit' },
-  )
+  options.push({ value: 'doctor', label: 'Run diagnostics', hint: 'check every part of the setup' })
+  if (signedIn) {
+    options.push({ value: 'account', label: 'Account', hint: 'plan, machine, sign out' })
+  }
+  options.push({ value: 'quit', label: 'Quit' })
   return options
 }
 
@@ -822,12 +821,7 @@ async function accountScreen(deps: CommandDeps, readiness: Readiness): Promise<b
   const signedIn = stateById(readiness, 'credential')?.status === 'ready'
 
   if (!signedIn) {
-    const go = await clack.confirm({
-      message: 'Sign in now? This opens your browser to approve this machine.',
-      initialValue: true,
-    })
-    if (cancelled(go) || go !== true) return false
-    await loginCommand(deps, {})
+    await initCommand(deps, {})
     return true
   }
 

package/src/invocation-context.ts

@@ -1,7 +1,7 @@
 import { execFileSync } from 'node:child_process'
 import path from 'node:path'
 import { type SourceContextT } from '@raidiant/notifai-protocol'
-import type { Harness } from './harnesses.js'
+import type { SourceContextHarness } from './harnesses.js'
 import { resolveSessionLabel } from './session-labels.js'
 
 export type GitCommand = (cwd: string, args: readonly string[]) => string | null
@@ -138,7 +138,7 @@ export interface SourceContextInput {
   sessionId?: string
   sessionLabel?: string
   activeHarness?: {
-    harness: Harness
+    harness: SourceContextHarness
     sessionId?: string
     sessionLabel?: string
     sessionLabelPending?: boolean