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

package/dist/index.mjs

@@ -2926,9 +2926,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 cached = this.parsedStatusCache;
-        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         return null;
@@ -4020,7 +4024,8 @@ ${lastSnapshot}`;
         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.accumulatedRawBuffer === this.accumulatedRawBuffer && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         const parsed = this.runParseSession();
@@ -4048,7 +4053,7 @@ ${lastSnapshot}`;
           currentTurnScope: this.currentTurnScope,
           recentOutputBuffer: this.recentOutputBuffer,
           accumulatedBuffer: this.accumulatedBuffer,
-          accumulatedRawBuffer: this.accumulatedRawBuffer,
+          accumulatedRawBufferKey,
           screenText: parseScreenText,
           currentStatus: this.currentStatus,
           activeModal: this.activeModal,
@@ -22786,6 +22791,34 @@ function loadHermesCoordinatorBaseConfig(targetConfigPath) {
   const { mcp_servers: _mcpServers, ...baseConfig } = parsed;
   return { config: baseConfig, sourceHome, sourceConfigPath };
 }
+function stripHermesCoordinatorTempModelProviderOverrides(config) {
+  const {
+    model: _model,
+    provider: _provider,
+    default_model: _defaultModel,
+    defaultProvider: _defaultProvider,
+    default_provider: _defaultProviderSnake,
+    modelProvider: _modelProvider,
+    model_provider: _modelProviderSnake,
+    ...sanitized
+  } = config;
+  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 (pathResolve(sourceHome) === pathResolve(targetHome)) return;
   for (const fileName of [".env", "auth.json"]) {
@@ -24309,7 +24342,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 (error) {
               LOG.error("MeshCoordinator", `Failed to parse existing MCP config ${mcpConfigPath}: ${error?.message || error}`);