@raidiant/notifai 9.0.0 → 9.1.0

package/src/commands-doctor.ts

@@ -9,7 +9,6 @@ import { HARNESS_CAPABILITIES, HARNESS_LABELS } from './harnesses.js'
 import { inspectHookAdapter } from './hook-adapter.js'
 import {
   readLiveProjectSessionPointers,
-  readMatchingProjectSessionPointer,
   readProjectSessionPointer,
   readSessionState,
 } from './hooks.js'
@@ -33,6 +32,7 @@ import { inferInvocationContext } from './invocation-context.js'
 import type { SkillScope } from './native-skills.js'
 import {
   firstBlocker,
+  readinessJson,
   type Readiness,
   type ReadinessRefresh,
   type ReadinessState,
@@ -75,7 +75,9 @@ import {
   SETUP_PROOF_STALE_MS,
   observedCompanionReceipt,
   readSetupProof,
+  setupProofProject,
   setupProofIsStale,
+  setupProofApplies,
 } from './commands-setup-proof.js'
 import { skillReadiness } from './commands-skill.js'
 
@@ -542,12 +544,10 @@ async function setupProofState(
     }
   }
 
-  const proof = readSetupProof(deps)
-  const target =
-    proof === null
-      ? null
-      : companions.find((device) => device.device_id === proof.device_id)
-  if (proof === null || proof.project !== config.project.value || target === undefined) {
+  const project = setupProofProject(deps, config.project.value)
+  const proof = readSetupProof(deps, project)
+  const applies = setupProofApplies(proof, project, companions.map((device) => device.device_id))
+  if (!applies) {
     return {
       id: 'proof',
       title: 'Delivery proof',
@@ -629,7 +629,7 @@ export async function doctorCommand(
   if (flags.json || deps.io.interactive !== true) {
     deps.io.out(
       JSON.stringify(
-        { ok, exit_code: ok ? EXIT.ok : EXIT.failed, states: readiness.states },
+        { ...readinessJson(readiness), ok, exit_code: ok ? EXIT.ok : EXIT.failed },
         null,
         2,
       ),
@@ -905,17 +905,11 @@ function hookChecks(deps: CommandDeps): HookCheck[] {
           }),
     })
     if (activeInstallations.length > 0) {
-      const pointer =
-        active.sessionId === undefined
-          ? null
-          : readMatchingProjectSessionPointer(
-              deps.cwd,
-              deps.env,
-              (deps.now ?? Date.now)(),
-              active.sessionId,
-              active.harness,
-            )
-      if (pointer === null) {
+      const exactState = active.sessionId === undefined
+        ? null
+        : readSessionState(active.sessionId, deps.env)
+      const activated = exactState?.harness === active.harness && exactState.last_prompt_at !== undefined
+      if (!activated) {
         // The normal condition of hooks installed moments ago: the pointer
         // appears when the harness next fires a hook, and no command can
         // force that. Informational, so `init` walks on to the states it can
@@ -924,7 +918,7 @@ function hookChecks(deps: CommandDeps): HookCheck[] {
           name: 'hooks (active session)',
           ok: false,
           informational: true,
-          detail: `active ${active.label} session has not published a live pointer — send one ${active.label} prompt, then check again`,
+          detail: `active ${active.label} session has not published exact lifecycle state — send one ${active.label} prompt, then check again`,
           remedy: {
             summary: `send one ${active.label} prompt — its hook publishes the routing pointer`,
             command: 'notifai doctor',
@@ -934,7 +928,7 @@ function hookChecks(deps: CommandDeps): HookCheck[] {
         checks.push({
           name: 'hooks (active session)',
           ok: true,
-          detail: `the concurrent project index contains the active ${active.label} session`,
+          detail: `the exact active ${active.label} session has published lifecycle state`,
         })
       }
     }
@@ -1102,13 +1096,9 @@ function hookChecks(deps: CommandDeps): HookCheck[] {
         ? (readLiveProjectSessionPointers(deps.cwd, deps.env, (deps.now ?? Date.now)()).find(
             (pointer) => pointer.harness === active.harness,
           ) ?? null)
-        : readMatchingProjectSessionPointer(
-            deps.cwd,
-            deps.env,
-            (deps.now ?? Date.now)(),
-            active.sessionId,
-            active.harness,
-          )
+        : readSessionState(active.sessionId, deps.env).harness === active.harness
+          ? { sessionId: active.sessionId, harness: active.harness }
+          : null
   const firedState = firedPointer === null ? null : readSessionState(firedPointer.sessionId, deps.env)
   const promptFired = firedState?.last_prompt_at !== undefined
   const stopFired = firedState?.last_stop_at !== undefined

package/src/commands-guidance.ts

@@ -1,12 +1,7 @@
 import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
-import { describeSource } from './config-schema.js'
 import { EXIT, type CommandDeps } from './commands-core.js'
-import {
-  GUIDANCE_TRUST_PREAMBLE,
-  SHIPPED_GUIDANCE,
-  shippedGuidanceTopic,
-} from './guidance-content.js'
+import { GUIDANCE_TRUST_PREAMBLE, SHIPPED_GUIDANCE, shippedGuidanceTopic } from './guidance-content.js'
 import {
   GUIDANCE_TOPIC_MAX_BYTES,
   GUIDANCE_TOPIC_PATTERN,
@@ -14,36 +9,13 @@ import {
   globalGuidanceDir,
   personalProjectGuidanceDir,
   resolveGuidance,
-  type GuidanceAuthority,
 } from './guidance.js'
+import { renderGuidance } from './guidance-render.js'
 
 // ---------------------------------------------------------------------------
 // guidance show / set / unset
 // ---------------------------------------------------------------------------
 
-/** How each authority is named in the marker above a topic. */
-const AUTHORITY_LABEL: Record<GuidanceAuthority, string> = {
-  user: 'you',
-  repository: 'this repository',
-  shipped: 'shipped default',
-}
-
-/**
- * The token that makes a marker line ours.
- *
- * Without it, a repository topic could open with a handwritten
- * `<!-- when-to-notify · this machine · /Users/... -->` and everything after
- * it would read as the User's own standing word. The marker therefore carries
- * a fixed token, and any occurrence of that token inside file content is
- * defanged below — so the only lines that can claim to be provenance are the
- * ones this command wrote.
- */
-const MARKER_TOKEN = 'notifai:guidance'
-
-function markerSafe(content: string): string {
-  return content.replaceAll(MARKER_TOKEN, `${MARKER_TOKEN.replace(':', '-')} [not a provenance marker]`)
-}
-
 /**
  * The whole effective guidance, ready to be followed as read.
  *
@@ -74,14 +46,7 @@ export function guidanceShowCommand(deps: CommandDeps, flags: { json?: boolean }
     )
     return EXIT.ok
   }
-  const blocks = topics.map((topic) => {
-    const { path: filePath } = describeSource(topic.source)
-    const marker =
-      `<!-- ${MARKER_TOKEN} topic=${topic.name} from=${AUTHORITY_LABEL[topic.authority]}` +
-      `${filePath === null ? '' : ` file=${encodeURIComponent(filePath)}`} -->`
-    return `${marker}\n${markerSafe(topic.content).trimEnd()}`
-  })
-  deps.io.out([GUIDANCE_TRUST_PREAMBLE, ...blocks].join('\n\n'))
+  deps.io.out(renderGuidance(topics))
   return EXIT.ok
 }
 

package/src/commands-harness-context.ts

@@ -1,4 +1,4 @@
-import { readLiveProjectSessionPointers } from './hooks.js'
+import { readLiveProjectSessionPointers, readSessionState } from './hooks.js'
 import { type Harness } from './install-hooks.js'
 
 /**
@@ -96,6 +96,29 @@ export function resolveActiveHarness(
   const first = candidates[0]
   if (first === undefined) return { active: null, contested: [] }
   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
+  // 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,
+    )
+    return activity > 0 ? [{ candidate, activity }] : []
+  })
+  if (evidenced.length > 0) {
+    evidenced.sort((left, right) => right.activity - left.activity)
+    if (evidenced.length === 1 || evidenced[0]!.activity > evidenced[1]!.activity) {
+      return { active: evidenced[0]!.candidate, contested: [] }
+    }
+    return { active: first, contested: candidates }
+  }
   for (const pointer of readLiveProjectSessionPointers(cwd, env, now)) {
     const owner = candidates.find(
       (candidate) =>