@raidiant/notifai 10.0.0 → 10.1.1

package/src/commands-hooks.ts

@@ -12,6 +12,8 @@ import {
   lstatSync,
   mkdirSync,
   readFileSync,
+  readdirSync,
+  rmdirSync,
   rmSync,
 } from 'node:fs'
 import path from 'node:path'
@@ -53,6 +55,7 @@ import {
   withdrawUnpushedQuestions,
   type EscalationDeliveryRoute,
   type HookContext,
+  type HookOutcome,
   type HookHarness,
   type PendingQuestion,
 } from './hooks.js'
@@ -87,7 +90,20 @@ import { QUESTION_WAITER_CEILING_SECONDS } from './question-timing.js'
 import { inferInvocationContext } from './invocation-context.js'
 import { logConfigResolved, logSettingsFrom } from './logging.js'
 import { isOurOpencodePlugin, opencodePluginSource } from './opencode-plugin.js'
+import {
+  OPENCLAW_PLUGIN_MANIFEST,
+  OPENCLAW_PLUGIN_PACKAGE,
+  isOurOpenclawPlugin,
+  mergeOpenclawNotifaiEntry,
+  openclawConfigPath,
+  openclawPluginManifest,
+  openclawPluginPackage,
+  openclawPluginSource,
+  parseOpenclawConfig,
+  removeOpenclawNotifaiEntry,
+} from './openclaw-plugin.js'
 import { packageVersion } from './release.js'
+import { spawnQuestionSettlement } from './question-settlement-process.js'
 import { enableProject, projectBinding, projectEnabled } from './project-enablement.js'
 import { rejectAccidentalEscapedNewlines } from './send.js'
 import {
@@ -104,6 +120,7 @@ import {
 } from './send.js'
 import {
   EXIT,
+  SETUP_COMMAND,
   authedClient,
   diagnoseIgnoredOriginOverride,
   loadLoggedConfig,
@@ -141,10 +158,11 @@ export const HOOK_EVENTS = [
   'session-end',
 ] as const
 export type HookEvent = (typeof HOOK_EVENTS)[number]
+const INTERNAL_HOOK_EVENTS = ['question-settlement'] as const
 
 /** Lifecycle handlers one installed harness must carry in this CLI build. */
 export function requiredHookEvents(harness: HookInstallableHarness): readonly HookEvent[] {
-  if (harness === 'opencode') return []
+  if (harness === 'opencode' || harness === 'openclaw') return []
   return harness === 'cursor'
     ? ['session-start', 'activation-stop', 'user-prompt-submit', 'stop', 'session-end']
     : ['session-start', 'subagent-start', 'user-prompt-submit', 'stop', 'session-end']
@@ -172,7 +190,10 @@ export async function hookRunCommand(
   readStdin: () => Promise<string>,
   harness?: HookHarness,
 ): Promise<number> {
-  if (!(HOOK_EVENTS as readonly string[]).includes(event)) {
+  if (
+    !(HOOK_EVENTS as readonly string[]).includes(event) &&
+    !(INTERNAL_HOOK_EVENTS as readonly string[]).includes(event)
+  ) {
     deps.io.err(`Unknown hook event "${event}". Valid: ${HOOK_EVENTS.join(', ')}`)
     return EXIT.usage
   }
@@ -469,7 +490,7 @@ export async function hookRunCommand(
     const credential = deps.store.load()
     if (!credential) {
       logger.error('hook.end', { hook: event, outcome: 'not-paired' })
-      deps.io.err('notifai: hook skipped: this machine is not paired; run `notifai login`')
+      deps.io.err(`notifai: hook skipped: this machine is not paired; run \`${SETUP_COMMAND}\``)
       return EXIT.ok
     }
     // Pin authenticated traffic to the origin the credential was issued for. A
@@ -486,7 +507,9 @@ export async function hookRunCommand(
       `Bearer nfm_${credential.machineId}.${credential.secret}`,
       {
         timeoutMs: event === 'user-prompt-submit' ? 4_000 : 20_000,
-        ...(event === 'stop' ? { deadlineAt: processDeadlineAt, now } : {}),
+        ...(event === 'stop' || event === 'question-settlement'
+          ? { deadlineAt: processDeadlineAt, now }
+          : {}),
       },
     )
     const ctx: HookContext = {
@@ -518,17 +541,49 @@ export async function hookRunCommand(
     // Daily state pruning is housekeeping, not part of the Stop delivery
     // contract. Its directory scan has no useful bound, so keep it on the
     // short prompt path and never spend the answer owner's finite budget on it.
-    if (event !== 'stop') pruneAbandonedSessions(deps.env)
-
-    const outcome =
-      event === 'user-prompt-submit'
-        ? await handleUserPromptSubmit(ctx, envelope)
-        : await handleStop(
-            ctx,
-            envelope,
-            processDeadlineAt,
-            stopWakeRoute(deps, harness, envelope.session_id, cwd),
-          )
+    if (event !== 'stop' && event !== 'question-settlement') {
+      pruneAbandonedSessions(deps.env)
+    }
+
+    let outcome: HookOutcome
+    if (event === 'user-prompt-submit') {
+      outcome = await handleUserPromptSubmit(ctx, envelope)
+      if (
+        outcome.settlementRequired === true &&
+        envelope.session_id !== undefined &&
+        harness !== undefined &&
+        questionRoutingCapability(harness).stopContinuation !== 'unsupported'
+      ) {
+        try {
+          const launchSettlement = deps.spawnQuestionSettlement ?? spawnQuestionSettlement
+          launchSettlement({
+            envelope: { session_id: envelope.session_id, cwd },
+            harness,
+          })
+          outcome.log = { ...outcome.log, settlement: 'launched' }
+        } catch (err) {
+          outcome.log = {
+            ...outcome.log,
+            settlement: 'launch-failed',
+            settlement_error: failureData(err),
+          }
+        }
+      }
+    } else {
+      outcome = await handleStop(
+        ctx,
+        envelope,
+        processDeadlineAt,
+        stopWakeRoute(
+          deps,
+          harness,
+          envelope.session_id,
+          cwd,
+          event === 'stop',
+        ),
+        event === 'stop',
+      )
+    }
     // Answer diagnostics are already persisted once as hook.answer. Keep every
     // other note in the lifecycle record without duplicating the user's text.
     const notes = outcome.notes.filter((note) => !/^(?:late )?answer from /.test(note))
@@ -580,6 +635,7 @@ function stopWakeRoute(
   harness: HookInstallableHarness | undefined,
   sessionId: string | undefined,
   cwd: string,
+  continuationActive = true,
 ): EscalationDeliveryRoute | undefined {
   if (sessionId === undefined) return undefined
   const declaredSourcePid = declaredHookSourcePid(deps)
@@ -599,6 +655,7 @@ function stopWakeRoute(
       sourcePid: deps.codexSourcePid ?? declaredSourcePid ?? process.ppid,
       env: deps.env,
       ...(deps.codexWake === undefined ? {} : { adapters: deps.codexWake }),
+      continuationActive,
     })
   }
   return undefined
@@ -927,12 +984,17 @@ function recordRegisteredQuestion(
         {
           registered: true,
           question_id: questionId,
+          state: 'local',
+          submitted: false,
+          request_id: null,
+          provider_acceptance: 'not_available',
           questions: built.questions.map((entry) => ({
             id: entry.id,
             text: entry.text,
             ...(entry.choices === undefined ? {} : { choices: entry.choices }),
             ...(entry.multi === true ? { multi: true } : {}),
           })),
+          status: `notifai status ${questionId}`,
           close: `notifai close ${questionId}`,
           next: {
             end_turn: true,
@@ -962,8 +1024,11 @@ function recordRegisteredQuestion(
   }
   deps.io.out(
     built.questions.length > 1
-      ? `${built.questions.length} questions registered as one form (${questionId}). Ask them in the conversation, state the concrete work you will resume for their answers, then end your turn.`
-      : `Question registered (${questionId}). Ask it in the conversation, state the concrete work you will resume when the answer arrives, then end your turn.`,
+      ? `${built.questions.length} questions registered locally as one form (${questionId}); they have not been submitted as a Notification Request and have no Provider Acceptance yet. Ask them in the conversation, state the concrete work you will resume for their answers, then end your turn.`
+      : `Question registered locally (${questionId}); it has not been submitted as a Notification Request and has no Provider Acceptance yet. Ask it in the conversation, state the concrete work you will resume when the answer arrives, then end your turn.`,
+  )
+  deps.io.out(
+    `Question settlement runs after registration. Inspect the original identity with \`notifai status ${questionId}\`; never register a replacement to check whether this one was sent.`,
   )
   deps.io.out('Before ending this turn, pre-commit in your own words to the work you will resume:')
   for (const [index, entry] of built.questions.entries()) {
@@ -1348,6 +1413,11 @@ export function hookActivationAdvice(installations: Installation[]): string {
       'OpenCode: restart it, then send one prompt; plugins load at startup, but non-blocking question continuation is intentionally unsupported',
     )
   }
+  if (harnesses.has('openclaw')) {
+    advice.push(
+      'OpenClaw: restart the Gateway, then send one prompt; plugins load at startup, but non-blocking question continuation is intentionally unsupported',
+    )
+  }
   return `${advice.join('. ')}.`
 }
 
@@ -1573,7 +1643,7 @@ async function closeLocalQuestion(
   if (entry === undefined) return null
 
   if (entry.request_id === undefined) {
-    dropPendingQuestion(sessionId, deps.env, entry)
+    dropPendingQuestion(sessionId, deps.env, entry, 'withdrawn')
     const output = {
       session_id: sessionId,
       withdrawn: [
@@ -1710,6 +1780,8 @@ function printHooksInstallClose(deps: CommandDeps, harness: HookInstallableHarne
         ? 'Start one fresh Cursor conversation, send one prompt, finish its first turn, then run `notifai doctor`.'
         : harness === 'opencode'
           ? 'Restart OpenCode, start one fresh session, send one prompt, then run `notifai doctor`.'
+          : harness === 'openclaw'
+            ? 'Restart the OpenClaw Gateway, start one fresh Agent Session, send one prompt, then run `notifai doctor`.'
           : `Start one fresh ${label} session, send one prompt, then run \`notifai doctor\`.`
   if (deps.io.interactive === true && deps.io.note) {
     void deps.io.note(`${file}\n${activation}`, `${label} hooks installed`)
@@ -1802,6 +1874,16 @@ export function hooksInstallCommand(deps: CommandDeps, flags: HooksInstallFlags)
       ...(flags.narrate === undefined ? {} : { narrate: flags.narrate }),
     })
   }
+  if (harness === 'openclaw') {
+    return installOpenclawPlugin(deps, settingsTarget, {
+      adapterPath,
+      timeoutSeconds: NON_ROUTING_BLOCKING_STOP_TIMEOUT_SECONDS,
+      platform: hookPlatform,
+      nodePath,
+      global: wantGlobal,
+      ...(flags.narrate === undefined ? {} : { narrate: flags.narrate }),
+    })
+  }
 
   if (harness === 'cursor') {
     try {
@@ -1948,6 +2030,113 @@ function installOpencodePlugin(
   return EXIT.ok
 }
 
+function installOpenclawPlugin(
+  deps: CommandDeps,
+  file: string,
+  options: {
+    adapterPath: string
+    timeoutSeconds: number
+    platform?: NodeJS.Platform
+    nodePath?: string
+    global: boolean
+    narrate?: boolean
+  },
+): number {
+  const pluginDir = path.dirname(file)
+  try {
+    withTargetFileLock(file, () => {
+      if (existsSync(file)) {
+        assertOwnedRegularFile(file)
+        const existing = readFileSync(file, 'utf8')
+        if (!isOurOpenclawPlugin(existing)) {
+          throw new Error(`${file} exists and was not written by Notifai; move it aside first.`)
+        }
+      }
+      atomicWriteFileSync(file, openclawPluginSource(options), {
+        mode: 0o600,
+        preserveMode: false,
+        requireCurrentUserOwner: true,
+      })
+      atomicWriteFileSync(path.join(pluginDir, OPENCLAW_PLUGIN_MANIFEST), openclawPluginManifest(), {
+        mode: 0o600,
+        preserveMode: false,
+        requireCurrentUserOwner: true,
+      })
+      atomicWriteFileSync(path.join(pluginDir, OPENCLAW_PLUGIN_PACKAGE), openclawPluginPackage(), {
+        mode: 0o600,
+        preserveMode: false,
+        requireCurrentUserOwner: true,
+      })
+    })
+    writeOpenclawEnablement(deps, pluginDir, options.global)
+  } catch (err) {
+    deps.io.err(String(err))
+    return EXIT.failed
+  }
+  if (options.narrate !== false) printHooksInstallClose(deps, 'openclaw', file)
+  return EXIT.ok
+}
+
+function writeOpenclawEnablement(deps: CommandDeps, pluginDir: string, global: boolean): void {
+  const configFile = openclawConfigPath(deps.env, deps.hookPlatform)
+  withTargetFileLock(configFile, () => {
+    let config: Record<string, unknown> = {}
+    if (existsSync(configFile)) {
+      assertOwnedRegularFile(configFile)
+      config = parseOpenclawConfig(readFileSync(configFile, 'utf8'))
+    }
+    const merged = mergeOpenclawNotifaiEntry(config, pluginDir, global)
+    atomicWriteFileSync(configFile, `${JSON.stringify(merged, null, 2)}\n`, {
+      mode: 0o600,
+      preserveMode: true,
+      requireCurrentUserOwner: true,
+    })
+  })
+}
+
+function uninstallOpenclawPlugin(deps: CommandDeps, file: string): number {
+  const pluginDir = path.dirname(file)
+  try {
+    const removed = withTargetFileLock(file, () => {
+      if (!existsSync(file)) return false
+      assertOwnedRegularFile(file)
+      if (!isOurOpenclawPlugin(readFileSync(file, 'utf8'))) {
+        deps.io.out(`Left ${file} alone: Notifai did not write it.`)
+        return false
+      }
+      rmSync(file, { force: true })
+      rmSync(path.join(pluginDir, OPENCLAW_PLUGIN_MANIFEST), { force: true })
+      rmSync(path.join(pluginDir, OPENCLAW_PLUGIN_PACKAGE), { force: true })
+      if (existsSync(pluginDir) && readdirSync(pluginDir).length === 0) {
+        rmdirSync(pluginDir)
+      }
+      return true
+    })
+    if (removed) {
+      const configFile = openclawConfigPath(deps.env, deps.hookPlatform)
+      if (existsSync(configFile)) {
+        withTargetFileLock(configFile, () => {
+          assertOwnedRegularFile(configFile)
+          const config = parseOpenclawConfig(readFileSync(configFile, 'utf8'))
+          const next = removeOpenclawNotifaiEntry(config, pluginDir)
+          atomicWriteFileSync(configFile, `${JSON.stringify(next, null, 2)}\n`, {
+            mode: 0o600,
+            preserveMode: true,
+            requireCurrentUserOwner: true,
+          })
+        })
+      }
+      deps.io.out(`Removed the Notifai OpenClaw plugin at ${file}`)
+    } else if (!existsSync(file)) {
+      deps.io.out(`Nothing to remove: ${file} does not exist.`)
+    }
+    return EXIT.ok
+  } catch (err) {
+    deps.io.err(String(err))
+    return EXIT.failed
+  }
+}
+
 export function hooksUninstallCommand(deps: CommandDeps, flags: HooksInstallFlags): number {
   const harness = resolveHarness(deps, flags.harness)
   if (!harness) return EXIT.usage
@@ -1981,6 +2170,9 @@ export function hooksUninstallCommand(deps: CommandDeps, flags: HooksInstallFlag
       return EXIT.failed
     }
   }
+  if (harness === 'openclaw') {
+    return uninstallOpenclawPlugin(deps, file)
+  }
   if (harness === 'cursor') {
     let stripped: ReturnType<typeof removeCursorHooks> | null
     try {