openclacky 1.5.21 → 1.5.22

data/lib/clacky/web/features/channels/view.js

@@ -130,12 +130,14 @@ const ChannelsView = (() => {
     row.className = "channel-row";
     row.id = `channel-card-${platform}`;
 
+    // Rows survive a language switch, so the tooltip also carries the lookup
+    // key that I18n.applyAll() rewrites in place.
     const action = hasConfig
       ? `${_toggleHtml(platform, !!data.enabled)}
          <button type="button" class="channel-row-btn" data-channel-more="${_esc(platform)}"
            title="${_esc(I18n.t("channels.btn.more"))}" aria-haspopup="menu" aria-expanded="false">${MORE_SVG}</button>`
       : `<button type="button" class="channel-row-btn" data-channel-setup="${_esc(platform)}"
-           title="${_esc(I18n.t("channels.btn.setup"))}">${PLUS_SVG}</button>`;
+           data-tooltip="${_esc(I18n.t("channels.btn.setup"))}" data-i18n-tooltip="channels.btn.setup">${PLUS_SVG}</button>`;
 
     row.innerHTML = `
       <span class="channel-logo ${_esc(meta.logoClass)}">${meta.logo}</span>
@@ -177,7 +179,8 @@ const ChannelsView = (() => {
         <div class="channel-row-desc" title="${_esc(desc)}">${_esc(desc)}</div>
       </div>
       <div class="channel-row-action">
-        <button type="button" class="channel-row-btn" id="btn-custom-dev-guide" title="${_esc(I18n.t("channels.customDev.btn"))}">${PLUS_SVG}</button>
+        <button type="button" class="channel-row-btn" id="btn-custom-dev-guide"
+          data-tooltip="${_esc(I18n.t("channels.customDev.btn"))}" data-i18n-tooltip="channels.customDev.btn">${PLUS_SVG}</button>
       </div>
     `;
     row.querySelector("#btn-custom-dev-guide").addEventListener("click", () => {

data/lib/clacky/web/features/extensions/view.js

@@ -192,12 +192,12 @@ const ExtensionsView = (() => {
       // keeps the same "+" (enable) affordance as anything waiting to be
       // installed rather than the "…" menu.
       if (ext.layer === "builtin" && ext.disabled === true) {
-        return `${failedHtml}<button type="button" class="ext-row-add" data-ext-row-enable="${escapeHtml(id)}" title="${escapeHtml(I18n.t("extensions.action.enable"))}">${_plusSvg()}</button>`;
+        return `${failedHtml}<button type="button" class="ext-row-add" data-ext-row-enable="${escapeHtml(id)}" data-tooltip="${escapeHtml(I18n.t("extensions.action.enable"))}">${_plusSvg()}</button>`;
       }
       return `${failedHtml}${_rowMore(id)}`;
     }
 
-    return `${failedHtml}<button type="button" class="ext-row-add" data-ext-row-install="${escapeHtml(id)}" title="${escapeHtml(I18n.t("extensions.action.install"))}">${_plusSvg()}</button>`;
+    return `${failedHtml}<button type="button" class="ext-row-add" data-ext-row-install="${escapeHtml(id)}" data-tooltip="${escapeHtml(I18n.t("extensions.action.install"))}">${_plusSvg()}</button>`;
   }
 
   function _rowMore(id) {

data/lib/clacky/web/features/new-session/store.js

@@ -13,8 +13,8 @@
 // ───────────────────────────────────────────────────────────────────────────
 
 const NewSessionStore = (() => {
-  const LS_AGENT_KEY   = "openclacky.newSession.lastAgent";
-  const LS_PROJECT_KEY = "openclacky.newSession.lastProject";
+  const LS_AGENT_KEY   = "clacky-new-session-last-agent";
+  const LS_PROJECT_KEY = "clacky-new-session-last-project";
 
   const _state = {
     agents: [],
@@ -30,6 +30,9 @@ const NewSessionStore = (() => {
     },
     advancedOpen: false,
     creating: false,
+    // Branch state of the selected project's working dir. `loaded` separates
+    // "never fetched" from "fetched, not a repo" so the chip can hide quietly.
+    git: { key: null, projectId: null, dir: "", loaded: false, loading: false, repo: false, branch: "", branches: [] },
   };
 
   const _listeners = {};
@@ -138,6 +141,77 @@ const NewSessionStore = (() => {
     }
   }
 
+  // ── Git state of the selected project's working dir ──────────────────────
+  // Only the branch chip cares, so failures collapse to `repo: false` rather
+  // than surfacing an error the user cannot act on. Keyed by project + dir
+  // because a session's working dir may point at a different repo entirely.
+  function gitKey(projectId, dir) {
+    return `${projectId || ""}\u0000${dir || ""}`;
+  }
+
+  async function loadGitInfo(projectId, { dir = "", force = false } = {}) {
+    const key = gitKey(projectId, dir);
+    if (!projectId) {
+      if (_state.git.key || !_state.git.loaded) {
+        _state.git = { key: null, projectId: null, dir: "", loaded: true, loading: false, repo: false, branch: "", branches: [] };
+        _emit("newSession:git-changed", { git: _state.git });
+      }
+      return _state.git;
+    }
+    if (!force && _state.git.loaded && _state.git.key === key) return _state.git;
+    if (!force && _state.git.loading && _state.git.key === key) return _state.git;
+
+    _state.git = {
+      key,
+      projectId: String(projectId),
+      dir:       dir || "",
+      loaded:    false,
+      loading:   true,
+      repo:      false,
+      branch:    "",
+      branches:  [],
+    };
+    _emit("newSession:git-changed", { git: _state.git });
+
+    let data = null;
+    try {
+      data = await Projects.gitInfo(projectId, dir);
+    } catch (e) {
+      data = { repo: false };
+    }
+    // A slow response for a project the user already switched away from must
+    // not overwrite the newer one.
+    if (_state.git.key !== key) return _state.git;
+
+    _state.git = {
+      key,
+      projectId: String(projectId),
+      dir:       dir || "",
+      loaded:    true,
+      loading:   false,
+      repo:      !!(data && data.repo),
+      branch:    (data && data.branch) || "",
+      branches:  (data && data.branches) || [],
+    };
+    _emit("newSession:git-changed", { git: _state.git });
+    return _state.git;
+  }
+
+  /** Merge a checkout response into the cached git state. */
+  function applyGitState(data) {
+    if (!data) return _state.git;
+    _state.git = {
+      ..._state.git,
+      loaded:   true,
+      loading:  false,
+      repo:     true,
+      branch:   data.branch || _state.git.branch,
+      branches: data.branches || _state.git.branches,
+    };
+    _emit("newSession:git-changed", { git: _state.git });
+    return _state.git;
+  }
+
   function _autoName(existingSessions) {
     const maxN = (existingSessions || []).reduce((max, s) => {
       const m = s.name && s.name.match(/^Session (\d+)$/);
@@ -231,6 +305,9 @@ const NewSessionStore = (() => {
     updateAdvanced,
     loadModels,
     loadDefaultDirectory,
+    loadGitInfo,
+    gitKey,
+    applyGitState,
     createSession,
     fetchSkillsForAgent,
     loadAgentName,