fix #2 suppor for resume.

Author: Oliver Marks

Panel.qml

@@ -9,11 +9,11 @@ import qs.Ui
 // editor is involved. Middle-click toggles the pop-out chat window.
 Panel {
   id: root
-  moduleName: "eca"
+  moduleName: "editor-code-assistant.eca-omarchy"
   ipcTarget: "eca-panel"
 
   readonly property var service: bar && bar.shell && typeof bar.shell.serviceFor === "function"
-    ? bar.shell.serviceFor("eca") : null
+    ? bar.shell.serviceFor("editor-code-assistant.eca-omarchy") : null
   readonly property var session: service ? service.session : null
 
   readonly property string iconGlyph: String.fromCodePoint(0xF0674) // nf-md-creation (sparkles)

README.md

@@ -129,7 +129,7 @@ the [ECA docs](https://eca.dev/config/introduction/).
 
 ```
 Panel.qml / ChatWindow.qml ── ChatView.qml (UI)
-        │ bar.shell.serviceFor("eca")
+        │ bar.shell.serviceFor("editor-code-assistant.eca-omarchy")
 Service.qml (singleton) ── Session.qml per workspace
         │ Quickshell Process, newline-delimited JSON
 eca_bridge.bb ── Content-Length framed JSON-RPC ── eca server

Service.qml

@@ -4,7 +4,7 @@ import Quickshell.Io
 
 // Headless ECA client service: owns one Session (one `eca server`) per
 // workspace folder, shared by every bar on every monitor. Bar widgets reach it
-// with bar.shell.serviceFor("eca").
+// with bar.shell.serviceFor("editor-code-assistant.eca-omarchy").
 Item {
   id: root
   property string omarchyPath: ""

eca_workspaces.bb

@@ -122,14 +122,40 @@
                    {:dir (str d) :prefix prefix :hash hash}))))
     []))
 
-(defn resolve-paths [dirs]
+(defn index-workspaces
+  "Workspace folders ECA recorded in the cache dir's chat index (written by
+  every client, so this also covers sessions started from emacs/neovim in
+  folders outside our search roots). Nil when unreadable."
+  [dir]
+  (try
+    (let [idx (json/parse-string (slurp (str (fs/path dir "chats" "index.transit.json"))))
+          ;; transit-JSON map: ["^ " k1 v1 k2 v2 ...]
+          ws (when (and (sequential? idx) (= "^ " (first idx)))
+               (->> (rest idx) (partition 2) (some (fn [[k v]] (when (= k "~:workspaces") v)))))]
+      (when (and (sequential? ws) (every? string? ws)) (vec ws)))
+    (catch Exception _ nil)))
+
+(defn resolve-by-hash [dirs]
   (let [wanted (set (map :prefix dirs))
         by-hash (->> (candidate-dirs)
                      (filter #(contains? wanted (sanitize-name (fs/file-name %))))
                      (map #(str (fs/absolutize %)))
                      (reduce (fn [m p] (assoc m (paths-hash [p]) p)) {}))]
     (keep #(when-let [path (get by-hash (:hash %))] (assoc % :path path)) dirs)))
 
+(defn resolve-paths
+  "Maps cache dirs to folders. The chat index is authoritative; hashing
+  candidate folders is the fallback. Multi-root workspaces are skipped since
+  a session is opened on a single folder."
+  [dirs]
+  (let [from-index (keep (fn [d]
+                           (let [ws (index-workspaces (:dir d))]
+                             (when (and (= 1 (count ws)) (fs/directory? (first ws)))
+                               (assoc d :path (first ws)))))
+                         dirs)
+        done (set (map :dir from-index))]
+    (concat from-index (resolve-by-hash (remove #(done (:dir %)) dirs)))))
+
 (defn history [eca dir]
   (if-not eca
     {:chatCount 0}

install.sh

@@ -48,12 +48,12 @@ import json, sys
 d = json.load(open('$shell_json'))
 # Check plugins list (services / overlays / panels)
 for p in d.get('plugins', []):
-    if p.get('id') == 'eca':
+    if p.get('id') in ('eca', 'editor-code-assistant.eca-omarchy'):
         sys.exit(0)
 # Check bar layout sections
 for section in d.get('bar', {}).get('layout', {}).values():
     for w in section:
-        if w.get('id') == 'eca':
+        if w.get('id') in ('eca', 'editor-code-assistant.eca-omarchy'):
             sys.exit(0)
 sys.exit(1)
 " 2>/dev/null

test/eca_workspaces_test.bb

@@ -93,3 +93,19 @@
     (doseq [ws (:workspaces (eca-workspaces/-main))]
       (is (int? (:chatCount ws)))
       (is (>= (:chatCount ws) 0)))))
+
+(deftest test-index-workspaces
+  (let [dir (str (babashka.fs/create-temp-dir))]
+    (babashka.fs/create-dirs (str dir "/chats"))
+    (testing "reads workspaces from the transit chat index"
+      (spit (str dir "/chats/index.transit.json")
+            "[\"^ \",\"~:version\",7,\"~:workspaces\",[\"/tmp\"],\"~:chats\",[\"^ \"]]")
+      (is (= ["/tmp"] (eca-workspaces/index-workspaces dir))))
+    (testing "resolve-paths uses the index even outside the search roots"
+      (is (= "/tmp" (:path (first (eca-workspaces/resolve-paths [{:dir dir :prefix "x" :hash "y"}]))))))
+    (testing "multi-root workspaces are skipped"
+      (spit (str dir "/chats/index.transit.json")
+            "[\"^ \",\"~:workspaces\",[\"/tmp\",\"/usr\"]]")
+      (is (empty? (eca-workspaces/resolve-paths [{:dir dir :prefix "x" :hash "y"}]))))
+    (testing "missing index returns nil"
+      (is (nil? (eca-workspaces/index-workspaces "/nonexistent"))))))