@adhdev/daemon-standalone 0.9.77-rc.40 → 0.9.77-rc.41

package/dist/index.js

@@ -25051,9 +25051,13 @@ ${lastSnapshot}`;
             this.lastScreenChangeAt = 0;
             this.lastScreenSnapshotReadAt = Number.NEGATIVE_INFINITY;
           }
+          getAccumulatedRawBufferCacheKey() {
+            return this.accumulatedRawBuffer.replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+          }
           getFreshParsedStatusCache() {
             const cached2 = this.parsedStatusCache;
-            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+            const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === this.lastScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
               return cached2.result;
             }
             return null;
@@ -26145,7 +26149,8 @@ ${lastSnapshot}`;
             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.accumulatedRawBuffer === this.accumulatedRawBuffer && cached2.screenText === parseScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
+            const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+            if (cached2 && cached2.responseBuffer === this.responseBuffer && cached2.currentTurnScope === this.currentTurnScope && cached2.recentOutputBuffer === this.recentOutputBuffer && cached2.accumulatedBuffer === this.accumulatedBuffer && cached2.accumulatedRawBufferKey === accumulatedRawBufferKey && cached2.screenText === parseScreenText && cached2.currentStatus === this.currentStatus && cached2.activeModal === this.activeModal && cached2.cliName === this.cliName) {
               return cached2.result;
             }
             const parsed = this.runParseSession();
@@ -26173,7 +26178,7 @@ ${lastSnapshot}`;
               currentTurnScope: this.currentTurnScope,
               recentOutputBuffer: this.recentOutputBuffer,
               accumulatedBuffer: this.accumulatedBuffer,
-              accumulatedRawBuffer: this.accumulatedRawBuffer,
+              accumulatedRawBufferKey,
               screenText: parseScreenText,
               currentStatus: this.currentStatus,
               activeModal: this.activeModal,
@@ -44955,6 +44960,34 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
       const { mcp_servers: _mcpServers, ...baseConfig } = parsed;
       return { config: baseConfig, sourceHome, sourceConfigPath };
     }
+    function stripHermesCoordinatorTempModelProviderOverrides(config2) {
+      const {
+        model: _model,
+        provider: _provider,
+        default_model: _defaultModel,
+        defaultProvider: _defaultProvider,
+        default_provider: _defaultProviderSnake,
+        modelProvider: _modelProvider,
+        model_provider: _modelProviderSnake,
+        ...sanitized
+      } = config2;
+      const delegation = sanitized.delegation;
+      if (delegation && typeof delegation === "object" && !Array.isArray(delegation)) {
+        const {
+          model: _delegationModel,
+          provider: _delegationProvider,
+          modelProvider: _delegationModelProvider,
+          model_provider: _delegationModelProviderSnake,
+          ...delegationRest
+        } = delegation;
+        if (Object.keys(delegationRest).length > 0) {
+          sanitized.delegation = delegationRest;
+        } else {
+          delete sanitized.delegation;
+        }
+      }
+      return sanitized;
+    }
     function copyHermesCoordinatorCredentialFiles(sourceHome, targetHome) {
       if ((0, import_path6.resolve)(sourceHome) === (0, import_path6.resolve)(targetHome)) return;
       for (const fileName of [".env", "auth.json"]) {
@@ -46478,7 +46511,8 @@ ${block}`);
               if (hadExistingMcpConfig) {
                 try {
                   const parsedExistingMcpConfig = parseMeshCoordinatorMcpConfig(readFileSync17(mcpConfigPath, "utf-8"), configFormat);
-                  existingMcpConfig = { ...existingMcpConfig, ...parsedExistingMcpConfig };
+                  const existingCoordinatorConfig = hermesManualFallback ? stripHermesCoordinatorTempModelProviderOverrides(parsedExistingMcpConfig) : parsedExistingMcpConfig;
+                  existingMcpConfig = { ...existingMcpConfig, ...existingCoordinatorConfig };
                   copyFileSync4(mcpConfigPath, mcpConfigPath + ".backup");
                 } catch (error48) {
                   LOG2.error("MeshCoordinator", `Failed to parse existing MCP config ${mcpConfigPath}: ${error48?.message || error48}`);