adhdev 0.9.73 → 0.9.75

package/dist/cli/index.js

@@ -2061,6 +2061,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"
   };
 }
@@ -2210,6 +2211,7 @@ var init_config = __esm({
       machineProviders: {},
       ideSettings: {},
       providerSourceMode: "normal",
+      updateChannel: "stable",
       terminalSizingMode: "measured"
     };
     MACHINE_ID_PREFIX = "mach_";
@@ -14627,6 +14629,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;
@@ -15617,12 +15626,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,
@@ -15716,8 +15726,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();
@@ -15745,7 +15756,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,
@@ -15762,7 +15773,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,
@@ -40058,6 +40069,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) {
@@ -40764,6 +40777,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":
@@ -40845,7 +40868,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";
@@ -40872,6 +40895,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",
@@ -40882,6 +40906,10 @@ var init_router = __esm({
     READ_DEBUG_ENABLED2 = process.argv.includes("--dev") || process.env.ADHDEV_READ_DEBUG === "1";
     DaemonCommandRouter = class {
       deps;
+      /** 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. */
+      inlineMeshCache = /* @__PURE__ */ new Map();
       constructor(deps) {
         this.deps = deps;
       }
@@ -41469,8 +41497,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"], {
@@ -41484,8 +41514,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`);
@@ -41498,12 +41528,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 };
@@ -41530,11 +41560,12 @@ var init_router = __esm({
             try {
               const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
               const mesh = getMesh3(meshId);
-              if (!mesh) return { success: false, error: "Mesh not found" };
-              return { success: true, mesh };
-            } catch (e) {
-              return { success: false, error: e.message };
+              if (mesh) return { success: true, mesh };
+            } catch {
             }
+            const cached2 = this.inlineMeshCache.get(meshId);
+            if (cached2) return { success: true, mesh: cached2 };
+            return { success: false, error: "Mesh not found" };
           }
           case "create_mesh": {
             const name = typeof args?.name === "string" ? args.name.trim() : "";
@@ -41597,6 +41628,7 @@ var init_router = __esm({
               let mesh;
               if (args?.inlineMesh && typeof args.inlineMesh === "object") {
                 mesh = args.inlineMesh;
+                this.inlineMeshCache.set(meshId, mesh);
               } else {
                 const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
                 mesh = getMesh3(meshId);
@@ -41665,14 +41697,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
                 }
               };
               writeFileSync15(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
@@ -90252,7 +90290,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.73" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.75" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -93890,6 +93928,33 @@ var DEFAULT_TRACE_FOLLOW_INTERVAL_MS = 1500;
 var DEFAULT_DAEMON_PORT_TEXT = String(DEFAULT_DAEMON_PORT);
 var DEV_SERVER_PORT2 = 19280;
 var DEV_SERVER_BASE_URL = `http://127.0.0.1:${DEV_SERVER_PORT2}`;
+var CHANNEL_NPM_TAG2 = { stable: "latest", preview: "next" };
+var CHANNEL_SERVER_URL = {
+  stable: "https://api.adhf.dev",
+  preview: "https://api-preview.adhf.dev"
+};
+function normalizeReleaseChannel2(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;
+}
+async function resolveConfiguredUpdateChannel() {
+  try {
+    const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    return normalizeReleaseChannel2(loadConfig2().updateChannel) || "stable";
+  } catch {
+    return "stable";
+  }
+}
+function releaseChannelLabel(channel) {
+  return `${channel} (${CHANNEL_NPM_TAG2[channel]})`;
+}
+async function persistReleaseChannel(channel) {
+  const { updateConfig: updateConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+  updateConfig2({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL[channel] });
+}
 function hideCommand(command) {
   command._hidden = true;
   return command;
@@ -94204,7 +94269,21 @@ async function runDaemonUpgrade(options, pkgVersion3) {
   const realPath = fsMod.realpathSync(adhdevPath);
   const isLinked = realPath.includes(".openclaw") || realPath.includes("/src/");
   const currentVersion = pkgVersion3;
+  const requestedChannel = options.channel === void 0 ? null : normalizeReleaseChannel2(options.channel);
+  if (options.channel !== void 0 && !requestedChannel) {
+    console.log(source_default.red(`
+  \u2717 Invalid update channel: ${options.channel}. Use stable/latest or preview/next.
+`));
+    process.exit(1);
+    return;
+  }
+  const configuredChannel = requestedChannel || await resolveConfiguredUpdateChannel();
+  const npmTag = CHANNEL_NPM_TAG2[configuredChannel];
+  if (requestedChannel) {
+    await persistReleaseChannel(configuredChannel);
+  }
   console.log(`  ${source_default.bold("Current:")}  v${currentVersion}`);
+  console.log(`  ${source_default.bold("Channel:")}  ${releaseChannelLabel(configuredChannel)}`);
   console.log(`  ${source_default.bold("Install:")}  ${isLinked ? "npm link (dev)" : "npm global"}`);
   if (isLinked) {
     const projectRoot = pathMod.resolve(pathMod.dirname(realPath), "..");
@@ -94233,7 +94312,7 @@ async function runDaemonUpgrade(options, pkgVersion3) {
     try {
       const { execNpmCommandSync: execNpmCommandSync2, resolveCurrentGlobalInstallSurface: resolveCurrentGlobalInstallSurface2 } = await Promise.resolve().then(() => (init_src(), src_exports));
       const npmSurface = resolveCurrentGlobalInstallSurface2({ packageName: "adhdev" });
-      latest = String(execNpmCommandSync2(["view", "adhdev", "version"], { encoding: "utf-8" }, npmSurface)).trim();
+      latest = String(execNpmCommandSync2(["view", `adhdev@${npmTag}`, "version"], { encoding: "utf-8" }, npmSurface)).trim();
     } catch (e) {
       console.log(source_default.red(`
   \u2717 Failed to check latest version: ${e?.message}
@@ -94860,10 +94939,36 @@ function registerDaemonCommands(program2, pkgVersion3) {
       process.exit(1);
     }
   }));
-  hideCommand(program2.command("daemon:upgrade").description("Upgrade ADHDev to latest version and restart daemon").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
+  hideCommand(program2.command("daemon:upgrade").description("Upgrade ADHDev to the selected channel and restart daemon").option("--channel <channel>", "Update channel: stable/latest or preview/next").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
     await runDaemonUpgrade(options, pkgVersion3);
   }));
-  program2.command("update").description("\u{1F504} Update ADHDev to latest version and restart daemon (alias for daemon:upgrade)").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
+  const channel = program2.command("channel").description("Manage ADHDev release/update channel");
+  channel.command("get").description("Show the configured ADHDev channel").action(async () => {
+    const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+    const config2 = loadConfig2();
+    const current = normalizeReleaseChannel2(config2.updateChannel) || "stable";
+    console.log(source_default.bold("\n  ADHDev Channel\n"));
+    console.log(`  ${source_default.bold("Channel:")}  ${releaseChannelLabel(current)}`);
+    console.log(`  ${source_default.bold("Server:")}   ${config2.serverUrl || CHANNEL_SERVER_URL[current]}`);
+    console.log();
+  });
+  channel.command("set <channel>").description("Set the ADHDev channel: stable/latest or preview/next").action(async (channelName) => {
+    const selected = normalizeReleaseChannel2(channelName);
+    if (!selected) {
+      console.error(source_default.red(`
+  \u2717 Unknown channel: ${channelName}. Use stable or preview.
+`));
+      process.exit(1);
+      return;
+    }
+    await persistReleaseChannel(selected);
+    console.log(source_default.green(`
+  \u2713 Channel set to ${releaseChannelLabel(selected)}`));
+    console.log(source_default.gray(`  Server: ${CHANNEL_SERVER_URL[selected]}`));
+    console.log(source_default.gray(`  Update: adhdev update --channel ${selected}
+`));
+  });
+  program2.command("update").description("\u{1F504} Update ADHDev to selected channel and restart daemon").option("--channel <channel>", "Update channel: stable/latest or preview/next").option("--no-restart", "Upgrade only, skip daemon restart").action(async (options) => {
     await runDaemonUpgrade(options, pkgVersion3);
   });
 }