@adhdev/daemon-core 0.9.82-rc.230 → 0.9.82-rc.232

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.230",
+  "version": "0.9.82-rc.232",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/router.ts

@@ -5866,12 +5866,15 @@ export class DaemonCommandRouter {
                     nodeDaemonId = typeof node?.daemonId === 'string' ? node.daemonId.trim() : undefined;
                 }
                 // If the target node belongs to a remote daemon, forward the command there.
+                // _meshDirectDispatch prevents re-forwarding (and P2P self-dial) when the stored
+                // daemonId uses a legacy format that doesn't match the receiving daemon's identity.
                 const selfDaemonId = this.deps.statusInstanceId;
                 const isRemote = nodeDaemonId && selfDaemonId && nodeDaemonId !== selfDaemonId;
-                if (isRemote && this.deps.dispatchMeshCommand) {
+                if (isRemote && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
                     const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId!, 'fast_forward_mesh_node', {
                         ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
                         workspace,
+                        _meshDirectDispatch: true,
                     });
                     return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
                 }
@@ -5916,11 +5919,14 @@ export class DaemonCommandRouter {
                     let worktreeCleanup: Record<string, unknown> | undefined;
                     if (node?.isLocalWorktree) {
                         const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
-                        const isRemoteWorktree = nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand;
+                        const isRemoteWorktree = nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand
+                            && !args?._meshDirectDispatch;
                         if (isRemoteWorktree) {
                             // Worktree lives on a different machine — ask that daemon to clean it up.
+                            // _meshDirectDispatch prevents re-forwarding when stored daemonId uses legacy format.
                             const forwarded = await this.deps.dispatchMeshCommand!(nodeDaemonId!, 'remove_mesh_node', {
                                 ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                                _meshDirectDispatch: true,
                             });
                             return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
                         }
@@ -6007,10 +6013,14 @@ export class DaemonCommandRouter {
                     if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
 
                     // Forward to the source node's daemon if it's on a different machine.
+                    // _meshDirectDispatch prevents infinite re-forwarding when the stored daemonId
+                    // uses a legacy format that doesn't match the receiving daemon's statusInstanceId.
                     const sourceDaemonId = typeof sourceNode.daemonId === 'string' ? sourceNode.daemonId.trim() : undefined;
-                    if (sourceDaemonId && sourceDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand) {
+                    if (sourceDaemonId && sourceDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand
+                        && !args?._meshDirectDispatch) {
                         const forwarded = await this.deps.dispatchMeshCommand(sourceDaemonId, 'clone_mesh_node', {
                             ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                            _meshDirectDispatch: true,
                         });
                         return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
                     }
@@ -6271,10 +6281,13 @@ export class DaemonCommandRouter {
                     if (!node.isLocalWorktree) return { success: false, error: 'Node is not a local worktree node' };
 
                     // Bootstrap runs scripts in the worktree path — forward to the node's daemon if remote.
+                    // _meshDirectDispatch prevents re-forwarding when stored daemonId uses legacy format.
                     const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
-                    if (nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand) {
+                    if (nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand
+                        && !args?._meshDirectDispatch) {
                         const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, 'retry_mesh_node_bootstrap', {
                             ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                            _meshDirectDispatch: true,
                         });
                         return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
                     }

package/src/mesh/mesh-events-utils.ts

@@ -97,6 +97,15 @@ export function buildMeshSystemMessage(args: {
     if (args.event === 'monitor:long_generating') {
         return `[System] ${args.nodeLabel} is still reported as generating after a long interval${metadata}. Wait for pendingCoordinatorEvents or a completion/status event; if the user explicitly asks for status, make one bounded status check and then wait again.`;
     }
+    if (args.event === 'worktree_bootstrap_complete') {
+        const worktreePath = readNonEmptyString(args.metadataEvent.worktreePath);
+        const durationMs = typeof args.metadataEvent.durationMs === 'number' ? args.metadataEvent.durationMs : undefined;
+        return `[System] ${args.nodeLabel} worktree bootstrap completed${worktreePath ? ` at ${worktreePath}` : ''}${durationMs !== undefined ? ` in ${Math.round(durationMs / 1000)}s` : ''}. The worktree is ready — use \`mesh_launch_session\` to start an agent.`;
+    }
+    if (args.event === 'worktree_bootstrap_failed') {
+        const error = readNonEmptyString(args.metadataEvent.error);
+        return `[System] ${args.nodeLabel} worktree bootstrap failed${error ? `: ${error}` : '.'}. Use \`mesh_retry_node_bootstrap\` to retry or inspect the node state.`;
+    }
     if (args.event === 'refine:accepted') {
         const jobId = readRefineJobId({ metadataEvent: args.metadataEvent });
         return `[System] Refinery accepted async job${jobId ? ` ${jobId}` : ''} for ${args.nodeLabel}. Completion/failure will be delivered as a terminal refine event; do not poll repeatedly.`;

package/src/providers/spec/native-history-executor.ts

@@ -295,11 +295,9 @@ function expandPath(template: string, input: NativeHistoryInput): string | null
     // Re-expand ~ in case the fallback used it.
     if (out.startsWith('~/')) out = path.join(os.homedir(), out.slice(2));
     const now = new Date();
-    // claude (and a couple of other Anthropic-CLI–style providers) writes
-    // its per-cwd transcript under the *resolved* path
-    // (/private/tmp/foo, not /tmp/foo on macOS where /tmp -> /private/tmp).
-    // Without realpath, the spec template `~/.claude/projects/{cwd_dashed}/…`
-    // builds `-tmp-foo` and never finds the actual `-private-tmp-foo` dir.
+    // Claude writes per-cwd transcripts under the resolved path and replaces
+    // every non-alphanumeric project-path character except `_` and `-` with
+    // `-`. Realpath also handles aliases such as /tmp -> /private/tmp.
     const workspaceRaw = input.workspace ?? '';
     let workspaceResolved = workspaceRaw;
     if (workspaceRaw) {
@@ -309,6 +307,7 @@ function expandPath(template: string, input: NativeHistoryInput): string | null
     const vars: Record<string, string> = {
         cwd: workspaceResolved,
         cwd_dashed: workspaceResolved.replace(/\//g, '-'),
+        cwd_claude_project: claudeProjectDirName(workspaceResolved),
         session_id: input.providerSessionId || input.sessionId || input.historySessionId || '',
         yyyy: String(now.getFullYear()),
         mm: String(now.getMonth() + 1).padStart(2, '0'),
@@ -329,6 +328,10 @@ function expandPath(template: string, input: NativeHistoryInput): string | null
     return out;
 }
 
+function claudeProjectDirName(workspace: string): string {
+    return workspace.replace(/[^A-Za-z0-9_-]/g, '-');
+}
+
 function globToRegex(pattern: string): RegExp {
     // Minimal glob: `*` → `[^/]*`, `?` → `[^/]`, `.` → `\.`. Anchored.
     const re = pattern
@@ -463,6 +466,7 @@ function expandPathForDate(template: string, input: NativeHistoryInput, day: Dat
     const vars: Record<string, string> = {
         cwd: workspaceResolved,
         cwd_dashed: workspaceResolved.replace(/\//g, '-'),
+        cwd_claude_project: claudeProjectDirName(workspaceResolved),
         session_id: input.providerSessionId || input.sessionId || input.historySessionId || '',
         yyyy: String(day.getFullYear()),
         mm: String(day.getMonth() + 1).padStart(2, '0'),