@adhdev/daemon-core 0.9.74 → 0.9.75

package/dist/index.mjs

@@ -128,6 +128,7 @@ function normalizeConfig(raw) {
     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"
   };
 }
@@ -273,6 +274,7 @@ var init_config = __esm({
       machineProviders: {},
       ideSettings: {},
       providerSourceMode: "normal",
+      updateChannel: "stable",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -1754,6 +1756,13 @@ var init_provider_cli_adapter = __esm({
         this.lastScreenSnapshotReadAt = now;
         return screenText;
       }
+      getParseScreenText(screenText) {
+        const currentSnapshot = normalizeScreenSnapshot(screenText);
+        const lastSnapshot = this.lastScreenSnapshot;
+        if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
+        return `${screenText}
+${lastSnapshot}`;
+      }
       shouldReadTerminalScreenSnapshot(now) {
         if (!this.lastScreenText) return true;
         return now - this.lastScreenSnapshotReadAt >= _ProviderCliAdapter.SCREEN_SNAPSHOT_MIN_INTERVAL_MS;
@@ -2744,12 +2753,13 @@ var init_provider_cli_adapter = __esm({
         }
         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,
@@ -2843,8 +2853,9 @@ var init_provider_cli_adapter = __esm({
        */
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
+        const parseScreenText = this.getParseScreenText(screenText);
         const cached = this.parsedStatusCache;
-        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === screenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         const parsed = this.runParseSession();
@@ -2872,7 +2883,7 @@ var init_provider_cli_adapter = __esm({
           currentTurnScope: this.currentTurnScope,
           recentOutputBuffer: this.recentOutputBuffer,
           accumulatedBuffer: this.accumulatedBuffer,
-          screenText,
+          screenText: parseScreenText,
           currentStatus: this.currentStatus,
           activeModal: this.activeModal,
           cliName: this.cliName,
@@ -2889,7 +2900,7 @@ var init_provider_cli_adapter = __esm({
           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,
@@ -19905,6 +19916,8 @@ function resolveAdhdevMcpEntryPath(explicitPath) {
     addCandidate(resolve13(dir, "../vendor/mcp-server/index.js"));
     addCandidate(resolve13(dir, "../../vendor/mcp-server/index.js"));
     addCandidate(resolve13(dir, "../../../vendor/mcp-server/index.js"));
+    addCandidate(resolve13(dir, "../../mcp-server/dist/index.js"));
+    addCandidate(resolve13(dir, "../../../mcp-server/dist/index.js"));
   };
   addPackagedCandidates(process.argv[1]);
   for (const candidate of candidates) {
@@ -20582,6 +20595,17 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
 
 // src/commands/router.ts
 import * as fs10 from "fs";
+var CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
+function normalizeReleaseChannel(value) {
+  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) {
+  return normalizeReleaseChannel(args?.channel) || normalizeReleaseChannel(args?.updatePolicy?.channel) || normalizeReleaseChannel(args?.npmTag) || normalizeReleaseChannel(loadConfig().updateChannel) || "stable";
+}
 var CHAT_COMMANDS = [
   "send_chat",
   "new_chat",
@@ -21264,8 +21288,10 @@ var DaemonCommandRouter = class {
           const isStandalone = this.deps.packageName === "@adhdev/daemon-standalone" || process.argv[1]?.includes("daemon-standalone");
           const pkgName = isStandalone ? "@adhdev/daemon-standalone" : "adhdev";
           const npmSurface = resolveCurrentGlobalInstallSurface({ packageName: pkgName });
-          const latest = String(execNpmCommandSync(["view", pkgName, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
-          LOG.info("Upgrade", `Latest ${pkgName}: v${latest}`);
+          const channel = resolveUpgradeChannel(args);
+          const npmTag = CHANNEL_NPM_TAG[channel];
+          const latest = String(execNpmCommandSync(["view", `${pkgName}@${npmTag}`, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
+          LOG.info("Upgrade", `Latest ${pkgName}@${npmTag}: v${latest}`);
           let currentInstalled = null;
           try {
             const currentJson = String(execNpmCommandSync(["ls", "-g", pkgName, "--depth=0", "--json"], {
@@ -21279,8 +21305,8 @@ var DaemonCommandRouter = class {
           }
           const runningVersion = typeof this.deps.statusVersion === "string" ? 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`);
@@ -21293,12 +21319,12 @@ var DaemonCommandRouter = class {
             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}`);
           setTimeout(() => {
             LOG.info("Upgrade", "Exiting daemon so detached upgrader can continue...");
             process.exit(0);
           }, 3e3);
-          return { success: true, upgraded: true, version: latest, restarting: true };
+          return { success: true, upgraded: true, version: latest, restarting: true, channel, npmTag };
         } catch (e) {
           LOG.error("Upgrade", `Failed: ${e.message}`);
           return { success: false, error: e.message };
@@ -21462,14 +21488,20 @@ var DaemonCommandRouter = class {
             } catch {
             }
           }
+          const mcpServerEntry = {
+            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
             }
           };
           writeFileSync12(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");