patches: queue QML compatibility fix

2026-08-11 09:37:09 -04:00 · 2026-08-11 09:37:09 -04:00 · d290b12441
commit d290b12441
parent 23cebc531d
1 changed files with 121 additions and 0 deletions
--- a/surfaces/quickshell/patches/0004-shell-keep-typed-segments-QML-compatible.patch
+++ b/surfaces/quickshell/patches/0004-shell-keep-typed-segments-QML-compatible.patch
@ -0,0 +1,121 @@
+From 23cebc531dd40ac23c31472214fb93eb28ea2342 Mon Sep 17 00:00:00 2001
+From: Fimeg <casey.tunturi@gmail.com>
+Date: Tue, 11 Aug 2026 09:35:53 -0400
+Subject: [PATCH] shell: keep typed segments QML-compatible
+
+---
+ surfaces/quickshell/services/Ai.qml | 59 +++++++++++++++++++++--------
+ 1 file changed, 43 insertions(+), 16 deletions(-)
+
+diff --git a/surfaces/quickshell/services/Ai.qml b/surfaces/quickshell/services/Ai.qml
+index aaec22f..64f269a 100644
+--- a/surfaces/quickshell/services/Ai.qml
+++ b/surfaces/quickshell/services/Ai.qml
+@@ -262,12 +262,13 @@ Singleton {
+         const segments = root.streamingMessage.segments ?? [];
+         const last = segments.length > 0 ? segments[segments.length - 1] : null;
+         if (last && last.type === type) {
+-            root.streamingMessage.segments = [
+-                ...segments.slice(0, -1),
+-                { ...last, content: String(last.content ?? "") + text }
+-            ];
+            const replacement = {
+                type: last.type,
+                content: String(last.content ?? "") + text,
+            };
+            root.streamingMessage.segments = segments.slice(0, -1).concat([replacement]);
+         } else {
+-            root.streamingMessage.segments = [...segments, { type, content: text }];
+            root.streamingMessage.segments = segments.concat([{ type, content: text }]);
+         }
+         // `content` remains a plain compatibility projection for Copy, TTS,
+         // and old snapshot consumers. It no longer drives the renderer.
+@@ -281,7 +282,8 @@ Singleton {
+         const name = String(fn.name ?? "tool");
+         const arguments = String(fn.arguments ?? "");
+         const id = String(tool.id ?? "");
+-        root.streamingMessage.segments = [...root.streamingMessage.segments, {
+        const nextSegments = root.streamingMessage.segments.slice();
+        nextSegments.push({
+             type: "tool",
+             id,
+             name,
+@@ -290,7 +292,8 @@ Singleton {
+             status: "running",
+             output: "",
+             failed: false,
+-        }];
+        });
+        root.streamingMessage.segments = nextSegments;
+         root.appendToStreaming(`\n${name}(${arguments})\n`);
+     }
+ 
+@@ -317,11 +320,22 @@ Singleton {
+         const failed = /error|fail/i.test(status);
+         const output = String(result.output ?? "");
+         if (index >= 0) {
+-            root.streamingMessage.segments = segments.map((segment, i) => i === index
+-                ? { ...segment, status, output, failed }
+-                : segment);
+            const nextSegments = segments.slice();
+            const previous = segments[index];
+            nextSegments[index] = {
+                type: previous.type,
+                id: previous.id,
+                name: previous.name,
+                arguments: previous.arguments,
+                round: previous.round,
+                status,
+                output,
+                failed,
+            };
+            root.streamingMessage.segments = nextSegments;
+         } else {
+-            root.streamingMessage.segments = [...segments, {
+            const nextSegments = segments.slice();
+            nextSegments.push({
+                 type: "tool",
+                 id: resultId,
+                 name: String(result.name ?? "tool"),
+@@ -330,7 +344,8 @@ Singleton {
+                 status,
+                 output,
+                 failed,
+-            }];
+            });
+            root.streamingMessage.segments = nextSegments;
+         }
+         root.appendToStreaming(`\n[${status}] ${output}\n`);
+     }
+@@ -390,12 +405,24 @@ Singleton {
+ 
+     function finishStreaming() {
+         if (!root.streamingMessage) return;
+-        root.streamingMessage.segments = (root.streamingMessage.segments ?? []).map(segment => {
+        const resolvedSegments = [];
+        for (const segment of (root.streamingMessage.segments ?? [])) {
+             if (segment.type === "tool" && segment.status === "running") {
+-                return { ...segment, status: "unresolved", failed: true };
+                resolvedSegments.push({
+                    type: segment.type,
+                    id: segment.id,
+                    name: segment.name,
+                    arguments: segment.arguments,
+                    round: segment.round,
+                    status: "unresolved",
+                    output: segment.output,
+                    failed: true,
+                });
+            } else {
+                resolvedSegments.push(segment);
+             }
+-            return segment;
+-        });
+        }
+        root.streamingMessage.segments = resolvedSegments;
+         root.streamingMessage.thinking = false;
+         root.streamingMessage.done = true;
+         // If the turn finished while the session is locked, the finished
+-- 
+2.55.0
+