adhdev 0.9.74 → 0.9.75

package/dist/index.js

@@ -1541,6 +1541,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"
   };
 }
@@ -1690,6 +1691,7 @@ var init_config = __esm({
       machineProviders: {},
       ideSettings: {},
       providerSourceMode: "normal",
+      updateChannel: "stable",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -13670,6 +13672,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;
@@ -14660,12 +14669,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,
@@ -14759,8 +14769,9 @@ var init_provider_cli_adapter = __esm({
        */
       getScriptParsedStatus() {
         const screenText = this.readTerminalScreenText();
+        const parseScreenText = this.getParseScreenText(screenText);
         const cached2 = this.parsedStatusCache;
-        if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === screenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+        if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.screenText === parseScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
           return cached2.result;
         }
         const parsed = this.runParseSession();
@@ -14788,7 +14799,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,
@@ -14805,7 +14816,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,
@@ -39101,6 +39112,8 @@ function resolveAdhdevMcpEntryPath(explicitPath) {
     addCandidate((0, import_node_path2.resolve)(dir, "../vendor/mcp-server/index.js"));
     addCandidate((0, import_node_path2.resolve)(dir, "../../vendor/mcp-server/index.js"));
     addCandidate((0, import_node_path2.resolve)(dir, "../../../vendor/mcp-server/index.js"));
+    addCandidate((0, import_node_path2.resolve)(dir, "../../mcp-server/dist/index.js"));
+    addCandidate((0, import_node_path2.resolve)(dir, "../../../mcp-server/dist/index.js"));
   };
   addPackagedCandidates(process.argv[1]);
   for (const candidate of candidates) {
@@ -39807,6 +39820,16 @@ var init_upgrade_helper = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/commands/router.ts
+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";
+}
 function normalizeCommandSource(source) {
   switch (source) {
     case "ws":
@@ -39888,7 +39911,7 @@ function summarizeSessionHostPruneResult(result) {
     keptCount: Array.isArray(value.keptSessionIds) ? value.keptSessionIds.length : void 0
   };
 }
-var fs10, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
+var fs10, CHANNEL_NPM_TAG, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
 var init_router = __esm({
   "../../oss/packages/daemon-core/src/commands/router.ts"() {
     "use strict";
@@ -39915,6 +39938,7 @@ var init_router = __esm({
     init_snapshot();
     init_upgrade_helper();
     fs10 = __toESM(require("fs"));
+    CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
     CHAT_COMMANDS = [
       "send_chat",
       "new_chat",
@@ -40516,8 +40540,10 @@ var init_router = __esm({
               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"], {
@@ -40531,8 +40557,8 @@ var init_router = __esm({
               }
               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`);
@@ -40545,12 +40571,12 @@ var init_router = __esm({
                 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 };
@@ -40714,14 +40740,20 @@ var init_router = __esm({
                 } 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
                 }
               };
               writeFileSync14(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
@@ -59116,7 +59148,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.74" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.75" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;