@adhdev/mesh-shared 1.0.82-rc.10 → 1.0.82-rc.12

package/dist/mesh-vocabulary.d.ts

@@ -49,7 +49,7 @@ export type WorkerReportOutcome = typeof WORKER_REPORT_OUTCOMES[number];
 /** Final branch state a worker reports (see coordinator convergence rules). */
 export declare const WORKER_BRANCH_STATES: readonly ["merged_to_main", "pushed_feature_branch_needs_merge", "blocked_review", "cleanup_candidate", "not_mergeable"];
 export type WorkerBranchState = typeof WORKER_BRANCH_STATES[number];
-export declare const isMeshTaskStatus: (value: unknown) => value is "failed" | "pending" | "assigned" | "completed" | "cancelled";
+export declare const isMeshTaskStatus: (value: unknown) => value is "pending" | "failed" | "assigned" | "completed" | "cancelled";
 export declare const isMeshTerminalTaskStatus: (value: unknown) => value is "failed" | "completed" | "cancelled";
 export declare const isMeshTaskMode: (value: unknown) => value is "code_change" | "validation" | "live_debug_readonly" | "launch_app" | "convergence";
 export declare const isMeshTaskPriority: (value: unknown) => value is "low" | "high" | "normal";

package/dist/node-facts.d.ts

@@ -146,6 +146,13 @@ export interface MeshNodeFactsProviderEnablement {
 }
 export interface MeshNodeFacts {
     schemaVersion: number;
+    /** Cached CLI detection only; no paths or account data. */
+    providerInventory?: {
+        observedAt: number;
+        providers: Record<string, {
+            installed: boolean;
+        }>;
+    };
     reportedAt: number;
     daemonBuild?: MeshNodeFactsDaemonBuild;
     providerVersions?: Record<string, string>;

package/dist/path-ownership.d.ts

@@ -33,7 +33,7 @@
  */
 /** One normalized ownership entry: a repo-relative path, optionally a `**` subtree prefix. */
 export interface OwnedPathEntry {
-    /** Repo-relative path with forward slashes, no leading `./`, no trailing slash. */
+    /** Repo-relative path with forward slashes, no leading `./`, no trailing slash; empty for the whole-repo subtree. */
     readonly path: string;
     /** True when this entry was declared as `<path>/**` (owns the whole subtree). */
     readonly subtree: boolean;

package/dist/provider-approval.d.ts

@@ -0,0 +1,36 @@
+/** Provider permissions are runtime decisions, never owner write ratification. */
+export interface ProviderApproval {
+    source: 'provider_modal' | 'legacy_provider' | 'status_only' | 'ledger_approval';
+    /** Exact Inbox actions or the existing session handler; never inferred consent. */
+    compatibility?: 'exact' | 'session_only' | 'unknown';
+    type: 'tool_permission' | 'provider_setup' | 'unknown';
+    evidence: 'live' | 'cached' | 'unavailable';
+    lifecycle: 'pending' | 'resolved';
+    modalKey: string | null;
+    createdAt: number | null;
+    resolvedAt: number | null;
+    description: string;
+    runtimeDirectory?: string;
+    displayedDirectory?: string | null;
+    buttons: string[];
+    actionable: boolean;
+    providerType?: string;
+    sessionId?: string;
+    nodeId?: string | null;
+    meshId?: string | null;
+    taskId?: string | null;
+    attemptId?: string | null;
+    generation?: number | null;
+}
+/** Exact resource identity required by the approvals-only action path. */
+export interface ProviderApprovalTarget {
+    modalKey: string;
+    attemptId: string | null;
+    generation: number | null;
+}
+/** Confirmed authority for the new Inbox path. Legacy handlers retain their own checks. */
+export declare function isActionableProviderApproval(approval: ProviderApproval | null | undefined): boolean;
+/** An explicit null suppresses the resource; only missing metadata uses compatibility. */
+export declare function readProviderDecision(approval: ProviderApproval | null | undefined, waiting: boolean, hasModal?: boolean): ProviderApproval | null;
+/** Host metadata is durable: identity and clocks only, never modal text or directories. */
+export declare function providerApprovalSnapshot(approval: ProviderApproval | null | undefined): ProviderApproval | null;

package/dist/provider-question.d.ts

@@ -0,0 +1,19 @@
+/** Ephemeral provenance supplied by the owning daemon, never inferred from prompt text. */
+export interface ProviderQuestionBinding {
+    transport: 'codex_rpc' | 'codex_async';
+    sessionId: string;
+    generation: string;
+    threadId: string;
+    turnId: string;
+    itemId: string;
+    requestId?: string | number;
+}
+export type ProviderQuestionLifecycle = 'pending' | 'submitted' | 'resolved' | 'completed' | 'cancelled' | 'expired' | 'unknown';
+export interface ProviderQuestionEpisode {
+    blocking?: boolean;
+    binding?: ProviderQuestionBinding;
+    lifecycle?: ProviderQuestionLifecycle;
+    /** Async dismiss is product-local; it is not a native tool cancellation. */
+    support?: 'request_bound' | 'product_local' | 'uncertain';
+}
+export declare function isProviderQuestionBinding(value: unknown): value is ProviderQuestionBinding;

package/dist/turn-evidence.d.ts

@@ -58,20 +58,20 @@ export declare const SESSION_REBOUND_REASONS: readonly ["restart", "live_holder"
 export type SessionReboundReason = typeof SESSION_REBOUND_REASONS[number];
 export declare const SUSPENSION_MODALS: readonly ["approval", "choice"];
 export type SuspensionModal = typeof SUSPENSION_MODALS[number];
-export declare const SUSPENSION_RESOLUTIONS: readonly ["approved", "rejected", "answered"];
+export declare const SUSPENSION_RESOLUTIONS: readonly ["approved", "rejected", "answered", "dismissed"];
 export type SuspensionResolution = typeof SUSPENSION_RESOLUTIONS[number];
-export declare const SUSPENSION_RESOLUTION_VIAS: readonly ["modal_button", "auto_approve", "prompt_answer"];
+export declare const SUSPENSION_RESOLUTION_VIAS: readonly ["modal_button", "auto_approve", "prompt_answer", "modal_disappeared"];
 export type SuspensionResolutionVia = typeof SUSPENSION_RESOLUTION_VIAS[number];
 export declare const TURN_END_STRENGTHS: readonly ["genuine", "weak"];
 export type TurnEndStrength = typeof TURN_END_STRENGTHS[number];
 /** Why a provider-side weak end was released (was free text `blockReason`). */
 export declare const TURN_END_BLOCK_REASONS: readonly ["missing_final_assistant", "finalization_timeout", "terminal_block_hard_cap", "decoupled_completion"];
 export type TurnEndBlockReason = typeof TURN_END_BLOCK_REASONS[number];
-export declare const NATIVE_TURN_OUTCOMES: readonly ["completed", "aborted"];
+export declare const NATIVE_TURN_OUTCOMES: readonly ["completed", "aborted", "failed"];
 export type NativeTurnOutcome = typeof NATIVE_TURN_OUTCOMES[number];
 export declare const LIVENESS_RESULTS: readonly ["alive", "unknown", "read_failed", "dead"];
 export type LivenessResult = typeof LIVENESS_RESULTS[number];
-export declare const PROVIDER_FAILURES: readonly ["auth_failed", "billing_failed"];
+export declare const PROVIDER_FAILURES: readonly ["auth_failed", "billing_failed", "usage_limit_exceeded", "server_overloaded", "provider_error"];
 export type ProviderFailure = typeof PROVIDER_FAILURES[number];
 /**
  * `daemon_restart` (wiring-unification follow-up, design §5): boot-time
@@ -106,7 +106,7 @@ export type TurnOutcome = typeof TURN_OUTCOMES[number];
 export declare const COMMIT_STRENGTHS: readonly ["genuine", "weak", "tool_report", "operator"];
 export type CommitStrength = typeof COMMIT_STRENGTHS[number];
 /** Every terminal or reclaim reason the ledger writes. Closed: no free-text reasons. */
-export declare const TURN_REASONS: readonly ["turn_end", "weak_end_confirmed", "transcript_final", "worker_reported", "finalization_timeout_no_response", "session_error", "provider_auth_failed", "provider_billing_failed", "operator_cancel", "intentional_cleanup", "task_removed", "mission_abandoned", "superseded", "operator_update", "refine_terminal", "validation_terminal", "hard_ceiling", "reclaim_budget_exhausted", "hollow_max_retries", "migration_orphan", "dispatch_refused_session_exited", "dispatch_refused_no_target", "dispatch_refused_unsupported_input", "dispatch_failed", "session_exit", "session_exit_before_turn", "session_dead", "hollow_completion", "assigned_stranded_dispatch_unconfirmed", "delivered_not_consumed_redrive", "delivered_no_turn_deadline"];
+export declare const TURN_REASONS: readonly ["turn_end", "weak_end_confirmed", "transcript_final", "worker_reported", "finalization_timeout_no_response", "session_error", "provider_auth_failed", "provider_billing_failed", "provider_usage_limit_exceeded", "provider_server_overloaded", "provider_error", "operator_cancel", "intentional_cleanup", "task_removed", "mission_abandoned", "superseded", "operator_update", "refine_terminal", "validation_terminal", "hard_ceiling", "reclaim_budget_exhausted", "hollow_max_retries", "migration_orphan", "dispatch_refused_session_exited", "dispatch_refused_no_target", "dispatch_refused_unsupported_input", "dispatch_failed", "session_exit", "session_exit_before_turn", "session_dead", "hollow_completion", "assigned_stranded_dispatch_unconfirmed", "delivered_not_consumed_redrive", "delivered_no_turn_deadline"];
 export type TurnReason = typeof TURN_REASONS[number];
 /**
  * What a `turn.notify` entry tells a coordinator.
@@ -149,6 +149,9 @@ export interface EvidenceCoordinatorIdentity {
 export interface NativeTurnMarkerRef {
     outcome: NativeTurnOutcome;
     turnId?: string;
+    receivedAt?: number;
+    startedAt?: number;
+    errorAt?: number;
 }
 export interface EvidenceEnvelope {
     /** Stable id of this observation; dedupe key across republish/replication. */
@@ -220,10 +223,13 @@ export type TurnEvidenceBody = {
     kind: 'suspension';
     modal: SuspensionModal;
     modalKey?: string;
+    providerSetup?: boolean;
+    clockUnknown?: boolean;
 } | {
     kind: 'suspension_resolved';
     resolution: SuspensionResolution;
     via: SuspensionResolutionVia;
+    modalKey?: string;
 } | {
     kind: 'turn_end';
     strength: TurnEndStrength;
@@ -233,6 +239,7 @@ export type TurnEvidenceBody = {
     blockReason?: TurnEndBlockReason;
     releasedByHardCap?: boolean;
     nativeOutcome?: NativeTurnOutcome;
+    nativeMarker?: NativeTurnMarkerRef;
     live?: LiveTurnPending;
     /**
      * Stamped (true only) by the WORKER's daemon when the session holds a live
@@ -372,13 +379,14 @@ export declare const TURN_EVIDENCE_KINDS: readonly TurnEvidenceKind[];
 /** Evidence kinds that, on their own, can end a turn (the ones R18/R19/R27 reason about). */
 export declare const TERMINAL_CLASS_EVIDENCE_KINDS: readonly ["turn_end", "transcript_final", "no_progress", "worker_report", "session_error", "process_exit", "cancel", "operator_status"];
 export declare const isTurnEvidenceKind: (value: unknown) => value is "no_progress" | "delivered" | "liveness" | "turn_end" | "transcript_final" | "session_error" | "dispatch_failed" | "dispatch_accepted" | "delivery_refused" | "duplicate_dispatch_refusal" | "session_rebound" | "turn_started" | "suspension" | "suspension_resolved" | "transcript_activity" | "process_exit" | "worker_report" | "worker_progress" | "git_side_effect" | "cancel" | "operator_status" | "coordinator_ack" | "hold_expired";
-export declare const isTurnReason: (value: unknown) => value is "intentional_cleanup" | "operator_cancel" | "task_removed" | "mission_abandoned" | "superseded" | "operator_update" | "refine_terminal" | "validation_terminal" | "hard_ceiling" | "turn_end" | "weak_end_confirmed" | "transcript_final" | "worker_reported" | "finalization_timeout_no_response" | "session_error" | "provider_auth_failed" | "provider_billing_failed" | "reclaim_budget_exhausted" | "hollow_max_retries" | "migration_orphan" | "dispatch_refused_session_exited" | "dispatch_refused_no_target" | "dispatch_refused_unsupported_input" | "dispatch_failed" | "session_exit" | "session_exit_before_turn" | "session_dead" | "hollow_completion" | "assigned_stranded_dispatch_unconfirmed" | "delivered_not_consumed_redrive" | "delivered_no_turn_deadline";
+export declare const isTurnReason: (value: unknown) => value is "provider_error" | "intentional_cleanup" | "operator_cancel" | "task_removed" | "mission_abandoned" | "superseded" | "operator_update" | "refine_terminal" | "validation_terminal" | "hard_ceiling" | "turn_end" | "weak_end_confirmed" | "transcript_final" | "worker_reported" | "finalization_timeout_no_response" | "session_error" | "provider_auth_failed" | "provider_billing_failed" | "provider_usage_limit_exceeded" | "provider_server_overloaded" | "reclaim_budget_exhausted" | "hollow_max_retries" | "migration_orphan" | "dispatch_refused_session_exited" | "dispatch_refused_no_target" | "dispatch_refused_unsupported_input" | "dispatch_failed" | "session_exit" | "session_exit_before_turn" | "session_dead" | "hollow_completion" | "assigned_stranded_dispatch_unconfirmed" | "delivered_not_consumed_redrive" | "delivered_no_turn_deadline";
 export declare const isNotifyKind: (value: unknown) => value is "stopped" | "failed" | "no_progress" | "completed" | "cancelled" | "approval" | "choice" | "approval_resolved" | "candidate" | "progress" | "late_completion" | "mesh_event";
 export declare const isTurnOutcome: (value: unknown) => value is "failed" | "completed" | "cancelled";
 export declare const isCommitStrength: (value: unknown) => value is "operator" | "genuine" | "weak" | "tool_report";
 export declare function isEvidenceIdentifier(value: unknown): value is string;
 export declare function isSummaryRef(value: unknown): value is SummaryRef;
 export declare function isTurnAttemptRef(value: unknown): value is TurnAttemptRef;
+export declare function isNativeMarkerRef(value: unknown): value is NativeTurnMarkerRef;
 /**
  * Strict structural guard: known kind, every declared field of the right class,
  * and NO undeclared field (an unknown key is how free text would sneak in).

package/dist/types.d.ts

@@ -120,6 +120,7 @@ export interface MeshNodeIdentified {
     [key: string]: unknown;
 }
 export interface RepoMeshSessionStatus {
+    providerApproval?: import('./provider-approval').ProviderApproval | null;
     sessionId: string;
     providerType?: string;
     state?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/mesh-shared",
-  "version": "1.0.82-rc.10",
+  "version": "1.0.82-rc.12",
   "description": "ADHDev mesh-shared — pure mesh/git status normalizers shared by daemon-core and web-core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/assistant-protocol.ts

@@ -18,6 +18,9 @@
 
 export const ASSISTANT_TOOLS = [
     'projects',
+    'environment',
+    'assistant_action',
+    'project_watch',
     'project_status',
     'project_send',
     'project_read',
@@ -41,6 +44,11 @@ export function isAssistantTool(value: unknown): value is AssistantTool {
 export const ASSISTANT_VERB = {
     // tool verbs
     projects: 'assistant_projects',
+    environment: 'assistant_environment',
+    action: 'assistant_action',
+    watch: 'assistant_project_watch',
+    executionState: 'assistant_execution_state',
+    executionSettings: 'assistant_execution_settings',
     projectStatus: 'assistant_project_status',
     projectSend: 'assistant_project_send',
     projectRead: 'assistant_project_read',
@@ -64,6 +72,9 @@ export type AssistantVerb = typeof ASSISTANT_VERB[keyof typeof ASSISTANT_VERB]
 /** The daemon verb each assistant tool calls. */
 export const ASSISTANT_TOOL_VERBS: Readonly<Record<AssistantTool, AssistantVerb>> = {
     projects: ASSISTANT_VERB.projects,
+    environment: ASSISTANT_VERB.environment,
+    assistant_action: ASSISTANT_VERB.action,
+    project_watch: ASSISTANT_VERB.watch,
     project_status: ASSISTANT_VERB.projectStatus,
     project_send: ASSISTANT_VERB.projectSend,
     project_read: ASSISTANT_VERB.projectRead,
@@ -81,10 +92,11 @@ export const ASSISTANT_TOOL_VERBS: Readonly<Record<AssistantTool, AssistantVerb>
  * because they cause effects (a coordinator message or launch, a new
  * project), and MCP clients use readOnlyHint to skip confirmation.
  */
-export const ASSISTANT_WRITE_TOOLS: readonly AssistantTool[] = ['memory', 'skill_manage', 'project_note', 'project_send', 'project_add']
+export const ASSISTANT_WRITE_TOOLS: readonly AssistantTool[] = ['project_watch', 'assistant_action', 'memory', 'skill_manage', 'project_note', 'project_send', 'project_add']
 
 /** Owner-only verbs: never reachable from the assistant's MCP server (no `ipc`). */
 export const ASSISTANT_OWNER_VERBS: readonly AssistantVerb[] = [
+    ASSISTANT_VERB.executionSettings,
     ASSISTANT_VERB.stagedResolve,
     ASSISTANT_VERB.storeAdmin,
     ASSISTANT_VERB.importSkills,

package/src/index.ts

@@ -42,3 +42,5 @@ export * from './turn-ipc'
 export * from './path-ownership'
 export * from './mission-brief'
 export * from './keyed-doc-delta'
+export * from './provider-approval'
+export * from './provider-question'

package/src/keyed-doc-delta.ts

@@ -326,7 +326,15 @@ export function foldKeyedDoc<T extends Record<string, unknown>>(held: T, delta:
         const heldList = heldCollections.get(path)
         if (change?.absent) {
             const [head, tail] = splitPath(path)
-            if (!tail) delete next[head]
+            if (!tail) {
+                delete next[head]
+                continue
+            }
+            const parent = next[head]
+            if (!isRecord(parent) || !(tail in parent)) continue
+            const copy = { ...parent }
+            delete copy[tail]
+            next[head] = copy
             continue
         }
         if (!change && heldList === undefined) continue

package/src/node-facts.ts

@@ -151,6 +151,8 @@ export interface MeshNodeFactsProviderEnablement {
 
 export interface MeshNodeFacts {
     schemaVersion: number
+    /** Cached CLI detection only; no paths or account data. */
+    providerInventory?: { observedAt: number; providers: Record<string, { installed: boolean }> }
     reportedAt: number
     daemonBuild?: MeshNodeFactsDaemonBuild
     providerVersions?: Record<string, string>

package/src/path-ownership.ts

@@ -34,7 +34,7 @@
 
 /** One normalized ownership entry: a repo-relative path, optionally a `**` subtree prefix. */
 export interface OwnedPathEntry {
-    /** Repo-relative path with forward slashes, no leading `./`, no trailing slash. */
+    /** Repo-relative path with forward slashes, no leading `./`, no trailing slash; empty for the whole-repo subtree. */
     readonly path: string
     /** True when this entry was declared as `<path>/**` (owns the whole subtree). */
     readonly subtree: boolean
@@ -159,16 +159,14 @@ export function normalizeOwnedPaths(input: unknown): NormalizeOwnedPathsResult {
 /** True when `path` is exactly `base`, or (when `base` is a subtree entry) nested under it. */
 function entryContains(base: OwnedPathEntry, path: string): boolean {
     if (path === base.path) return true
-    if (base.subtree && (path === base.path || path.startsWith(`${base.path}/`))) return true
+    // An empty subtree prefix is the repo root, so it contains every normalized path.
+    if (base.subtree && (base.path === '' || path.startsWith(`${base.path}/`))) return true
     return false
 }
 
 /** True when two normalized entries' claimed sets intersect (exact match, or one contains the other's directory). */
 function entriesOverlap(a: OwnedPathEntry, b: OwnedPathEntry): boolean {
-    if (a.path === b.path) return true
-    if (a.subtree && (b.path === a.path || b.path.startsWith(`${a.path}/`))) return true
-    if (b.subtree && (a.path === b.path || a.path.startsWith(`${b.path}/`))) return true
-    return false
+    return entryContains(a, b.path) || entryContains(b, a.path)
 }
 
 /** True when two declarations claim any overlapping path. Pure set comparison — no policy (refuse vs warn) here. */

package/src/provider-approval.ts

@@ -0,0 +1,59 @@
+/** Provider permissions are runtime decisions, never owner write ratification. */
+export interface ProviderApproval {
+    source: 'provider_modal' | 'legacy_provider' | 'status_only' | 'ledger_approval';
+    /** Exact Inbox actions or the existing session handler; never inferred consent. */
+    compatibility?: 'exact' | 'session_only' | 'unknown';
+    type: 'tool_permission' | 'provider_setup' | 'unknown';
+    evidence: 'live' | 'cached' | 'unavailable';
+    lifecycle: 'pending' | 'resolved';
+    modalKey: string | null;
+    createdAt: number | null;
+    resolvedAt: number | null;
+    description: string;
+    runtimeDirectory?: string;
+    displayedDirectory?: string | null;
+    buttons: string[];
+    actionable: boolean;
+    providerType?: string;
+    sessionId?: string;
+    nodeId?: string | null;
+    meshId?: string | null;
+    taskId?: string | null;
+    attemptId?: string | null;
+    generation?: number | null;
+}
+
+/** Exact resource identity required by the approvals-only action path. */
+export interface ProviderApprovalTarget {
+    modalKey: string;
+    attemptId: string | null;
+    generation: number | null;
+}
+
+/** Confirmed authority for the new Inbox path. Legacy handlers retain their own checks. */
+export function isActionableProviderApproval(approval: ProviderApproval | null | undefined): boolean {
+    return !!approval && approval.source === 'provider_modal' && approval.type === 'tool_permission'
+        && approval.lifecycle === 'pending' && approval.evidence === 'live' && approval.actionable
+        && !!approval.modalKey && Array.isArray(approval.buttons)
+        && approval.buttons.some(button => typeof button === 'string' && !!button.trim());
+}
+
+/** An explicit null suppresses the resource; only missing metadata uses compatibility. */
+export function readProviderDecision(approval: ProviderApproval | null | undefined, waiting: boolean, hasModal = false): ProviderApproval | null {
+    if (approval !== undefined) return approval && ['provider_modal', 'legacy_provider', 'status_only', 'ledger_approval'].includes(approval.source) ? approval : null;
+    if (!waiting) return null;
+    return { source: hasModal ? 'legacy_provider' : 'status_only', type: 'unknown',
+        compatibility: hasModal ? 'session_only' : 'unknown', evidence: 'unavailable',
+        lifecycle: 'pending', modalKey: null, createdAt: null, resolvedAt: null,
+        description: '', buttons: [], actionable: false };
+}
+
+/** Host metadata is durable: identity and clocks only, never modal text or directories. */
+export function providerApprovalSnapshot(approval: ProviderApproval | null | undefined): ProviderApproval | null {
+    if (!approval) return null;
+    const { source, type, lifecycle, modalKey, createdAt, resolvedAt, providerType, sessionId,
+        nodeId, meshId, taskId, attemptId, generation } = approval;
+    return { source, type, lifecycle, modalKey, createdAt, resolvedAt, providerType, sessionId,
+        nodeId, meshId, taskId, attemptId, generation, evidence: 'cached', actionable: false,
+        description: '', buttons: [] };
+}

package/src/provider-question.ts

@@ -0,0 +1,31 @@
+/** Ephemeral provenance supplied by the owning daemon, never inferred from prompt text. */
+export interface ProviderQuestionBinding {
+    transport: 'codex_rpc' | 'codex_async';
+    sessionId: string;
+    generation: string;
+    threadId: string;
+    turnId: string;
+    itemId: string;
+    requestId?: string | number;
+}
+
+export type ProviderQuestionLifecycle = 'pending' | 'submitted' | 'resolved' | 'completed' | 'cancelled' | 'expired' | 'unknown';
+
+export interface ProviderQuestionEpisode {
+    blocking?: boolean;
+    binding?: ProviderQuestionBinding;
+    lifecycle?: ProviderQuestionLifecycle;
+    /** Async dismiss is product-local; it is not a native tool cancellation. */
+    support?: 'request_bound' | 'product_local' | 'uncertain';
+}
+
+export function isProviderQuestionBinding(value: unknown): value is ProviderQuestionBinding {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+    const b = value as Record<string, unknown>;
+    if (b.transport !== 'codex_rpc' && b.transport !== 'codex_async') return false;
+    const keys = ['transport', 'sessionId', 'generation', 'threadId', 'turnId', 'itemId', ...(b.transport === 'codex_rpc' ? ['requestId'] : [])];
+    if (Reflect.ownKeys(b).some(key => typeof key !== 'string' || !keys.includes(key))) return false;
+    if (['sessionId', 'generation', 'threadId', 'turnId', 'itemId'].some(key => typeof b[key] !== 'string' || !(b[key] as string).trim())) return false;
+    return b.transport === 'codex_async' ? b.requestId === undefined
+        : (typeof b.requestId === 'string' && !!b.requestId.trim()) || (typeof b.requestId === 'number' && Number.isFinite(b.requestId));
+}

package/src/turn-evidence.ts

@@ -83,9 +83,9 @@ export type SessionReboundReason = typeof SESSION_REBOUND_REASONS[number]
 
 export const SUSPENSION_MODALS = ['approval', 'choice'] as const
 export type SuspensionModal = typeof SUSPENSION_MODALS[number]
-export const SUSPENSION_RESOLUTIONS = ['approved', 'rejected', 'answered'] as const
+export const SUSPENSION_RESOLUTIONS = ['approved', 'rejected', 'answered', 'dismissed'] as const
 export type SuspensionResolution = typeof SUSPENSION_RESOLUTIONS[number]
-export const SUSPENSION_RESOLUTION_VIAS = ['modal_button', 'auto_approve', 'prompt_answer'] as const
+export const SUSPENSION_RESOLUTION_VIAS = ['modal_button', 'auto_approve', 'prompt_answer', 'modal_disappeared'] as const
 export type SuspensionResolutionVia = typeof SUSPENSION_RESOLUTION_VIAS[number]
 
 export const TURN_END_STRENGTHS = ['genuine', 'weak'] as const
@@ -97,13 +97,13 @@ export const TURN_END_BLOCK_REASONS = [
 ] as const
 export type TurnEndBlockReason = typeof TURN_END_BLOCK_REASONS[number]
 
-export const NATIVE_TURN_OUTCOMES = ['completed', 'aborted'] as const
+export const NATIVE_TURN_OUTCOMES = ['completed', 'aborted', 'failed'] as const
 export type NativeTurnOutcome = typeof NATIVE_TURN_OUTCOMES[number]
 
 export const LIVENESS_RESULTS = ['alive', 'unknown', 'read_failed', 'dead'] as const
 export type LivenessResult = typeof LIVENESS_RESULTS[number]
 
-export const PROVIDER_FAILURES = ['auth_failed', 'billing_failed'] as const
+export const PROVIDER_FAILURES = ['auth_failed', 'billing_failed', 'usage_limit_exceeded', 'server_overloaded', 'provider_error'] as const
 export type ProviderFailure = typeof PROVIDER_FAILURES[number]
 
 /**
@@ -164,7 +164,7 @@ export type CommitStrength = typeof COMMIT_STRENGTHS[number]
 export const TURN_REASONS = [
     // commits
     'turn_end', 'weak_end_confirmed', 'transcript_final', 'worker_reported',
-    'finalization_timeout_no_response', 'session_error', 'provider_auth_failed', 'provider_billing_failed',
+    'finalization_timeout_no_response', 'session_error', 'provider_auth_failed', 'provider_billing_failed', 'provider_usage_limit_exceeded', 'provider_server_overloaded', 'provider_error',
     'operator_cancel', 'intentional_cleanup', 'task_removed', 'mission_abandoned', 'superseded',
     'operator_update', 'refine_terminal', 'validation_terminal',
     'hard_ceiling', 'reclaim_budget_exhausted', 'hollow_max_retries', 'migration_orphan',
@@ -207,7 +207,7 @@ export interface LiveTurnPending { modal: boolean; adapterPending: boolean; trai
 /** Structural copy of daemon-core's `CoordinatorIdentity` (this package cannot import daemon-core). */
 export interface EvidenceCoordinatorIdentity { daemonId: string; coordinatorRunId: string; sessionId?: string }
 
-export interface NativeTurnMarkerRef { outcome: NativeTurnOutcome; turnId?: string }
+export interface NativeTurnMarkerRef { outcome: NativeTurnOutcome; turnId?: string; receivedAt?: number; startedAt?: number; errorAt?: number }
 
 export interface EvidenceEnvelope {
     /** Stable id of this observation; dedupe key across republish/replication. */
@@ -250,10 +250,10 @@ export type TurnEvidenceBody =
     | { kind: 'session_rebound'; toSessionId: string; reason: SessionReboundReason }
     // ── worker turn lifecycle ──
     | { kind: 'turn_started'; retro: boolean }
-    | { kind: 'suspension'; modal: SuspensionModal; modalKey?: string }
-    | { kind: 'suspension_resolved'; resolution: SuspensionResolution; via: SuspensionResolutionVia }
+    | { kind: 'suspension'; modal: SuspensionModal; modalKey?: string; providerSetup?: boolean; clockUnknown?: boolean }
+    | { kind: 'suspension_resolved'; resolution: SuspensionResolution; via: SuspensionResolutionVia; modalKey?: string }
     | { kind: 'turn_end'; strength: TurnEndStrength; afterFinalizationTimeout?: boolean; hollow?: boolean; summary?: SummaryRef
-        blockReason?: TurnEndBlockReason; releasedByHardCap?: boolean; nativeOutcome?: NativeTurnOutcome; live?: LiveTurnPending
+        blockReason?: TurnEndBlockReason; releasedByHardCap?: boolean; nativeOutcome?: NativeTurnOutcome; nativeMarker?: NativeTurnMarkerRef; live?: LiveTurnPending
         /**
          * Stamped (true only) by the WORKER's daemon when the session holds a live
          * worker-MCP session bind, i.e. the worker can call report_completion. The
@@ -352,13 +352,13 @@ export const TURN_EVIDENCE_FIELD_SPECS: TurnEvidenceFieldSpecs = {
     duplicate_dispatch_refusal: { holderSessionId: id, holderAttemptId: idOpt },
     session_rebound: { toSessionId: id, reason: en(SESSION_REBOUND_REASONS) },
     turn_started: { retro: bool },
-    suspension: { modal: en(SUSPENSION_MODALS), modalKey: idOpt },
-    suspension_resolved: { resolution: en(SUSPENSION_RESOLUTIONS), via: en(SUSPENSION_RESOLUTION_VIAS) },
+    suspension: { modal: en(SUSPENSION_MODALS), modalKey: idOpt, providerSetup: boolOpt, clockUnknown: boolOpt },
+    suspension_resolved: { resolution: en(SUSPENSION_RESOLUTIONS), via: en(SUSPENSION_RESOLUTION_VIAS), modalKey: idOpt },
     turn_end: {
         strength: en(TURN_END_STRENGTHS), afterFinalizationTimeout: boolOpt, hollow: boolOpt,
         summary: { t: 'summary_ref', optional: true }, blockReason: enOpt(TURN_END_BLOCK_REASONS),
         releasedByHardCap: boolOpt, nativeOutcome: enOpt(NATIVE_TURN_OUTCOMES), live: { t: 'live', optional: true },
-        reportExpected: boolOpt, providerFailure: enOpt(PROVIDER_FAILURES),
+        nativeMarker: { t: 'native_marker', optional: true }, reportExpected: boolOpt, providerFailure: enOpt(PROVIDER_FAILURES),
     },
     transcript_final: {
         selfAttributing: bool, nativeRead: bool, nativeMarker: { t: 'native_marker', optional: true },
@@ -440,11 +440,12 @@ function isLiveTurnPending(value: unknown): value is LiveTurnPending {
         && (value.newestActivityAt === undefined || isFiniteNumber(value.newestActivityAt))
 }
 
-function isNativeMarkerRef(value: unknown): value is NativeTurnMarkerRef {
+export function isNativeMarkerRef(value: unknown): value is NativeTurnMarkerRef {
     return isRecord(value)
-        && hasOnlyKeys(value, ['outcome', 'turnId'])
+        && hasOnlyKeys(value, ['outcome', 'turnId', 'receivedAt', 'startedAt', 'errorAt'])
         && (NATIVE_TURN_OUTCOMES as readonly string[]).includes(value.outcome as string)
         && (value.turnId === undefined || isEvidenceIdentifier(value.turnId))
+        && ['receivedAt', 'startedAt', 'errorAt'].every((key) => value[key] === undefined || isFiniteNumber(value[key]))
 }
 
 function isCoordinatorIdentity(value: unknown): value is EvidenceCoordinatorIdentity {

package/src/types.ts

@@ -137,6 +137,7 @@ export interface MeshNodeIdentified {
 }
 
 export interface RepoMeshSessionStatus {
+    providerApproval?: import('./provider-approval').ProviderApproval | null;
     sessionId: string
     providerType?: string
     state?: string