@adhdev/daemon-standalone 0.9.82-rc.202 → 0.9.82-rc.204

package/dist/index.js

@@ -61348,7 +61348,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     }
     function evaluate(spec, screenText, cursor) {
       const trace = [];
-      const lines = screenText.split("\n");
+      const lines = screenText.split("\n").map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
+      const cleanScreen = lines.join("\n");
       const sections = resolveSections(spec, lines);
       for (const s of sections) {
         trace.push({ kind: "section", text: `section[${s.id}] lines [${s.fromLine}, ${s.toLine}) (${s.toLine - s.fromLine} lines)` });
@@ -61359,9 +61360,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       let activeState = null;
       let modal = null;
       for (const st of spec.states) {
-        const { matched, title } = matchState(st, sections, screenText, trace, cursor);
+        const { matched, title } = matchState(st, sections, cleanScreen, trace, cursor);
         if (!matched) continue;
-        const extractedModal = extractModal(st, sections, screenText, title, trace);
+        const extractedModal = extractModal(st, sections, cleanScreen, title, trace);
         if (st.modal_buttons && !extractedModal) {
           trace.push({ kind: "state_skip", text: `state[${st.id}] matched but modal_buttons extraction failed \u2014 not promoting` });
           continue;
@@ -63519,21 +63520,11 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         let sections;
         try {
           screen = this.driver.snapshot();
-          const lines = screen.split("\n");
-          sections = {};
-          for (const sec of this.spec.layout?.sections ?? []) {
-            const from = sec.from_top;
-            const fromBottom = sec.from_bottom;
-            let start = 0;
-            let end = lines.length;
-            if (typeof from === "number") start = Math.max(0, from);
-            else if (typeof fromBottom === "number") start = Math.max(0, lines.length - fromBottom);
-            const until = sec.until;
-            if (until && typeof until === "object" && typeof until.section === "string") {
-              const ref = (this.spec.layout?.sections ?? []).find((s) => s.id === until.section);
-              if (ref && typeof ref.from_bottom === "number") end = Math.max(start, lines.length - ref.from_bottom);
-            }
-            sections[sec.id] = lines.slice(start, end).join("\n");
+          const driverSections = this.driver.getSections?.();
+          if (driverSections) {
+            sections = Object.fromEntries(driverSections.map((s) => [s.id, s.text]));
+          } else {
+            sections = this.readCurrentScreenSections(screen);
           }
         } catch {
         }
@@ -87514,6 +87505,7 @@ var StandaloneServer = class {
         onStatusChange: () => {
           this.scheduleBroadcastStatus();
           void this.flushWsChatSubscriptions(void 0, { onlyActive: true });
+          void this.flushWsSessionModalSubscriptions();
         },
         removeAgentTracking: () => {
         },
@@ -87543,6 +87535,7 @@ var StandaloneServer = class {
       onStatusChange: () => {
         this.scheduleBroadcastStatus();
         void this.flushWsChatSubscriptions(void 0, { onlyActive: true });
+        void this.flushWsSessionModalSubscriptions();
       },
       sessionHostControl,
       onStreamsUpdated: (ideType, streams) => {