@raidiant/notifai 0.4.0 → 0.5.0

package/src/config-schema.test.ts

@@ -73,14 +73,14 @@ describe('acceptedValues', () => {
   })
 
   it('names both values for a toggle', () => {
-    expect(acceptedValues('require_idle')).toBe('true or false')
+    expect(acceptedValues('ask_notifications')).toBe('true or false')
   })
 })
 
 describe('formatValue', () => {
   it('renders toggles as words rather than JSON', () => {
-    expect(formatValue('require_idle', true)).toBe('yes')
-    expect(formatValue('require_idle', false)).toBe('no')
+    expect(formatValue('ask_notifications', true)).toBe('yes')
+    expect(formatValue('ask_notifications', false)).toBe('no')
   })
 
   it('explains what an unset value means instead of printing null', () => {

package/src/config-schema.ts

@@ -1,11 +1,11 @@
 /**
  * What every configuration key means, in the reader's words.
  *
- * `config.ts` already documented all fourteen keys carefully — but in TypeScript
+ * `config.ts` already documented every key carefully — but in TypeScript
  * comments, which is the one audience that never needed them. Someone running
- * `notifai config show` saw `require_idle = true` and had no way to learn what
- * it did short of reading the source, so this module is that knowledge moved to
- * where it can be printed.
+ * `notifai config show` saw `ask_grace_seconds = 0` and had no way to learn
+ * what it did short of reading the source, so this module is that knowledge
+ * moved to where it can be printed.
  *
  * It is the single source for `config show`, `config set`'s errors, `config
  * explain`, the help footer, and the interactive settings screen. One
@@ -13,8 +13,8 @@
  *
  * `summary` is the one-line form that fits beside a value in a list.
  * `detail` is the paragraph shown once the reader has asked for this key
- * specifically — progressive disclosure, so a list of fourteen settings stays
- * a list and not an essay.
+ * specifically — progressive disclosure, so the list of settings stays a list
+ * and not an essay.
  */
 import { CLI_SOUNDS, INTERRUPTION_LEVELS } from '@raidiant/notifai-protocol'
 import { LOG_LEVELS, configBounds, type ConfigKey } from './config.js'
@@ -22,16 +22,16 @@ import { LOG_LEVELS, configBounds, type ConfigKey } from './config.js'
 export type ConfigKind = 'string' | 'url' | 'integer' | 'boolean' | 'enum' | 'list'
 
 /**
- * Which surface a key belongs to. Grouping is the difference between fourteen
- * flat keys and four short lists a reader can hold in their head.
+ * Which surface a key belongs to. Grouping is the difference between a flat
+ * list of keys and a few short ones a reader can hold in their head.
  */
 export type ConfigGroup = 'questions' | 'delivery' | 'project' | 'diagnostics' | 'connection'
 
 export const CONFIG_GROUPS: { id: ConfigGroup; title: string; blurb: string }[] = [
   {
     id: 'questions',
-    title: 'Questions & presence',
-    blurb: 'When a question an agent registered is allowed to leave this terminal and reach your devices.',
+    title: 'Questions',
+    blurb: 'Whether a question an agent registered may leave this terminal and reach your devices, and how soon.',
   },
   {
     id: 'delivery',
@@ -93,25 +93,6 @@ const INFO: Record<ConfigKey, Omit<ConfigKeyInfo, 'key'>> = {
       'The master switch for question routing. When this is off, a question an agent registers with `notifai ask` stays in the terminal and never leaves this machine, whatever the presence settings say. Turn it off to stop being reached for a while without uninstalling the harness hooks.',
     example: 'true',
   },
-  require_idle: {
-    label: 'Only when I have stepped away',
-    group: 'questions',
-    kind: 'boolean',
-    summary: 'Whether sitting at this keyboard holds a question back',
-    detail:
-      'Off (the default) means notify me even while I am using this machine. `ask_grace_seconds` still runs, so the terminal is offered the question first; I just do not need to walk away before it may leave. Turn this on when local keyboard or mouse activity should keep questions in the terminal.\n\nThis is separate from `ask_notifications`, which switches routing off altogether: wanting to be reached only while away is different from not wanting to be reached.',
-    example: 'false',
-  },
-  away_after_seconds: {
-    label: 'Away after',
-    group: 'questions',
-    kind: 'integer',
-    unit: 's',
-    summary: 'Keyboard and mouse idle time before this machine counts as unattended',
-    detail:
-      'How long the keyboard and mouse must be quiet before you count as away. Only consulted while `require_idle` is on.\n\nWhere the operating system exposes no idle signal, silence since your last prompt is used instead, which is the conservative reading.',
-    example: '120',
-  },
   ask_grace_seconds: {
     label: 'Terminal-first grace',
     group: 'questions',
@@ -119,19 +100,9 @@ const INFO: Record<ConfigKey, Omit<ConfigKeyInfo, 'key'>> = {
     unit: 's',
     summary: 'Optional delay before a question may reach your devices',
     detail:
-      'Zero (the default) sends the question to your devices as soon as the agent turn ends. Set a positive duration to offer the terminal an exclusive answer window first; the timer is measured from the moment the agent asked.\n\nA timer and nothing more. It is honoured whether or not presence is consulted at all, because how long to wait and whether anyone is watching are separate questions, and answering one should not answer the other.',
+      'Zero (the default) sends the question to your devices as soon as the agent turn ends. Set a positive duration to offer the terminal an exclusive answer window first; the timer is measured from the moment the agent asked.\n\nA timer and nothing more. Whether you happen to be at this keyboard does not change it: waiting no longer holds your terminal, so there is nothing your being here would protect you from.',
     example: '0',
   },
-  hook_reply_timeout_seconds: {
-    label: 'Hook wait for an answer',
-    group: 'questions',
-    kind: 'integer',
-    unit: 's',
-    summary: 'How long the harness hook blocks waiting for your answer',
-    detail:
-      'After a question has gone out, the harness continuation owner waits up to this long for your answer. The device reply window uses the same bound, so Notifai never accepts an answer after an agent with no dormant-session wake has already returned.\n\nThe ceiling exists because command-hook harnesses bound their Stop processes. Grace plus this value plus installer headroom stays inside that budget.',
-    example: '480',
-  },
 
   sound: {
     label: 'Sound',

package/src/config.test.ts

@@ -45,22 +45,22 @@ function setup(options: {
 describe('harness config layers', () => {
   it('orders session over project-local over project over global', () => {
     const { env, cwd } = setup({
-      globalToml: 'away_after_seconds = 10\n',
-      projectToml: 'away_after_seconds = 20\n',
-      projectLocalToml: 'away_after_seconds = 30\n',
-      sessionToml: 'away_after_seconds = 40\n',
+      globalToml: 'ask_grace_seconds = 10\n',
+      projectToml: 'ask_grace_seconds = 20\n',
+      projectLocalToml: 'ask_grace_seconds = 30\n',
+      sessionToml: 'ask_grace_seconds = 40\n',
       sessionId: 'abc',
     })
-    expect(loadConfig({ cwd, env, sessionId: 'abc' }).away_after_seconds).toMatchObject({
+    expect(loadConfig({ cwd, env, sessionId: 'abc' }).ask_grace_seconds).toMatchObject({
       value: 40,
       source: expect.stringMatching(/^session:/),
     })
     // Same files, different session: the session layer simply does not apply.
-    expect(loadConfig({ cwd, env, sessionId: 'other' }).away_after_seconds).toMatchObject({
+    expect(loadConfig({ cwd, env, sessionId: 'other' }).ask_grace_seconds).toMatchObject({
       value: 30,
       source: expect.stringMatching(/^project-local:/),
     })
-    expect(loadConfig({ cwd, env }).away_after_seconds.value).toBe(30)
+    expect(loadConfig({ cwd, env }).ask_grace_seconds.value).toBe(30)
   })
 
   it('keeps a personal toggle out of the committed project file', () => {
@@ -75,30 +75,35 @@ describe('harness config layers', () => {
 
   it('keeps hostile or colliding session ids inside their own file', () => {
     const { env, cwd } = setup({
-      sessionToml: 'away_after_seconds = 99\n',
+      sessionToml: 'ask_grace_seconds = 99\n',
       sessionId: '../../etc/passwd',
     })
     // The id round-trips to its own state, and nothing escapes the directory.
-    expect(loadConfig({ cwd, env, sessionId: '../../etc/passwd' }).away_after_seconds.value).toBe(99)
+    expect(loadConfig({ cwd, env, sessionId: '../../etc/passwd' }).ask_grace_seconds.value).toBe(99)
     expect(sessionConfigPath('../../etc/passwd', env)).toContain('/notifai/sessions/')
     expect(sessionConfigPath('../../etc/passwd', env)).not.toContain('..')
     // Ids that a sanitiser would have collapsed together must stay distinct:
     // sharing a file meant sharing presence and pending questions.
     expect(sessionConfigPath('a/b', env)).not.toBe(sessionConfigPath('a?b', env))
-    expect(loadConfig({ cwd, env, sessionId: 'a/b' }).away_after_seconds.value).toBe(120)
+    expect(loadConfig({ cwd, env, sessionId: 'a/b' }).ask_grace_seconds.value).toBe(0)
   })
 
-  it('defaults question routing to on without requiring the user to be idle', () => {
+  it('defaults question routing to on and reaching the user straight away', () => {
     const { env, cwd } = setup({})
     const config = loadConfig({ cwd, env })
     expect(config.ask_notifications.value).toBe(true)
-    expect(config.require_idle).toEqual({ value: false, source: 'default' })
-    expect(config.away_after_seconds.value).toBe(120)
-    // Immediate escalation by default leaves the whole hook budget available
-    // for the reply wait. Users can still opt into a terminal-first grace.
-    expect(config.hook_reply_timeout_seconds.value).toBe(480)
+    // Nothing here asks where the user is standing. A question goes out when
+    // the turn ends unless they choose a terminal-first window.
     expect(config.ask_grace_seconds).toEqual({ value: 0, source: 'default' })
   })
+
+  it('bounds the terminal-first window so a reply window always survives it', () => {
+    // Config is readable from a repository, so an unbounded grace is hostile
+    // input: it would eat the waiter's whole ceiling and leave no window the
+    // server would accept an answer into.
+    const { env, cwd } = setup({ globalToml: 'ask_grace_seconds = 100000\n' })
+    expect(loadConfig({ cwd, env }).ask_grace_seconds.value).toBe(360)
+  })
 })
 
 describe('config precedence', () => {

package/src/config.ts

@@ -4,7 +4,6 @@ import os from 'node:os'
 import path from 'node:path'
 import { parse as parseToml } from 'smol-toml'
 import type { CLI_SOUNDS, INTERRUPTION_LEVELS } from '@raidiant/notifai-protocol'
-import { HOOK_TIMING } from './harnesses.js'
 
 /**
  * Layered configuration with provenance. Most specific wins:
@@ -60,49 +59,16 @@ export interface CliConfig {
   project: ResolvedValue<string | null>
   /** Free-text notification criteria agents consult before sending. */
   notify_criteria: ResolvedValue<string | null>
-  /** Route a registered agent question to companion devices after the presence gate. */
+  /** Whether a registered agent question may reach companion devices at all. */
   ask_notifications: ResolvedValue<boolean>
-  /**
-   * Whether being at this machine suppresses a question. Sitting at the
-   * keyboard is not the same as not wanting to be reached — needing to stop
-   * using the machine in order to be notified is its own kind of interruption.
-   *
-   * On, the default, is the original behaviour: a question stays in the
-   * terminal while the keyboard is in use, because the person is right there
-   * and a push would be redundant. Off says notify me anyway — the grace window
-   * still runs, so the question is still offered to the terminal first, it just
-   * no longer needs the user to walk away before it may leave.
-   *
-   * This is deliberately separate from `ask_notifications`, which switches
-   * escalation off altogether. Wanting to be reached while working is the
-   * opposite of not wanting to be reached.
-   */
-  require_idle: ResolvedValue<boolean>
-  /**
-   * Keyboard/mouse idle time after which this machine counts as unattended.
-   * When the OS idle signal is unavailable, silence since the user's last prompt
-   * is the conservative fallback. Below the threshold the hooks stay out of the
-   * way entirely, because a blocking hook also blocks the terminal prompt the
-   * present user would use.
-   *
-   * Only consulted while `require_idle` is on.
-   */
-  away_after_seconds: ResolvedValue<number>
-  /**
-   * How long a hook blocks waiting for a companion-device answer before falling through
-   * to the harness's own prompt. Runtime arbitration keeps the complete Stop
-   * invocation inside its fixed 480s owner budget and 540s adapter ceiling.
-   */
-  hook_reply_timeout_seconds: ResolvedValue<number>
   /**
    * Terminal-first grace window, measured from the moment the question was
    * sent: the agent asks in the terminal and starts a timer, and only once it
    * elapses does the question reach companion devices.
    *
-   * A timer, and only a timer. It is configured independently of
-   * `away_after_seconds` and honoured whether or not presence is consulted at
-   * all — how long to wait and whether anyone is watching are separate
-   * questions, and answering one should not answer the other.
+   * A timer, and only a timer. Whether the user happens to be at this keyboard
+   * decides nothing — the waiter no longer holds their terminal, so there is
+   * nothing for their presence to protect them from.
    */
   ask_grace_seconds: ResolvedValue<number>
   /**
@@ -136,9 +102,6 @@ export const CONFIG_KEYS = [
   'project',
   'notify_criteria',
   'ask_notifications',
-  'require_idle',
-  'away_after_seconds',
-  'hook_reply_timeout_seconds',
   'ask_grace_seconds',
   'log_level',
   'log_max_bytes',
@@ -147,17 +110,12 @@ export const CONFIG_KEYS = [
 export type ConfigKey = (typeof CONFIG_KEYS)[number]
 
 /** Keys whose TOML value must parse as a boolean; used by `config set`. */
-export const BOOLEAN_CONFIG_KEYS: readonly ConfigKey[] = [
-  'ask_notifications',
-  'require_idle',
-]
+export const BOOLEAN_CONFIG_KEYS: readonly ConfigKey[] = ['ask_notifications']
 
 /** Keys whose TOML value must parse as an integer within its configured bounds. */
 export const NUMERIC_CONFIG_KEYS: readonly ConfigKey[] = [
   'wait_seconds',
   'ttl_seconds',
-  'away_after_seconds',
-  'hook_reply_timeout_seconds',
   'ask_grace_seconds',
   'log_max_bytes',
   'log_max_files',
@@ -187,14 +145,8 @@ const DEFAULTS = {
   // Installing the hooks is the opt-in; these exist to switch the behaviour
   // back off for a project or a session without uninstalling anything.
   ask_notifications: true,
-  // Questions reach devices immediately by default. Both a terminal-first
-  // grace and presence gating remain independent opt-in controls.
-  require_idle: false,
-  away_after_seconds: 120,
-  // Runtime waits stay inside a 480s budget. Harnesses that require a declared
-  // Stop limit use a preference-stable 540s; Codex uses its host-owned Stop
-  // default. Neither definition changes when these preferences do.
-  hook_reply_timeout_seconds: 480,
+  // Questions reach devices as soon as the turn ends. A terminal-first grace
+  // window is an opt-in delay on top of that.
   ask_grace_seconds: 0,
   // On by default: the log is the only account of what a headless hook did, and
   // a diagnostic nobody switched on before the thing went wrong is not one.
@@ -298,21 +250,18 @@ export function findProjectLocalConfigPath(startDir: string): string | null {
 
 /**
  * Ranges every layer is clamped to. Config is readable from a repository, so an
- * out-of-range value is attacker input, not a typo: `away_after_seconds = -1`
- * would make a user who just typed count as absent, and an oversized reply
- * timeout would exhaust the hook process budget and kill it after the user has
- * already answered.
+ * out-of-range value is attacker input, not a typo: an unbounded grace window
+ * would consume the waiter's whole ceiling and silently leave no time at all in
+ * which the user's answer could still be accepted.
  */
 const NUMERIC_BOUNDS: Partial<Record<ConfigKey, { min: number; max: number }>> = {
   wait_seconds: { min: 0, max: 300 },
   ttl_seconds: { min: 0, max: 7 * 24 * 3600 },
-  away_after_seconds: { min: 5, max: 24 * 3600 },
-  // The runtime clamps grace + reply work below the host process ceiling; this
-  // maximum is never copied into the installed definition.
-  // The wire protocol's minimum reply window is 60s; matching it prevents the
-  // server from accepting an answer after a shorter local wait has returned.
-  hook_reply_timeout_seconds: { min: 60, max: 540 },
-  ask_grace_seconds: { min: 0, max: HOOK_TIMING.maxGraceSeconds },
+  // A plain number, no longer derived from a hook budget's leftovers. Six
+  // minutes leaves two clear minutes of the waiter's 480s ceiling, so the
+  // longest window a user can choose still leaves an answer window the server
+  // will accept — with room to spare for a timer that wakes late.
+  ask_grace_seconds: { min: 0, max: 360 },
   // The floor keeps rotation from thrashing (a file smaller than a handful of
   // records would rotate on nearly every write); the ceiling is the point past
   // which "local diagnostics" has become "a database on your disk".
@@ -405,9 +354,6 @@ export function loadConfig(options: {
     project: resolve('project'),
     notify_criteria: resolve('notify_criteria'),
     ask_notifications: resolve('ask_notifications'),
-    require_idle: resolve('require_idle'),
-    away_after_seconds: resolve('away_after_seconds'),
-    hook_reply_timeout_seconds: resolve('hook_reply_timeout_seconds'),
     ask_grace_seconds: resolve('ask_grace_seconds'),
     log_level: resolve('log_level'),
     log_max_bytes: resolve('log_max_bytes'),

package/src/harnesses.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { HARNESS_CAPABILITIES, HARNESSES, HOOK_TIMING } from './harnesses.js'
+import { HARNESS_CAPABILITIES, HARNESSES } from './harnesses.js'
 
 describe('harness continuation contract', () => {
   it('requires one explicit native delivery contract for every shipped harness', () => {
@@ -7,42 +7,28 @@ describe('harness continuation contract', () => {
     expect(HARNESS_CAPABILITIES).toEqual({
       'claude-code': {
         stopContinuation: 'decision-block',
-        dormantWake: 'unsupported',
+        deliveryRoutes: ['hook-continuation', 'inbox-socket', 'cold-resume', 'hold-for-next-turn'],
         deliveryContract:
-          'live Stop continuation; no automatic wake after its bounded wait returns',
+          'the Stop hook returns at once and waits out of band, then posts the answer into this same session over its own inbox socket; a session that has stopped is resumed only once a liveness probe proves it stopped',
       },
       codex: {
         stopContinuation: 'decision-block',
-        dormantWake: 'unsupported',
+        deliveryRoutes: ['hook-continuation', 'cold-resume', 'hold-for-next-turn'],
         deliveryContract:
-          'live Stop continuation; no automatic wake after its bounded wait returns',
+          'live Stop continuation while the turn is held; once it returns, a stopped thread is resumed behind its writer lock and anything else waits for the next turn',
       },
       cursor: {
         stopContinuation: 'unsupported',
-        dormantWake: 'unsupported',
+        deliveryRoutes: ['unsupported'],
         deliveryContract:
           'the hook can return a live follow-up, but the invoking shell exposes no exact conversation id; asynchronous ask is unsupported',
       },
       opencode: {
         stopContinuation: 'unsupported',
-        dormantWake: 'unsupported',
+        deliveryRoutes: ['unsupported'],
         deliveryContract:
           'no proven answer continuation after session.idle; use a blocking reply command',
       },
     })
   })
-
-  it('derives the maximum grace from the reserves every Stop must retain', () => {
-    expect(HOOK_TIMING.maxGraceSeconds).toBe(
-      HOOK_TIMING.totalSeconds -
-        HOOK_TIMING.finalizationReserveSeconds -
-        HOOK_TIMING.submissionReserveSeconds -
-        HOOK_TIMING.minimumReplySeconds -
-        HOOK_TIMING.schedulingSlackSeconds,
-    )
-    expect(HOOK_TIMING.finalizationReserveSeconds).toBeGreaterThan(
-      HOOK_TIMING.stdoutReserveSeconds,
-    )
-    expect(HOOK_TIMING.totalSeconds + HOOK_TIMING.hostHeadroomSeconds).toBe(540)
-  })
 })

package/src/harnesses.ts

@@ -3,17 +3,13 @@ export const HARNESSES = ['claude-code', 'codex', 'cursor', 'opencode'] as const
 
 export type Harness = (typeof HARNESSES)[number]
 
-/** One canonical wall-clock budget shared by config, hooks, and installers. */
-export const HOOK_TIMING = Object.freeze({
-  totalSeconds: 480,
-  finalizationReserveSeconds: 45,
-  submissionReserveSeconds: 40,
-  minimumReplySeconds: 60,
-  schedulingSlackSeconds: 1,
-  stdoutReserveSeconds: 5,
-  hostHeadroomSeconds: 60,
-  maxGraceSeconds: 334,
-})
+export type DeliveryRoute =
+  | 'hook-continuation'
+  | 'inbox-socket'
+  | 'owned-control-plane'
+  | 'cold-resume'
+  | 'hold-for-next-turn'
+  | 'unsupported'
 
 export type StopContinuation =
   | 'decision-block'
@@ -23,8 +19,8 @@ export type StopContinuation =
 export interface HarnessCapability {
   /** How an answer is admitted to another turn in the already-open session. */
   stopContinuation: StopContinuation
-  /** Whether delivery remains native after the turn-end event has returned. */
-  dormantWake: 'unsupported' | 'native-session-prompt'
+  /** Available answer-delivery routes, best current route first. */
+  deliveryRoutes: readonly DeliveryRoute[]
   /** Concise, honest readiness text for doctor and installation guidance. */
   deliveryContract: string
 }
@@ -36,23 +32,25 @@ export interface HarnessCapability {
 export const HARNESS_CAPABILITIES: Record<Harness, HarnessCapability> = {
   'claude-code': {
     stopContinuation: 'decision-block',
-    dormantWake: 'unsupported',
-    deliveryContract: 'live Stop continuation; no automatic wake after its bounded wait returns',
+    deliveryRoutes: ['hook-continuation', 'inbox-socket', 'cold-resume', 'hold-for-next-turn'],
+    deliveryContract:
+      'the Stop hook returns at once and waits out of band, then posts the answer into this same session over its own inbox socket; a session that has stopped is resumed only once a liveness probe proves it stopped',
   },
   codex: {
     stopContinuation: 'decision-block',
-    dormantWake: 'unsupported',
-    deliveryContract: 'live Stop continuation; no automatic wake after its bounded wait returns',
+    deliveryRoutes: ['hook-continuation', 'cold-resume', 'hold-for-next-turn'],
+    deliveryContract:
+      'live Stop continuation while the turn is held; once it returns, a stopped thread is resumed behind its writer lock and anything else waits for the next turn',
   },
   cursor: {
     stopContinuation: 'unsupported',
-    dormantWake: 'unsupported',
+    deliveryRoutes: ['unsupported'],
     deliveryContract:
       'the hook can return a live follow-up, but the invoking shell exposes no exact conversation id; asynchronous ask is unsupported',
   },
   opencode: {
     stopContinuation: 'unsupported',
-    dormantWake: 'unsupported',
+    deliveryRoutes: ['unsupported'],
     deliveryContract:
       'no proven answer continuation after session.idle; use a blocking reply command',
   },