@adhdev/mesh-shared 1.0.82-rc.3 → 1.0.82-rc.30

package/dist/task-source-phase.d.ts

@@ -0,0 +1,75 @@
+import type { OwnedPathEntry } from './path-ownership';
+export type MeshTaskPhase = 'source' | 'integration';
+/** Host-produced evidence. Never accepted from MCP/peer-supplied paths or branch labels. */
+export interface PhysicalOwnershipScope {
+    version: 1;
+    repoIdentity: string;
+    machineId: string;
+    nodeId: string;
+    worktree: string;
+    worktreeIdentity: string;
+    gitDir: string;
+    commonGitDir: string;
+    phase: MeshTaskPhase;
+    gitResources: {
+        index: string;
+        refs: string;
+        hooks: string;
+        config: string;
+    };
+    resources: Array<{
+        path: string;
+        identity?: string;
+        subtree: boolean;
+    }>;
+    declaration: readonly OwnedPathEntry[];
+}
+/** A source packet is an input to integration, never release/feature acceptance. */
+export interface MeshSourceCandidate {
+    version: 1;
+    readiness: 'uncommitted' | 'verified_source_candidate';
+    taskId: string;
+    missionId: string;
+    revision: number;
+    repoIdentity: string;
+    machineId: string;
+    canonicalWorktree: string;
+    rootBaseSha: string;
+    ossBaseSha: string;
+    rootCandidateSha?: string;
+    ossCandidateSha?: string;
+    patchSha256: string;
+    manifestSha256: string;
+    touchedPaths: string[];
+    tests: Array<{
+        command: string;
+        exit: number;
+        logSha256: string;
+    }>;
+    settledCommands: boolean;
+    integrationTaskId: string;
+    logicalOverlapTaskIds: string[];
+}
+/** Product B consumes one frozen batch; normal hooks/parity/gates remain required. */
+export interface MeshIntegrationBatchContract {
+    version: 1;
+    batchId: string;
+    candidates: MeshSourceCandidate[];
+    integrationOrder: string[];
+    approvedRootSha: string;
+    approvedOssSha: string;
+    bundleInvocationCount: 1;
+    requiredGates: string[];
+    normalHooksRequired: true;
+    independentReviewRequired: true;
+    ownerLandingApprovalRequired: true;
+}
+/** These only rank legal targets; targetNodeId/SessionId and requiredTags remain hard. */
+export interface MeshRoutingPreferences {
+    nodeIds?: string[];
+    providers?: string[];
+}
+export interface MeshReviewConstraint {
+    sourceTaskId: string;
+    differentProvider: true;
+}

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
@@ -99,14 +99,14 @@ export type NoProgressObservedStatus = SessionStatus | 'unknown';
  * Reasons a turn hold exists. Holds are attempt-scoped only (C2: delivery-side
  * waits are consumer deferral on the `turn.deliver` cursor, not hold rows).
  */
-export declare const HOLD_REASONS: readonly ["await_delivery", "await_consume", "await_turn", "liveness", "hard_ceiling", "live_pending", "transcript_quiet", "weak_candidate", "suspension_before_consumed", "await_report", "await_end"];
+export declare const HOLD_REASONS: readonly ["await_delivery", "await_consume", "await_turn", "liveness", "hard_ceiling", "live_pending", "transcript_quiet", "weak_candidate", "suspension_before_consumed", "await_report", "await_end", "report_correction"];
 export type HoldReason = typeof HOLD_REASONS[number];
-export declare const TURN_OUTCOMES: readonly ["completed", "failed", "cancelled"];
+export declare const TURN_OUTCOMES: readonly ["completed", "blocked", "failed", "cancelled"];
 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", "weak_end_liveness_unconfirmed", "weak_end_probe_unobserved", "report_correction_expired", "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.
@@ -118,7 +118,7 @@ export type TurnReason = typeof TURN_REASONS[number];
  * (refine terminal, worktree bootstrap, …) whose text lives only in the
  * owner's local `turn_events.payload_json` and is rendered at deliver time.
  */
-export declare const NOTIFY_KINDS: readonly ["completed", "failed", "cancelled", "stopped", "approval", "choice", "approval_resolved", "candidate", "no_progress", "progress", "late_completion", "mesh_event"];
+export declare const NOTIFY_KINDS: readonly ["completed", "blocked", "failed", "cancelled", "stopped", "approval", "choice", "approval_resolved", "candidate", "no_progress", "progress", "late_completion", "mesh_event"];
 export type NotifyKind = typeof NOTIFY_KINDS[number];
 export interface TurnAttemptRef {
     attemptId: string;
@@ -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
@@ -268,6 +275,7 @@ export type TurnEvidenceBody = {
 } | {
     kind: 'liveness';
     result: LivenessResult;
+    probeStartedAtMs?: number;
 } | {
     kind: 'process_exit';
     exitCode: number | null;
@@ -288,6 +296,9 @@ export type TurnEvidenceBody = {
     hasHandoffNotes: boolean;
     branchState?: WorkerBranchState;
     touchedFileCount?: number;
+} | {
+    kind: 'worker_report_correction_requested';
+    deliveryId?: string;
 } | {
     kind: 'worker_progress';
     note?: SummaryRef;
@@ -371,14 +382,15 @@ export declare const TURN_EVIDENCE_FIELD_SPECS: TurnEvidenceFieldSpecs;
 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 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 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_report_correction_requested" | "worker_progress" | "git_side_effect" | "cancel" | "operator_status" | "coordinator_ack" | "hold_expired";
+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" | "weak_end_liveness_unconfirmed" | "weak_end_probe_unobserved" | "report_correction_expired" | "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" | "blocked" | "no_progress" | "completed" | "cancelled" | "approval" | "choice" | "approval_resolved" | "candidate" | "progress" | "late_completion" | "mesh_event";
+export declare const isTurnOutcome: (value: unknown) => value is "failed" | "blocked" | "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/turn-ipc-mission.d.ts

@@ -89,6 +89,8 @@ export interface MeshMissionTaskAggregateWire {
     lastActivityAt: string | null;
 }
 export interface MeshMissionStatsWire {
+    /** Present on peers that project proven blocked outcomes separately. */
+    blocked?: number;
     missionId: string;
     taskCount: number;
     completed: number;
@@ -231,6 +233,8 @@ export interface LedgerQueryEntryWire {
     payload: Record<string, unknown>;
 }
 export interface LedgerQuerySummaryWire {
+    /** Absent on older peers; never folded into failed by the decoder. */
+    taskBlocked?: number;
     meshId: string;
     totalEntries: number;
     taskDispatched: number;

package/dist/turn-ipc-queue.d.ts

@@ -65,6 +65,8 @@ export interface QueueQueryResponse {
     counts?: Record<string, number>;
     /** `withCounts` + `historicalOlderThanMs`: terminal rows older than that age. */
     oldHistoricalCount?: number;
+    /** Included in counts.blocked, derived from proven worker reports; stored failed rows stay unchanged. */
+    legacyReportedBlockedCount?: number;
     /** `withDependencyHeads`. */
     dependencyHeads?: readonly QueueDependencyHeadWire[];
 }
@@ -194,3 +196,20 @@ export interface RecoveryContextQueryResponse {
 }
 export declare function decodeRecoveryContextQueryRequest(value: unknown): RecoveryContextQueryRequest | null;
 export declare function decodeRecoveryContextQueryResponse(value: unknown): RecoveryContextQueryResponse | null;
+export interface QueueReviseRequest {
+    v: typeof TURN_IPC_PROTOCOL_VERSION;
+    meshId: string;
+    taskId: string;
+    expectedRevision: number;
+    patch: {
+        message?: string;
+        ownedPaths?: string[];
+        phase?: 'source' | 'integration';
+        dependsOn?: string[];
+        routingPreferences?: import('./task-source-phase').MeshRoutingPreferences;
+        review?: import('./task-source-phase').MeshReviewConstraint;
+    };
+}
+export type QueueReviseResponse = QueueRequeueResponse;
+export declare function decodeQueueReviseRequest(value: unknown): QueueReviseRequest | null;
+export declare const decodeQueueReviseResponse: typeof decodeQueueRequeueResponse;

package/dist/turn-ipc.d.ts

@@ -94,6 +94,6 @@ export interface TurnIpcError {
 }
 export declare function isTurnIpcError(value: unknown): value is TurnIpcError;
 /** The complete, closed set of IPC command names this contract defines. */
-export declare const TURN_IPC_COMMANDS: readonly ["turn_observe", "mesh_record", "turn_cancel", "operator_status", "turn_query", "mesh_index_query", "mission_upsert", "mission_query", "note_upsert", "note_forget", "tool_call_record", "ledger_query", "mission_list_query", "record_local", "queue_query", "queue_enqueue", "queue_enqueue_batch", "queue_cancel", "queue_requeue", "direct_dispatch_record", "active_work_query", "recovery_context_query", "task_stats_query", "prune_stale_direct", "orphaned_pin_notify"];
+export declare const TURN_IPC_COMMANDS: readonly ["turn_observe", "mesh_record", "turn_cancel", "operator_status", "turn_query", "mesh_index_query", "mission_upsert", "mission_query", "note_upsert", "note_forget", "tool_call_record", "ledger_query", "mission_list_query", "record_local", "queue_query", "queue_enqueue", "queue_enqueue_batch", "queue_cancel", "queue_requeue", "queue_revise", "direct_dispatch_record", "active_work_query", "recovery_context_query", "task_stats_query", "prune_stale_direct", "orphaned_pin_notify"];
 export type TurnIpcCommand = typeof TURN_IPC_COMMANDS[number];
-export declare const isTurnIpcCommand: (value: unknown) => value is "prune_stale_direct" | "operator_status" | "turn_observe" | "mesh_record" | "turn_cancel" | "turn_query" | "mesh_index_query" | "mission_upsert" | "mission_query" | "note_upsert" | "note_forget" | "tool_call_record" | "ledger_query" | "mission_list_query" | "record_local" | "queue_query" | "queue_enqueue" | "queue_enqueue_batch" | "queue_cancel" | "queue_requeue" | "direct_dispatch_record" | "active_work_query" | "recovery_context_query" | "task_stats_query" | "orphaned_pin_notify";
+export declare const isTurnIpcCommand: (value: unknown) => value is "prune_stale_direct" | "operator_status" | "turn_observe" | "mesh_record" | "turn_cancel" | "turn_query" | "mesh_index_query" | "mission_upsert" | "mission_query" | "note_upsert" | "note_forget" | "tool_call_record" | "ledger_query" | "mission_list_query" | "record_local" | "queue_query" | "queue_enqueue" | "queue_enqueue_batch" | "queue_cancel" | "queue_requeue" | "queue_revise" | "direct_dispatch_record" | "active_work_query" | "recovery_context_query" | "task_stats_query" | "orphaned_pin_notify";

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/dist/worker-protocol.d.ts

@@ -30,7 +30,7 @@
  * the protocol contract the marker demarcates.
  */
 import { type MissionBrief } from './mission-brief';
-export declare const WORKER_TOOLS: readonly ["report_completion", "progress_update", "peer_context_pull", "git_status", "git_log", "git_diff"];
+export declare const WORKER_TOOLS: readonly ["report_completion", "progress_update", "peer_context_pull", "git_status", "git_log", "git_diff", "driver_list", "driver_describe", "driver_invoke", "artifact_register"];
 export type WorkerTool = typeof WORKER_TOOLS[number];
 export declare function isWorkerTool(value: unknown): value is WorkerTool;
 /** Stable marker line so a body is never footered twice and tests can find it. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/mesh-shared",
-  "version": "1.0.82-rc.3",
+  "version": "1.0.82-rc.30",
   "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

@@ -11,22 +11,29 @@
  *   - the daemon-only verbs (launch / MCP-only pull / owner actions) that have
  *     no tool.
  *
- * Assistant tools are a separate set from the mesh tools: none of these names
- * belongs in `CANONICAL_MESH_TOOL_NAMES`, and the coordinator/worker MCP modes
- * never publish them.
+ * Assistant-specific tools remain separate from mesh tools. Driver discovery
+ * (list/describe) is shared across all three modes; invoke remains Worker-only.
  */
 
 export const ASSISTANT_TOOLS = [
     'projects',
+    'environment',
+    'assistant_action',
+    'project_watch',
     'project_status',
     'project_send',
     'project_read',
     'project_add',
+    'project_attach_remote',
     'discover_repos',
     'memory',
     'skill_view',
     'skill_manage',
     'project_note',
+    'launch_defaults',
+    'launch_defaults_set',
+    'driver_list',
+    'driver_describe',
 ] as const
 
 export type AssistantTool = typeof ASSISTANT_TOOLS[number]
@@ -40,16 +47,26 @@ export function isAssistantTool(value: unknown): value is AssistantTool {
 /** Daemon verb names (§4.4 table + the five verbs below it). */
 export const ASSISTANT_VERB = {
     // tool verbs
+    driverList: 'driver_list',
+    driverDescribe: 'driver_describe',
     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',
     projectAdd: 'assistant_project_add',
+    projectAttachRemote: 'assistant_project_attach_remote',
     discoverRepos: 'assistant_discover_repos',
     memory: 'assistant_memory',
     skillView: 'assistant_skill_view',
     skillManage: 'assistant_skill_manage',
     projectNote: 'assistant_project_note',
+    launchDefaults: 'assistant_launch_defaults',
+    launchDefaultsSet: 'assistant_launch_defaults_set',
     // assistant-side daemon verbs without a tool of the same name
     launch: 'launch_assistant',
     pendingRelays: 'assistant_pending_relays',
@@ -57,22 +74,33 @@ export const ASSISTANT_VERB = {
     stagedResolve: 'assistant_staged_resolve',
     storeAdmin: 'assistant_store_admin',
     importSkills: 'assistant_import_skills',
+    /** Projects the assistant is following (open relay threads) — list / stop following. */
+    threads: 'assistant_threads',
+    threadClose: 'assistant_thread_close',
 } as const
 
 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>> = {
+    driver_list: ASSISTANT_VERB.driverList,
+    driver_describe: ASSISTANT_VERB.driverDescribe,
     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,
     project_add: ASSISTANT_VERB.projectAdd,
+    project_attach_remote: ASSISTANT_VERB.projectAttachRemote,
     discover_repos: ASSISTANT_VERB.discoverRepos,
     memory: ASSISTANT_VERB.memory,
     skill_view: ASSISTANT_VERB.skillView,
     skill_manage: ASSISTANT_VERB.skillManage,
     project_note: ASSISTANT_VERB.projectNote,
+    launch_defaults: ASSISTANT_VERB.launchDefaults,
+    launch_defaults_set: ASSISTANT_VERB.launchDefaultsSet,
 }
 
 /**
@@ -81,13 +109,15 @@ 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', 'project_attach_remote', 'launch_defaults_set']
 
 /** 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,
+    ASSISTANT_VERB.threadClose,
 ]
 
 /** The only assistant verbs accepted while an idle review turn is open (§4.10.7). */
@@ -98,8 +128,9 @@ export const ASSISTANT_REVIEW_TURN_VERBS: readonly AssistantVerb[] = [
     ASSISTANT_VERB.projectNote,
 ]
 
-/**
- * Env var the daemon sets on the assistant CLI's process (§4.5), read by the
+import { canonicalDaemonId } from './daemon-normalize'
+
+/** Env var the daemon sets on the assistant CLI's process (§4.5), read by the
  * assistant MCP server and forwarded on every verb as
  * `ASSISTANT_SESSION_ID_ARG`. Routing / ownership only — never an auth gate.
  */
@@ -107,3 +138,213 @@ export const ASSISTANT_SESSION_ID_ENV = 'ADHDEV_ASSISTANT_SESSION_ID'
 
 /** Request arg carrying the calling assistant session id. */
 export const ASSISTANT_SESSION_ID_ARG = 'assistantSessionId'
+
+// ─── Remote Assistant Project Follow & Host-Authoritative Grant (rc24) ──────
+
+/**
+ * Conceptual single-assistant slot in the verified account namespace.
+ * Fixed to `'personal'` — one logical assistant per account with one
+ * owner-selected active execution daemon binding per project ACL.
+ */
+export const ASSISTANT_ACCOUNT_SLOT = 'personal' as const
+export type AssistantAccountSlot = typeof ASSISTANT_ACCOUNT_SLOT
+
+/**
+ * Daemon commands for remote project discovery, host ACL grant/revoke, and
+ * assistant-side follow/unfollow. Registered outside `ASSISTANT_VERB` so the
+ * assistant MCP server tool/verb parity table remains untouched.
+ */
+export const ASSISTANT_REMOTE_PROJECT_COMMAND = 'assistant_remote_project' as const
+export const ASSISTANT_REMOTE_PROJECT_CATALOG_COMMAND = 'assistant_remote_project_catalog' as const
+export const ASSISTANT_REMOTE_PROJECT_ACCESS_COMMAND = 'assistant_remote_project_access' as const
+export const ASSISTANT_REMOTE_FOLLOW_COMMAND = 'assistant_remote_follow' as const
+
+/**
+ * Narrow operations a non-roster follower deputy is permitted to invoke on
+ * `assistant_remote_project` when the host's `assistantRemoteAccess` ACL is active.
+ * `note`, `terminal`, and `inventory` remain strictly roster-member-only.
+ */
+export const ASSISTANT_FOLLOWER_ALLOWED_OPS = ['status', 'read', 'poll', 'report', 'send'] as const
+export type AssistantFollowerAllowedOp = typeof ASSISTANT_FOLLOWER_ALLOWED_OPS[number]
+
+const ASSISTANT_FOLLOWER_ALLOWED_OP_SET: ReadonlySet<string> = new Set(ASSISTANT_FOLLOWER_ALLOWED_OPS)
+
+export function isAssistantFollowerAllowedOp(value: unknown): value is AssistantFollowerAllowedOp {
+    return typeof value === 'string' && ASSISTANT_FOLLOWER_ALLOWED_OP_SET.has(value)
+}
+
+/**
+ * Host-authoritative narrow project ACL persisted on the hosting daemon's
+ * `LocalMeshEntry` in `meshes.json`. Revocation increments `grantRevision`
+ * and retains a `'revoked'` tombstone so stale follower caches cannot replay.
+ */
+export interface AssistantRemoteAccessBinding {
+    hostDaemonId: string
+    meshId: string
+    accountSlot: AssistantAccountSlot
+    activeDaemonId: string
+    bindingRevision: number
+    grantRevision: number
+    status: 'active' | 'revoked'
+    allowedOps: readonly AssistantFollowerAllowedOp[]
+    allowCoordinatorLaunch?: boolean
+    grantedAt: number
+    revokedAt?: number
+}
+
+/**
+ * Durable owner-binding receipt persisted in the assistant daemon's
+ * `assistant.json`. Survives ordinary daemon restarts and session/provider
+ * replacements (`bindSession`), while missing/corrupt/mismatched receipts
+ * fail closed until owner reconciliation.
+ */
+export interface AssistantOwnerBindingReceipt {
+    accountSlot: AssistantAccountSlot
+    daemonId: string
+    bindingRevision: number
+    boundAt: number | string
+}
+
+export type FollowedRemoteProjectState = 'followed' | 'unfollowed' | 'revoked'
+
+export type RemoteAccessState =
+    | 'not_granted'
+    | 'granted_unfollowed'
+    | 'followed'
+    | 'revoked'
+    | 'host_unreachable'
+    | 'binding_mismatch'
+
+/**
+ * Assistant-local followed remote project reference persisted in `assistant.json`.
+ * Never injected into `meshes.json`, `mesh-host-records.json`, `mesh-node-state-push.json`,
+ * or `inlineMeshCache`.
+ */
+export interface FollowedRemoteProjectEntry {
+    /** Canonical key: `${canonicalDaemonId(hostDaemonId)}::${meshId}` */
+    key: string
+    hostDaemonId: string
+    hostLabel?: string
+    meshId: string
+    name: string
+    slug: string
+    sanitizedRepoIdentity: string | null
+    repoIdentity?: string
+    accountSlot: AssistantAccountSlot
+    bindingRevision: number
+    grantRevision: number
+    allowCoordinatorLaunch?: boolean
+    state: FollowedRemoteProjectState
+    followedAt: number | string
+    updatedAt: number | string
+    unfollowedAt?: number | string
+    revokedAt?: number | string
+    revokedReason?: string
+    lastCursor?: string | null
+    coordinatorSessionId?: string | null
+    lastErrorCode?: string
+    lastObserved?: {
+        observedAt: number | string
+        coordinatorState?: string
+        coordinatorMissing?: boolean
+        coordinatorPresent?: boolean
+        lastHeadline?: string
+        summary?: string
+    }
+}
+
+/**
+ * Content-free canonical catalog metadata returned by `assistant_remote_project_catalog`
+ * for meshes actually hosted on the queried remote daemon.
+ */
+export interface RemoteProjectCatalogItem {
+    hostDaemonId: string
+    meshId: string
+    name: string
+    sanitizedRepoIdentity: string | null
+    coordinatorState?: 'none' | 'idle' | 'working' | 'waiting' | string
+    allowCoordinatorLaunch?: boolean
+    capabilities: {
+        status: true
+        read: true
+        poll: true
+        report: true
+        send: true
+        coordinatorPresent?: boolean
+        allowCoordinatorLaunch?: boolean
+    }
+    observedAt: number | string
+}
+
+/** Build the canonical `(hostDaemonId, meshId)` key used across assistant follow state. */
+export function followedRemoteProjectKey(hostDaemonId: string, meshId: string): string {
+    const canonHost = canonicalDaemonId(hostDaemonId) ?? hostDaemonId.trim()
+    return `${canonHost}::${meshId.trim()}`
+}
+
+/**
+ * Sanitize a repository identity or remote URL into a content-free `host/path`
+ * identifier suitable for remote discovery catalogs. Strips credentials, query
+ * strings, fragments, and `.git` suffixes, and rejects local filesystem paths.
+ */
+export function sanitizeRemoteRepoIdentity(raw: string | null | undefined): string | null {
+    if (typeof raw !== 'string') return null
+    const trimmed = raw.trim()
+    if (!trimmed) return null
+
+    // Reject local filesystem paths (Unix absolute/relative/home, Windows drive/UNC, file:// URLs).
+    if (
+        trimmed.startsWith('/')
+        || trimmed.startsWith('./')
+        || trimmed.startsWith('../')
+        || trimmed.startsWith('~/')
+        || trimmed.startsWith('\\')
+        || /^[a-zA-Z]:[\\/]/.test(trimmed)
+        || /^file:/i.test(trimmed)
+    ) {
+        return null
+    }
+
+    const withoutQuery = trimmed.replace(/[?#].*$/, '').replace(/\/+$/, '')
+    if (!withoutQuery) return null
+
+    let host = ''
+    let repoPath = ''
+
+    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(withoutQuery)) {
+        try {
+            const url = new URL(withoutQuery)
+            if (url.protocol === 'file:') return null
+            host = url.hostname.toLowerCase()
+            repoPath = decodeURIComponent(url.pathname)
+                .replace(/^\/+|\/+$/g, '')
+                .replace(/\.git$/i, '')
+        } catch {
+            return null
+        }
+    } else {
+        const scpMatch = withoutQuery.match(/^(?:[^@/:]+@)?(\[[^\]]+\]|[^/:]+):(.+)$/)
+        if (scpMatch) {
+            host = scpMatch[1].replace(/^\[|\]$/g, '').toLowerCase()
+            repoPath = scpMatch[2].replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '')
+        } else {
+            const slash = withoutQuery.indexOf('/')
+            if (slash > 0) {
+                const rawHost = withoutQuery.slice(0, slash)
+                const atIdx = rawHost.lastIndexOf('@')
+                host = (atIdx >= 0 ? rawHost.slice(atIdx + 1) : rawHost).toLowerCase()
+                repoPath = withoutQuery.slice(slash + 1).replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '')
+            }
+        }
+    }
+
+    if (!host || !repoPath) return null
+    if (!host.includes('.') && host !== 'localhost') return null
+    if (/[\s@:\\]/.test(host)) return null
+    const segments = repoPath.split('/').filter(Boolean)
+    if (segments.length === 0) return null
+    if (segments.some(seg => seg === '.' || seg === '..' || /[\s@:\\]/.test(seg))) return null
+
+    return `${host}/${segments.join('/')}`.slice(0, 200)
+}
+

package/src/daemon-normalize.ts

@@ -108,13 +108,15 @@ export function isPhantomDaemonEntry(
 export function machineCoreFromDaemonId(id: string | null | undefined): string | undefined {
     const trimmed = readString(id)
     if (!trimmed) return undefined
+    const lower = trimmed.toLowerCase()
     for (const prefix of DAEMON_ID_PREFIXES) {
-        if (trimmed.startsWith(prefix)) {
+        if (lower.startsWith(prefix)) {
             const core = trimmed.slice(prefix.length).trim()
-            return core || undefined
+            if (!core) return undefined
+            return /^mach_/i.test(core) ? `mach_${core.slice(5)}` : core
         }
     }
-    return trimmed
+    return /^mach_/i.test(trimmed) ? `mach_${trimmed.slice(5)}` : trimmed
 }
 
 /**
@@ -144,8 +146,8 @@ export function machineCoreFromDaemonId(id: string | null | undefined): string |
 export function canonicalDaemonId(id: string | null | undefined): string | undefined {
     const core = machineCoreFromDaemonId(id)
     if (!core) return undefined
-    if (!core.startsWith('mach_')) return core
-    return `daemon_${core}`
+    if (!/^mach_/i.test(core)) return core
+    return `daemon_mach_${core.slice(5)}`
 }
 
 /** True when both ids resolve to the same machine core — i.e. they are the same