Merge branch 'master' into discover-github-copilot-model-capabilities

Author: zikajk

.github/workflows/release.yml

@@ -202,6 +202,18 @@ jobs:
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
     steps:
+      - name: Ensure signing secrets are set
+        if: github.repository == 'editor-code-assistant/eca'
+        run: |
+          if [ -z "$CSC_LINK" ]; then
+            echo "::error::CSC_LINK secret is empty, binary would be released unsigned"
+            exit 1
+          fi
+          if [ -z "$APPLE_ID" ]; then
+            echo "::error::APPLE_ID secret is empty, binary would be released without notarization"
+            exit 1
+          fi
+
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
@@ -294,6 +306,18 @@ jobs:
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
     steps:
+      - name: Ensure signing secrets are set
+        if: github.repository == 'editor-code-assistant/eca'
+        run: |
+          if [ -z "$CSC_LINK" ]; then
+            echo "::error::CSC_LINK secret is empty, binary would be released unsigned"
+            exit 1
+          fi
+          if [ -z "$APPLE_ID" ]; then
+            echo "::error::APPLE_ID secret is empty, binary would be released without notarization"
+            exit 1
+          fi
+
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:

CHANGELOG.md

@@ -3,6 +3,13 @@
 ## Unreleased
 
 - Discover GitHub Copilot model APIs and reasoning variants from its authenticated `/models` endpoint.
+
+## 0.145.1
+
+- Notify in chat when instructions change mid-chat (prompt, contexts, rules, skills, tools), invalidating the prompt cache.
+
+## 0.145.0
+
 - Add built-in variants for `gpt-5.6` models (`gpt-5.6-luna`, `gpt-5.6-terra`, `gpt-5.6-sol`): `none`, `low`, `medium`, `high`, `xhigh`, `max`.
 - Support provider-level `extraHeaders`, sent on completion and models list requests. #517
 - Improve `/init` prompt, `AGENTS.md`, and development docs.

resources/ECA_VERSION

@@ -1 +1 @@
-0.144.0
+0.145.1

src/eca/features/chat.clj

@@ -67,27 +67,41 @@
        (when (not-empty agent) (str "/" agent))))
 
 (defn ^:private static-prompt-cache-signature
-  "SHA-256 cache identity for static prompt reuse."
+  "Per-component SHA-256 cache identity for static prompt reuse.
+   Returns a map of category -> hash so mid-chat instruction changes
+   can be attributed to what changed (prompt, contexts, rules, skills, tools)."
   [refined-contexts static-rules path-scoped-rules skills agent config chat-id all-tools db]
-  (let [static-contexts (vec (filter f.prompt/static-prompt-context? refined-contexts))]
-    (digest/sha-256-hex
-     (pr-str
-      {:agent agent
-       :chat-prompt-template (f.prompt/eca-chat-prompt agent config chat-id db)
-       :workspace-roots (mapv (comp shared/uri->filename :uri) (:workspace-folders db))
-       :environment {:os-name (str (System/getProperty "os.name") " " (System/getProperty "os.version"))
-                     :shell (or (System/getenv "SHELL") (System/getenv "ComSpec"))
-                     :user-name (System/getProperty "user.name")
-                     :home-dir (cache/user-home)}
-       :is-subagent (boolean (get-in db [:chats chat-id :subagent]))
-       :startup-context (get-in db [:chats chat-id :startup-context])
-       :static-contexts static-contexts
-       :repo-map (when (some #(= :repoMap (:type %)) static-contexts)
-                   :present)
-       :static-rules (mapv #(select-keys % [:id :name :scope :content]) static-rules)
-       :path-scoped-rules (mapv #(select-keys % [:id :name :scope :workspace-root :paths :enforce]) path-scoped-rules)
-       :skills (mapv #(select-keys % [:name :description]) skills)
-       :tools (sort (map :full-name all-tools))}))))
+  (let [static-contexts (vec (filter f.prompt/static-prompt-context? refined-contexts))
+        sha (comp digest/sha-256-hex pr-str)]
+    {:prompt (sha {:agent agent
+                   :chat-prompt-template (f.prompt/eca-chat-prompt agent config chat-id db)
+                   :environment {:os-name (str (System/getProperty "os.name") " " (System/getProperty "os.version"))
+                                 :shell (or (System/getenv "SHELL") (System/getenv "ComSpec"))
+                                 :user-name (System/getProperty "user.name")
+                                 :home-dir (cache/user-home)}
+                   :is-subagent (boolean (get-in db [:chats chat-id :subagent]))
+                   :startup-context (get-in db [:chats chat-id :startup-context])})
+     :contexts (sha {:workspace-roots (mapv (comp shared/uri->filename :uri) (:workspace-folders db))
+                     :static-contexts static-contexts
+                     :repo-map (when (some #(= :repoMap (:type %)) static-contexts)
+                                 :present)})
+     :rules (sha {:static-rules (mapv #(select-keys % [:id :name :scope :content]) static-rules)
+                  :path-scoped-rules (mapv #(select-keys % [:id :name :scope :workspace-root :paths :enforce]) path-scoped-rules)})
+     :skills (sha (mapv #(select-keys % [:name :description]) skills))
+     :tools (sha (sort (map :full-name all-tools)))}))
+
+(defn ^:private changed-instruction-categories
+  "Names of instruction categories that changed vs the cached signature.
+   Empty when the old signature has an unknown (legacy) shape."
+  [prompt-cache static-signature agent full-model]
+  (let [old-sig (:static-signature prompt-cache)]
+    (cond-> []
+      (not= (:agent prompt-cache) agent) (conj "agent")
+      (not= (:model prompt-cache) full-model) (conj "model")
+      (map? old-sig) (into (keep (fn [[k v]]
+                                   (when (not= v (get old-sig k))
+                                     (name k)))
+                                 static-signature)))))
 
 (defn ^:private prune-tool-results!
   "Prunes old tool result content from chat history to reduce context size.
@@ -1491,6 +1505,15 @@
                            (let [result (f.prompt/build-chat-instructions
                                          refined-contexts static-rules path-scoped-rules skills repo-map*
                                          agent config chat-id all-tools db)]
+                             (when prompt-cache
+                               (let [categories (changed-instruction-categories prompt-cache static-signature agent full-model)]
+                                 (lifecycle/send-content!
+                                  base-chat-ctx :system
+                                  {:type :text
+                                   :text (str "Instructions changed"
+                                              (when (seq categories)
+                                                (str " (" (string/join ", " categories) ")"))
+                                              ", prompt cache invalidated.\n")})))
                              (swap! db* assoc-in [:chats chat-id :prompt-cache]
                                     {:static (:static result)
                                      :static-signature static-signature

test/eca/features/chat_test.clj

@@ -10,6 +10,7 @@
    [eca.features.context :as f.context]
    [eca.features.index :as f.index]
    [eca.features.prompt :as f.prompt]
+   [eca.features.skills :as f.skills]
    [eca.features.tools :as f.tools]
    [eca.features.tools.mcp :as f.mcp]
    [eca.llm-api :as llm-api]
@@ -1501,6 +1502,32 @@
         (finally
           (fs/delete-if-exists prompt-file))))))
 
+(deftest instructions-changed-notice-test
+  (testing "System notice is sent when instructions change mid-chat"
+    (h/reset-components!)
+    (let [skills* (atom [])
+          mocks {:all-tools-mock (constantly [])
+                 :api-mock (fn [{:keys [on-message-received]}]
+                             (on-message-received {:type :finish}))}
+          notices (fn []
+                    (->> (h/messages)
+                         :chat-content-received
+                         (filter #(= :system (:role %)))
+                         (keep #(get-in % [:content :text]))
+                         (filter #(string/includes? % "Instructions changed"))))]
+      (with-redefs [f.skills/all (fn [& _] @skills*)]
+        (let [{:keys [chat-id]} (prompt! {:message "Hi"} mocks)]
+          (is (empty? (notices)) "No notice on the first prompt")
+          (h/reset-messenger!)
+          (prompt! {:message "Again" :chat-id chat-id} mocks)
+          (is (empty? (notices)) "No notice when nothing changed")
+          (h/reset-messenger!)
+          (reset! skills* [{:name "my-skill" :description "Does things"}])
+          (prompt! {:message "Changed" :chat-id chat-id} mocks)
+          (is (= ["Instructions changed (skills), prompt cache invalidated.\n"]
+                 (notices))
+              "Notice names the changed category"))))))
+
 (deftest prompt-cache-key-includes-agent-test
   (testing "sync-or-async-prompt! receives prompt-cache-key scoped by active agent"
     (h/reset-components!)
@@ -1808,11 +1835,16 @@
                      :agent "plan"
                      :model "openai/gpt-4.1"})
       (is (= 3 @build-calls*) "Changing model should rebuild instructions")
-      (is (match? {:static "static-3"
-                   :static-signature (m/pred #(re-matches #"[0-9a-f]{64}" %))
-                   :agent "plan"
-                   :model "openai/gpt-4.1"}
-                  (get-in (h/db) [:chats chat-id :prompt-cache]))))))
+      (let [sha? (m/pred #(re-matches #"[0-9a-f]{64}" %))]
+        (is (match? {:static "static-3"
+                     :static-signature {:prompt sha?
+                                        :contexts sha?
+                                        :rules sha?
+                                        :skills sha?
+                                        :tools sha?}
+                     :agent "plan"
+                     :model "openai/gpt-4.1"}
+                    (get-in (h/db) [:chats chat-id :prompt-cache])))))))
 
 (deftest message-content->chat-content-image-test
   (testing "image_generation_call role replays as a single :image ChatContent under assistant"