@raidiant/notifai 9.1.0 → 9.2.1

package/src/commands-harness-context.ts

@@ -98,18 +98,14 @@ export function resolveActiveHarness(
   if (candidates.length === 1) return { active: first, contested: [] }
 
   // Exact lifecycle state is machine-global and survives a command moving to
-  // another linked checkout. Prefer it before the checkout-local compatibility
+  // another linked checkout. Prefer it before the checkout-local
   // pointer. A unique newest hook event proves which nested harness owns this
   // shell; ties and missing evidence remain contested and fail closed.
   const evidenced = candidates.flatMap((candidate) => {
     if (candidate.sessionId === undefined) return []
     const state = readSessionState(candidate.sessionId, env)
     if (state.harness !== candidate.harness) return []
-    const activity = Math.max(
-      state.last_prompt_at ?? 0,
-      state.last_stop_at ?? 0,
-      state.activation_context_emitted_at ?? 0,
-    )
+    const activity = Math.max(state.last_prompt_at ?? 0, state.last_stop_at ?? 0)
     return activity > 0 ? [{ candidate, activity }] : []
   })
   if (evidenced.length > 0) {

package/src/commands-hooks.ts

@@ -30,14 +30,13 @@ import {
 } from './hook-adapter.js'
 import {
   clearAcknowledgementObligation,
-  claimPromptActivation,
   claimCursorStopActivation,
   confirmCursorStopActivation,
   dropPendingQuestion,
   handleSessionEnd,
   handleStop,
   handleUserPromptSubmit,
-  markSessionActivation,
+  recordSessionStart,
   parkForRetirement,
   parseHookInput,
   pruneAbandonedSessions,
@@ -254,14 +253,6 @@ export async function hookRunCommand(
   const cwd = envelope.cwd ?? deps.cwd
   const sessionEnd = hookDefersDiagnosticsUntilAfterCleanup(event)
   logger.bind({ session: envelope.session_id ?? null })
-  const declaredSourcePid = declaredHookSourcePid(deps)
-  const activationOwnerPid =
-    harness === 'claude-code'
-      ? (deps.claudeSourcePid ?? declaredSourcePid ?? claudeSessionPid(deps.env))
-      : harness === 'codex'
-        ? (deps.codexSourcePid ?? declaredSourcePid ?? process.ppid)
-        : undefined
-
   // Session activation is local model context, not authenticated routing. It
   // must survive the exact first-run states it exists to repair: no config,
   // no credential, no Companion device, and no network.
@@ -285,22 +276,14 @@ export async function hookRunCommand(
       deps.env,
     )
     if (stdout !== undefined) deps.io.out(stdout)
-    if (
-      stdout !== undefined &&
-      event === 'session-start' &&
-      activationOwnerPid !== undefined &&
-      envelope.session_id !== undefined
-    ) {
+    if (event === 'session-start' && envelope.session_id !== undefined) {
       try {
-        // Write stdout first. If the process dies between these operations a
-        // later prompt may duplicate context, but it cannot suppress context
-        // that the host never received.
-        markSessionActivation(envelope.session_id, deps.env, now(), activationOwnerPid, harness, cwd)
+        recordSessionStart(envelope.session_id, deps.env, harness, cwd)
       } catch (err) {
         logger.error('hook.end', {
           hook: event,
-          outcome: 'mark-failed',
-          reason: 'activation-state-failed',
+          outcome: 'record-failed',
+          reason: 'session-state-failed',
           ...failureData(err),
         })
       }
@@ -313,33 +296,6 @@ export async function hookRunCommand(
     return EXIT.ok
   }
 
-  // SessionStart is the preferred model-visible activation seam. A few
-  // managed hosts regenerate older hook definitions that retain
-  // UserPromptSubmit but omit newer lifecycle events. Claim the first prompt
-  // once per exact session as a compatibility fallback, before config/auth/
-  // device/network work, and stay silent when SessionStart already ran.
-  let promptActivationStdout: string | undefined
-  if (
-    event === 'user-prompt-submit' &&
-    (harness === 'claude-code' || harness === 'codex') &&
-    activationOwnerPid !== undefined &&
-    envelope.session_id !== undefined
-  ) {
-    try {
-      if (claimPromptActivation(envelope.session_id, deps.env, now(), activationOwnerPid, harness, cwd)) {
-        promptActivationStdout = sessionActivationOutput(harness, 'UserPromptSubmit', cwd, deps.env)
-        if (promptActivationStdout !== undefined) deps.io.out(promptActivationStdout)
-      }
-    } catch (err) {
-      logger.error('hook.end', {
-        hook: event,
-        outcome: 'claim-failed',
-        reason: 'activation-state-failed',
-        ...failureData(err),
-      })
-    }
-  }
-
   // Cursor has a confirmed host bug in which sessionStart.additional_context
   // is accepted but never reaches the model. A native Stop follow-up is the
   // host's guaranteed model-visible channel. Claim it once per conversation,
@@ -443,7 +399,6 @@ export async function hookRunCommand(
         hook: event,
         outcome: 'failed',
         reason: 'config-failed',
-        ...(promptActivationStdout === undefined ? {} : { activation: 'context-added' }),
         ...failureData(err),
       })
       for (const line of describeHookFailure(err)) deps.io.err(`notifai: ${line}`)
@@ -547,10 +502,7 @@ export async function hookRunCommand(
     const notes = outcome.notes.filter((note) => !/^(?:late )?answer from /.test(note))
     logger.info('hook.end', {
       hook: event,
-      // Stop stdout takes over the turn. UserPromptSubmit stdout may instead
-      // add context to the user's own turn, which is explicitly non-decisive.
       decided: outcome.decided ?? outcome.stdout !== undefined,
-      ...(promptActivationStdout === undefined ? {} : { activation: 'context-added' }),
       ...(notes.length === 0 ? {} : { notes }),
       ...outcome.log,
     })
@@ -1640,6 +1592,8 @@ function parkClosedQuestion(
 export interface HooksInstallFlags {
   harness?: string
   global?: boolean
+  /** Init owns the final setup result and suppresses per-harness close narration. */
+  narrate?: boolean
   /** Test seam; production resolves the running CLI. */
   execPath?: string
   scriptPath?: string
@@ -1754,9 +1708,11 @@ export function hooksInstallCommand(deps: CommandDeps, flags: HooksInstallFlags)
       return hooksInstallCommand(deps, { ...flags, global: true, harness })
     }
     const globalFile = globalInstallation?.file
-    deps.io.out(
-      `${HARNESS_LABELS[harness]} hooks already cover this machine (${globalFile}). This project does not need its own copy. To wire only this project: notifai hooks uninstall --harness ${harness} --global && notifai hooks install --harness ${harness}`,
-    )
+    if (flags.narrate !== false) {
+      deps.io.out(
+        `${HARNESS_LABELS[harness]} hooks already cover this machine (${globalFile}). This project does not need its own copy. To wire only this project: notifai hooks uninstall --harness ${harness} --global && notifai hooks install --harness ${harness}`,
+      )
+    }
     return EXIT.ok
   }
   if (wantGlobal && otherScope.some((installation) => !installation.global)) {
@@ -1779,6 +1735,7 @@ export function hooksInstallCommand(deps: CommandDeps, flags: HooksInstallFlags)
       timeoutSeconds: BLOCKING_STOP_TIMEOUT_SECONDS,
       platform: hookPlatform,
       nodePath,
+      ...(flags.narrate === undefined ? {} : { narrate: flags.narrate }),
     })
   }
 
@@ -1803,7 +1760,7 @@ export function hooksInstallCommand(deps: CommandDeps, flags: HooksInstallFlags)
       deps.io.err(String(err))
       return EXIT.failed
     }
-    printHooksInstallClose(deps, harness, settingsTarget)
+    if (flags.narrate !== false) printHooksInstallClose(deps, harness, settingsTarget)
     return EXIT.ok
   }
 
@@ -1854,7 +1811,7 @@ export function hooksInstallCommand(deps: CommandDeps, flags: HooksInstallFlags)
     const layer = flags.global ? null : codexLayerDir(deps.cwd)
     if (layer !== null) mkdirSync(layer, { recursive: true })
   }
-  printHooksInstallClose(deps, harness, installed.file)
+  if (flags.narrate !== false) printHooksInstallClose(deps, harness, installed.file)
   if (installed.foreignStopCount > 0) {
     deps.io.out(
       "This layer already has a Stop handler. Codex runs every matching handler, so Notifai's Stop and the existing one will both fire.",
@@ -1901,6 +1858,7 @@ function installOpencodePlugin(
     timeoutSeconds: number
     platform?: NodeJS.Platform
     nodePath?: string
+    narrate?: boolean
   },
 ): number {
   try {
@@ -1922,7 +1880,7 @@ function installOpencodePlugin(
     deps.io.err(String(err))
     return EXIT.failed
   }
-  printHooksInstallClose(deps, 'opencode', file)
+  if (options.narrate !== false) printHooksInstallClose(deps, 'opencode', file)
   return EXIT.ok
 }
 

package/src/commands-init.ts

@@ -13,7 +13,14 @@ import { ApiCallError, NetworkError, type ApiClient } from './client.js'
 import { personalProjectConfigPath, type CliConfig } from './config.js'
 import { projectSlugFrom as inferredProjectSlugFrom } from './invocation-context.js'
 import { SKILLS_INSTALLER_SPEC, type SkillScope } from './native-skills.js'
-import { firstBlocker, readinessJson, type Readiness, type ReadinessRefresh, type ReadinessState } from './readiness.js'
+import {
+  firstBlocker,
+  questionRoutingReady,
+  readinessJson,
+  type Readiness,
+  type ReadinessRefresh,
+  type ReadinessState,
+} from './readiness.js'
 import { buildDraft, formatReceipt } from './send.js'
 import { loginCommand } from './commands-auth.js'
 import {
@@ -116,6 +123,7 @@ async function closeGap(
   flags: InitFlags,
 ): Promise<GapCloseResult> {
   if (state.id === 'project') {
+    if (flags.setupScope === undefined) return 'failed'
     const slug = projectSlugFrom(flags.projectId ?? path.basename(deps.cwd))
     const configPath =
       flags.setupScope === 'global'
@@ -137,7 +145,7 @@ async function closeGap(
     let ok = true
     const hookFlags = flags.setupScope === 'global' ? { global: true as const } : {}
     for (const harness of harnesses) {
-      if (hooksInstallCommand(deps, { harness, ...hookFlags }) !== EXIT.ok) ok = false
+      if (hooksInstallCommand(deps, { harness, ...hookFlags, narrate: false }) !== EXIT.ok) ok = false
     }
     return ok ? 'closed' : 'failed'
   }
@@ -619,9 +627,9 @@ async function resolveSetupScope(
     deps.io.err('No setup scope selected. Pass `--setup-scope project` or `--setup-scope global`.')
     return 'usage'
   }
-  if (flags.skills === true) {
+  if (flags.skills === true || flags.hooks === true) {
     deps.io.err(
-      'Unattended skill setup requires an explicit scope: `notifai init --skills --setup-scope project` or `... global`.',
+      'Unattended setup changes require an explicit scope: pass `--setup-scope project` or `--setup-scope global`.',
     )
     return 'usage'
   }
@@ -683,6 +691,10 @@ export async function initCommand(deps: CommandDeps, flags: InitFlags): Promise<
 
       if (state.status === 'optional-gap') {
         if (remedy.by !== 'cli' || !(await wantsOptional(workingDeps, state, resolved))) continue
+        if (resolved.setupScope === undefined && state.id === 'project') {
+          stop = true
+          break
+        }
         attempted.add(state.id)
         const result = await closeGap(workingDeps, state, resolved)
         if (result === 'failed') failed = true
@@ -701,6 +713,10 @@ export async function initCommand(deps: CommandDeps, flags: InitFlags): Promise<
       }
 
       if (remedy.by === 'cli') {
+        if (resolved.setupScope === undefined && state.id === 'project') {
+          stop = true
+          break
+        }
         attempted.add(state.id)
         const result = await closeGap(workingDeps, state, resolved)
         if (result === 'failed') failed = true
@@ -783,12 +799,6 @@ function printOptionalLeftovers(deps: CommandDeps, leftovers: readonly Readiness
   }
 }
 
-function questionsWillRoute(readiness: Readiness): boolean {
-  const hooks = readiness.states.find((state) => state.id === 'hooks')
-  const settings = readiness.states.find((state) => state.id === 'question-routing-settings')
-  return hooks?.status === 'ready' && settings?.status !== 'gap'
-}
-
 async function printInitClose(
   deps: CommandDeps,
   readiness: Readiness,
@@ -796,7 +806,7 @@ async function printInitClose(
 ): Promise<void> {
   const blocker = firstBlocker(readiness)
   const canSend = readiness.states.find((state) => state.id === 'devices')?.status === 'ready'
-  const questions = questionsWillRoute(readiness)
+  const questions = questionRoutingReady(readiness)
   const leftovers = leftoverOptionals(readiness, flags).filter(
     (state) => state.id !== 'contract',
   )
@@ -813,14 +823,14 @@ async function printInitClose(
         canSend ? 'You can send notifications.' : 'You are signed in.',
         questions
           ? 'Questions will reach your devices.'
-          : 'Questions stay in the terminal until hooks are installed.',
+          : 'Questions are terminal-only until Question Routing is ready.',
       ]
       await deps.io.note?.(lines.join('\n'), 'Ready')
       printOptionalLeftovers(deps, leftovers)
       deps.io.out(
       questions
         ? 'All set. Agents in this project can notify you and ask you questions.'
-        : 'All set. Agents in this project can notify you. Questions stay in the terminal until hooks are installed.',
+        : 'All set. Agents in this project can notify you. Questions are terminal-only until Question Routing is ready.',
     )
       await deps.io.outro?.('All set ✨')
       return
@@ -840,7 +850,7 @@ async function printInitClose(
     deps.io.out(
       questions
         ? 'All set. Agents in this project can notify you and ask you questions.'
-        : 'All set. Agents in this project can notify you. Questions stay in the terminal until hooks are installed.',
+        : 'All set. Agents in this project can notify you. Questions are terminal-only until Question Routing is ready.',
     )
     return
   }

package/src/commands.test.ts

@@ -3277,13 +3277,13 @@ describe('stable hook installation', () => {
     ).toBe(EXIT.ok)
     const globalFile = settingsFile('opencode', true, cwd, env)
     const current = readFileSync(globalFile, 'utf8')
-    writeFileSync(globalFile, current.replace('const ADAPTER_VERSION = 11', 'const ADAPTER_VERSION = 10'))
+    writeFileSync(globalFile, current.replace('const ADAPTER_VERSION = 12', 'const ADAPTER_VERSION = 11'))
 
     io.outLines = []
     expect(hooksInstallCommand(deps, { harness: 'opencode', execPath, scriptPath })).toBe(EXIT.ok)
     expect(existsSync(path.join(cwd, '.opencode', 'plugins', 'notifai.js'))).toBe(false)
     const refreshed = readFileSync(globalFile, 'utf8')
-    expect(refreshed).toContain('const ADAPTER_VERSION = 11')
+    expect(refreshed).toContain('const ADAPTER_VERSION = 12')
     expect(refreshed).toContain('experimental.chat.system.transform')
     expect(io.outLines.join('\n')).toMatch(/Installed opencode hooks/)
   })
@@ -4202,7 +4202,7 @@ describe('init', () => {
       store: { load: () => null, save: () => {}, clear: () => {}, describe: () => 'empty store' },
     }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.failed)
+    expect(await initCommand(deps, { setupScope: 'project' })).toBe(EXIT.failed)
     const configPath = path.join(cwd, '.notifai', 'config.toml')
     expect(readFileSync(configPath, 'utf8')).toContain('project = "my-project-')
     // Safe by default: without an explicit --skills opt-in, init only writes
@@ -4211,7 +4211,7 @@ describe('init', () => {
     expect(io.outLines.join('\n')).not.toContain('All set.')
 
     io.outLines = []
-    expect(await initCommand(deps, { skills: false })).toBe(EXIT.failed)
+    expect(await initCommand(deps, { setupScope: 'project', skills: false })).toBe(EXIT.failed)
     // Idempotent: the second run re-derives the same slug and does not reprint
     // doctor's ready-state dump.
     expect(io.outLines.join('\n')).toMatch(/^Next:/m)
@@ -4253,7 +4253,13 @@ describe('init', () => {
       env: isolatedEnv(cwd),
     }
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.failed)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.failed)
     expect(io.outLines).toContain("Notifai can't send notifications until you update.")
     expect(io.outLines).toContain('npm install -g @raidiant/notifai')
     expect(io.outros).toEqual([])
@@ -4264,10 +4270,16 @@ describe('init', () => {
     io.errLines = []
     io.outros = []
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.ok)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.ok)
     expect(submissions).toBe(1)
     expect(io.outLines).toContain(
-      'All set. Agents in this project can notify you. Questions stay in the terminal until hooks are installed.',
+      'All set. Agents in this project can notify you. Questions are terminal-only until Question Routing is ready.',
     )
     expect(io.outLines).not.toContain('npm install -g @raidiant/notifai')
     expect(io.errLines).toEqual([])
@@ -4302,22 +4314,31 @@ describe('init', () => {
     const io = new CapturedIo()
     const deps = { ...makeDeps(io, {} as ApiClient), cwd }
 
-    expect(await initCommand(deps, { projectId: 'Custom Name', skills: false })).toBe(EXIT.failed)
+    expect(
+      await initCommand(deps, {
+        projectId: 'Custom Name',
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.failed)
     expect(readFileSync(path.join(cwd, '.notifai', 'config.toml'), 'utf8')).toContain(
       'project = "custom-name"',
     )
   })
 
-  it('run unattended, names the optional steps instead of running or asking about them', async () => {
-    // An agent's init must not reach for npx or a prompt.
+  it('does not let an unattended readiness pass silently choose project scope', async () => {
     const cwd = mkdtempSync(path.join(os.tmpdir(), 'init-agent-'))
     const io = new CapturedIo()
     const deps = { ...makeDeps(io, {} as ApiClient), cwd }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.failed)
-    const out = io.outLines.join('\n')
-    expect(out).not.toContain('Installing the notifai agent skill')
-    // Never prompted, and never assumed into a change it did not request.
+    expect(await initCommand(deps, { json: true, hooks: false, skills: false })).toBe(EXIT.failed)
+    expect(existsSync(path.join(cwd, '.notifai', 'config.toml'))).toBe(false)
+    const result = JSON.parse(io.outLines[0] ?? '{}') as {
+      states: Array<{ id: string; status: string }>
+    }
+    expect(result.states.find((state) => state.id === 'project')).toMatchObject({
+      status: 'optional-gap',
+    })
     expect(io.errLines).toEqual([])
   })
 
@@ -4765,7 +4786,7 @@ describe('init', () => {
       list: async () => ({ skills: [] }),
     }
     const deps = setupReadyDeps(io, cwd, nativeSkills, calls)
-    await initCommand(deps, { hooks: true, skills: false })
+    await initCommand(deps, { hooks: true, setupScope: 'project', skills: false })
     const wired = findInstallations(cwd, deps.env, deps.hookAdapterHome).map(
       (installation) => installation.harness,
     )
@@ -4773,8 +4794,9 @@ describe('init', () => {
     expect(existsSync(path.join(cwd, '.claude', 'settings.local.json'))).toBe(true)
     expect(existsSync(path.join(cwd, '.codex', 'hooks.json'))).toBe(false)
     expect(existsSync(path.join(cwd, '.codex', 'config.toml'))).toBe(true)
-    expect(io.outLines.join('\n')).toContain('Installed claude-code hooks')
-    expect(io.outLines.join('\n')).toContain('Installed codex hooks')
+    expect(io.outLines.join('\n')).not.toContain('Installed claude-code hooks')
+    expect(io.outLines.join('\n')).not.toContain('Installed codex hooks')
+    expect(io.outLines.join('\n')).toContain('Next: Codex hook trust')
   })
 
   it('lets a human keep a subset of the detected harnesses', async () => {
@@ -4825,7 +4847,7 @@ describe('init', () => {
       store: { load: () => null, save: () => {}, clear: () => {}, describe: () => 'empty store' },
     }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.failed)
+    expect(await initCommand(deps, { setupScope: 'project' })).toBe(EXIT.failed)
     expect(io.outLines.join('\n')).toContain('notifai login')
   })
 
@@ -4854,7 +4876,7 @@ describe('init', () => {
       store: { load: () => null, save: () => {}, clear: () => {}, describe: () => 'empty store' },
     }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.failed)
+    expect(await initCommand(deps, { setupScope: 'project' })).toBe(EXIT.failed)
     expect(asked.some((q) => q.includes('Sign in'))).toBe(false)
     const out = io.outLines.join('\n')
     expect(out).toContain('Opening your browser to approve this machine — Ctrl-C to stop.')
@@ -4949,7 +4971,7 @@ describe('init', () => {
       } satisfies NativeSkills,
     }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.ok)
+    expect(await initCommand(deps, { setupScope: 'project' })).toBe(EXIT.ok)
     expect(asked).toEqual(expect.arrayContaining([expect.stringMatching(/hooks/)]))
     expect(asked).toEqual(expect.arrayContaining([expect.stringMatching(/skill/)]))
     const out = io.outLines.join('\n')
@@ -5026,7 +5048,13 @@ describe('init', () => {
       },
     }
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.ok)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.ok)
     expect(io.prompts).toEqual([
       'Open install instructions in your browser?',
       'Wait here while you finish that on your device?',
@@ -5049,7 +5077,13 @@ describe('init', () => {
     io.outLines = []
     io.prompts = []
     io.openedUrls = []
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.ok)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.ok)
     expect(submitCalls).toBe(1)
     expect(io.prompts).toEqual([])
     expect(io.outLines.join('\n')).toContain('All set.')
@@ -5094,7 +5128,13 @@ describe('init', () => {
       },
     }
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.ok)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.ok)
     expect(io.errLines.join('\n')).toContain('wait timer expired')
     expect(io.errLines.join('\n')).toMatch(/setup is not finished, only this wait/)
     expect(io.prompts.some((q) => q.includes('Keep waiting'))).toBe(true)
@@ -5130,7 +5170,13 @@ describe('init', () => {
       env: isolatedEnv(cwd),
     }
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.failed)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.failed)
     const out = io.outLines.join('\n')
     expect(out).toContain('Next: Your devices')
     expect(out).toContain('https://test.notifai.invalid/support')
@@ -5178,7 +5224,13 @@ describe('init', () => {
       },
     }
 
-    expect(await initCommand(deps, { hooks: false, skills: false })).toBe(EXIT.failed)
+    expect(
+      await initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).toBe(EXIT.failed)
     expect(submitCalls).toBe(1)
     expect(io.outLines.join('\n')).toContain('Next: Delivery proof')
     expect(io.outLines.join('\n')).toContain('Provider accepted the notification')
@@ -5266,7 +5318,13 @@ describe('init', () => {
       env: { ...isolatedEnv(cwd), XDG_STATE_HOME: '/dev/null' },
     }
 
-    await expect(initCommand(deps, { hooks: false, skills: false })).resolves.toBe(EXIT.failed)
+    await expect(
+      initCommand(deps, {
+        hooks: false,
+        setupScope: 'project',
+        skills: false,
+      }),
+    ).resolves.toBe(EXIT.failed)
     expect(submitCalls).toBe(1)
     expect(io.errLines.join('\n')).toContain('Could not save setup proof req_unwritable')
     expect(io.outLines.join('\n')).toContain('Next: Delivery proof')
@@ -5418,7 +5476,12 @@ describe('init', () => {
         env: { ...isolatedEnv(cwd), XDG_CONFIG_HOME: stateRoot, XDG_STATE_HOME: stateRoot },
       }
       expect(
-        await initCommand(deps, { projectId: 'shared-project', hooks: false, skills: false }),
+        await initCommand(deps, {
+          projectId: 'shared-project',
+          hooks: false,
+          setupScope: 'project',
+          skills: false,
+        }),
       ).toBe(EXIT.ok)
     }
 
@@ -5500,7 +5563,7 @@ describe('readiness assessment cost', () => {
       store: { load: () => null, save: () => {}, clear: () => {}, describe: () => 'empty store' },
     }
 
-    expect(await initCommand(deps, {})).toBe(EXIT.failed)
+    expect(await initCommand(deps, { setupScope: 'project' })).toBe(EXIT.failed)
     expect(healthCalls).toBe(1)
     expect(readFileSync(path.join(cwd, '.notifai', 'config.toml'), 'utf8')).toContain('project =')
   })