@adhdev/daemon-core 0.9.73 → 0.9.75

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.73",
+  "version": "0.9.75",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.73",
+  "version": "0.9.75",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -262,6 +262,17 @@ export class ProviderCliAdapter implements CliAdapter {
         return screenText;
     }
 
+    private getParseScreenText(screenText: string): string {
+        const currentSnapshot = normalizeScreenSnapshot(screenText);
+        const lastSnapshot = this.lastScreenSnapshot;
+        if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
+        // Terminal screen reads can miss a just-rendered completed Hermes box while
+        // the normalized snapshot captured during output still has it. Feed both
+        // views to provider parsers so flattened snapshot-only final bubbles do
+        // not disappear from read_chat/chat_tail.
+        return `${screenText}\n${lastSnapshot}`;
+    }
+
     private shouldReadTerminalScreenSnapshot(now: number): boolean {
         if (!this.lastScreenText) return true;
         return (now - this.lastScreenSnapshotReadAt) >= ProviderCliAdapter.SCREEN_SNAPSHOT_MIN_INTERVAL_MS;
@@ -1424,12 +1435,13 @@ export class ProviderCliAdapter implements CliAdapter {
         }
         try {
             const screenText = this.terminalScreen.getText();
+            const parseScreenText = this.getParseScreenText(screenText);
             const tail = this.recentOutputBuffer.slice(-500);
             const input = buildCliParseInput({
                 accumulatedBuffer: this.accumulatedBuffer,
                 accumulatedRawBuffer: this.accumulatedRawBuffer,
                 recentOutputBuffer: this.recentOutputBuffer,
-                terminalScreenText: screenText,
+                terminalScreenText: parseScreenText,
                 baseMessages: [],
                 partialResponse: this.responseBuffer,
                 isWaitingForResponse: this.isWaitingForResponse,
@@ -1534,6 +1546,7 @@ export class ProviderCliAdapter implements CliAdapter {
      */
     getScriptParsedStatus(): any {
         const screenText = this.readTerminalScreenText();
+        const parseScreenText = this.getParseScreenText(screenText);
         const cached = this.parsedStatusCache;
         if (
             cached
@@ -1541,7 +1554,7 @@ export class ProviderCliAdapter implements CliAdapter {
             && cached.currentTurnScope === this.currentTurnScope
             && cached.recentOutputBuffer === this.recentOutputBuffer
             && cached.accumulatedBuffer === this.accumulatedBuffer
-            && cached.screenText === screenText
+            && cached.screenText === parseScreenText
             && cached.currentStatus === this.currentStatus
             && cached.activeModal === this.activeModal
             && cached.cliName === this.cliName
@@ -1580,7 +1593,7 @@ export class ProviderCliAdapter implements CliAdapter {
             currentTurnScope: this.currentTurnScope,
             recentOutputBuffer: this.recentOutputBuffer,
             accumulatedBuffer: this.accumulatedBuffer,
-            screenText,
+            screenText: parseScreenText,
             currentStatus: this.currentStatus,
             activeModal: this.activeModal,
             cliName: this.cliName,
@@ -1598,7 +1611,7 @@ export class ProviderCliAdapter implements CliAdapter {
             accumulatedBuffer: this.accumulatedBuffer,
             accumulatedRawBuffer: this.accumulatedRawBuffer,
             recentOutputBuffer: this.recentOutputBuffer,
-            terminalScreenText: this.terminalScreen.getText(),
+            terminalScreenText: this.getParseScreenText(this.terminalScreen.getText()),
             baseMessages: [],
             partialResponse: this.responseBuffer,
             isWaitingForResponse: this.isWaitingForResponse,

package/src/commands/mesh-coordinator.ts

@@ -149,6 +149,11 @@ function resolveAdhdevMcpEntryPath(explicitPath?: string): string | null {
     addCandidate(resolve(dir, '../vendor/mcp-server/index.js'))
     addCandidate(resolve(dir, '../../vendor/mcp-server/index.js'))
     addCandidate(resolve(dir, '../../../vendor/mcp-server/index.js'))
+    // Source checkout/dev mode does not vendor the MCP server into daemon-standalone.
+    // Resolve the sibling workspace build directly so Repo Mesh auto-import still
+    // writes an absolute Node entrypoint instead of falling back to a PATH bin shim.
+    addCandidate(resolve(dir, '../../mcp-server/dist/index.js'))
+    addCandidate(resolve(dir, '../../../mcp-server/dist/index.js'))
   }
 
   addPackagedCandidates(process.argv[1])

package/src/commands/router.ts

@@ -38,6 +38,25 @@ import { buildSessionEntries } from '../status/builders.js';
 import { buildMachineInfo, buildStatusSnapshot } from '../status/snapshot.js';
 import { getSessionCompletionMarker } from '../status/snapshot.js';
 import { execNpmCommandSync, resolveCurrentGlobalInstallSurface, spawnDetachedDaemonUpgradeHelper } from './upgrade-helper.js';
+
+type ReleaseChannel = 'stable' | 'preview';
+const CHANNEL_NPM_TAG: Record<ReleaseChannel, 'latest' | 'next'> = { stable: 'latest', preview: 'next' };
+
+function normalizeReleaseChannel(value: unknown): ReleaseChannel | null {
+    if (typeof value !== 'string') return null;
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'stable' || normalized === 'latest') return 'stable';
+    if (normalized === 'preview' || normalized === 'next') return 'preview';
+    return null;
+}
+
+function resolveUpgradeChannel(args: any): ReleaseChannel {
+    return normalizeReleaseChannel(args?.channel)
+        || normalizeReleaseChannel(args?.updatePolicy?.channel)
+        || normalizeReleaseChannel(args?.npmTag)
+        || normalizeReleaseChannel(loadConfig().updateChannel)
+        || 'stable';
+}
 import * as fs from 'fs';
 
 // ─── Types ───
@@ -194,6 +213,10 @@ function summarizeSessionHostPruneResult(result: unknown): Record<string, unknow
 
 export class DaemonCommandRouter {
     private deps: CommandRouterDeps;
+    /** In-memory cache for cloud-originating meshes passed via inlineMesh.
+     *  Allows the MCP server to query mesh data via get_mesh even when
+     *  the mesh doesn't exist in the local meshes.json file. */
+    private inlineMeshCache = new Map<string, any>();
 
     constructor(deps: CommandRouterDeps) {
         this.deps = deps;
@@ -863,10 +886,12 @@ export class DaemonCommandRouter {
                         || process.argv[1]?.includes('daemon-standalone');
                     const pkgName = isStandalone ? '@adhdev/daemon-standalone' : 'adhdev';
                     const npmSurface = resolveCurrentGlobalInstallSurface({ packageName: pkgName });
+                    const channel = resolveUpgradeChannel(args);
+                    const npmTag = CHANNEL_NPM_TAG[channel];
 
-                    // Check latest version
-                    const latest = String(execNpmCommandSync(['view', pkgName, 'version'], { encoding: 'utf-8', timeout: 10000 }, npmSurface)).trim();
-                    LOG.info('Upgrade', `Latest ${pkgName}: v${latest}`);
+                    // Check channel-pinned dist-tag and resolve it to a concrete install version.
+                    const latest = String(execNpmCommandSync(['view', `${pkgName}@${npmTag}`, 'version'], { encoding: 'utf-8', timeout: 10000 }, npmSurface)).trim();
+                    LOG.info('Upgrade', `Latest ${pkgName}@${npmTag}: v${latest}`);
                     let currentInstalled: string | null = null;
                     try {
                         const currentJson = String(execNpmCommandSync(['ls', '-g', pkgName, '--depth=0', '--json'], {
@@ -884,8 +909,8 @@ export class DaemonCommandRouter {
                         ? this.deps.statusVersion.trim().replace(/^v/, '')
                         : null;
                     if (currentInstalled === latest && runningVersion === latest) {
-                        LOG.info('Upgrade', `Already on latest version v${latest}; skipping install`);
-                        return { success: true, upgraded: false, alreadyLatest: true, version: latest };
+                        LOG.info('Upgrade', `Already on ${channel} channel version v${latest}; skipping install`);
+                        return { success: true, upgraded: false, alreadyLatest: true, version: latest, channel, npmTag };
                     }
                     if (currentInstalled === latest && runningVersion && runningVersion !== latest) {
                         LOG.info('Upgrade', `Installed package is v${latest}, but running daemon is v${runningVersion}; scheduling restart`);
@@ -899,7 +924,7 @@ export class DaemonCommandRouter {
                         cwd: process.cwd(),
                         sessionHostAppName: process.env.ADHDEV_SESSION_HOST_NAME || 'adhdev',
                     });
-                    LOG.info('Upgrade', `Scheduled detached upgrade to v${latest}`);
+                    LOG.info('Upgrade', `Scheduled detached ${channel} upgrade to v${latest}`);
 
                     // Exit after the command response has been sent so the helper can replace the package cleanly.
                     setTimeout(() => {
@@ -907,7 +932,7 @@ export class DaemonCommandRouter {
                         process.exit(0);
                     }, 3000);
 
-                    return { success: true, upgraded: true, version: latest, restarting: true };
+                    return { success: true, upgraded: true, version: latest, restarting: true, channel, npmTag };
                 } catch (e: any) {
                     LOG.error('Upgrade', `Failed: ${e.message}`);
                     return { success: false, error: e.message };
@@ -937,11 +962,12 @@ export class DaemonCommandRouter {
                 try {
                     const { getMesh } = await import('../config/mesh-config.js');
                     const mesh = getMesh(meshId);
-                    if (!mesh) return { success: false, error: 'Mesh not found' };
-                    return { success: true, mesh };
-                } catch (e: any) {
-                    return { success: false, error: e.message };
-                }
+                    if (mesh) return { success: true, mesh };
+                } catch { /* fall through to inline cache */ }
+                // Fallback: check in-memory cache for cloud-originating meshes
+                const cached = this.inlineMeshCache.get(meshId);
+                if (cached) return { success: true, mesh: cached };
+                return { success: false, error: 'Mesh not found' };
             }
 
             case 'create_mesh': {
@@ -1012,6 +1038,8 @@ export class DaemonCommandRouter {
                     let mesh: any;
                     if (args?.inlineMesh && typeof args.inlineMesh === 'object') {
                         mesh = args.inlineMesh;
+                        // Cache cloud mesh so the MCP server can retrieve it via get_mesh
+                        this.inlineMeshCache.set(meshId, mesh);
                     } else {
                         const { getMesh } = await import('../config/mesh-config.js');
                         mesh = getMesh(meshId);
@@ -1094,14 +1122,22 @@ export class DaemonCommandRouter {
                     }
 
                     // Merge ADHDev mesh server into existing config.
+                    // Pass full mesh data as env var so the MCP server can bootstrap
+                    // without depending on meshes.json or a running daemon.
+                    const mcpServerEntry: Record<string, any> = {
+                        command: coordinatorSetup.mcpServer.command,
+                        args: coordinatorSetup.mcpServer.args,
+                    };
+                    if (args?.inlineMesh) {
+                        mcpServerEntry.env = {
+                            ADHDEV_INLINE_MESH: JSON.stringify(mesh),
+                        };
+                    }
                     const mcpConfig = {
                         ...existingMcpConfig,
                         mcpServers: {
                             ...(existingMcpConfig.mcpServers || {}),
-                            [coordinatorSetup.serverName]: {
-                                command: coordinatorSetup.mcpServer.command,
-                                args: coordinatorSetup.mcpServer.args,
-                            },
+                            [coordinatorSetup.serverName]: mcpServerEntry,
                         },
                     };
                     writeFileSync(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), 'utf-8');

package/src/config/config.ts

@@ -15,6 +15,7 @@ export type { SavedProviderSessionEntry } from './saved-sessions.js';
 export type { DaemonState } from './state-store.js';
 
 export type ProviderSourceMode = 'normal' | 'no-upstream';
+export type ReleaseChannel = 'stable' | 'preview';
 
 export function resolveProviderSourceMode(
     providerSourceMode: unknown,
@@ -122,6 +123,9 @@ export interface ADHDevConfig {
  // Optional explicit provider override root (for example a local adhdev-providers checkout)
     providerDir?: string;
 
+    /** Preferred daemon update channel. Defaults to stable/latest. */
+    updateChannel?: ReleaseChannel;
+
     /**
      * Browser terminal sizing behavior for dashboard CLI panes.
      * Default `measured` keeps terminal size daemon-authoritative.
@@ -151,6 +155,7 @@ const DEFAULT_CONFIG: ADHDevConfig = {
     machineProviders: {},
     ideSettings: {},
     providerSourceMode: 'normal',
+    updateChannel: 'stable',
     terminalSizingMode: 'measured',
 };
 
@@ -228,6 +233,7 @@ function normalizeConfig(raw: unknown): ADHDevConfig & { activeWorkspaceId?: str
         ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
         providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
         providerDir: asOptionalString(parsed.providerDir),
+        updateChannel: parsed.updateChannel === 'preview' ? 'preview' : 'stable',
         terminalSizingMode: parsed.terminalSizingMode === 'fit' ? 'fit' : 'measured',
     };
 }