@i14ks/ccv 0.17.0 → 0.17.2

package/bundle/ccv.mjs

@@ -158,7 +158,68 @@ function isClientFrame(value) {
   return typeof value === "object" && value !== null && typeof value.type === "string";
 }
 function workspaceIdFromPath(absolutePath) {
-  return absolutePath.replace(/[^a-zA-Z0-9]/g, "-").replace(/-+/g, "-").toLowerCase();
+  const slug = absolutePath.replace(/[^\p{L}\p{N}\p{M}]/gu, "-").replace(/-+/g, "-").toLowerCase().replace(/^-|-$/g, "");
+  return `${slug || "project"}-${pathHash(absolutePath)}`;
+}
+function formerWorkspaceIdsFromPath(absolutePath) {
+  const plain = absolutePath.replace(/[^a-zA-Z0-9]/g, "-").replace(/-+/g, "-").toLowerCase();
+  const hashed = `${plain.replace(/^-+|-+$/g, "") || "project"}-${pathHash(absolutePath)}`;
+  const current = workspaceIdFromPath(absolutePath);
+  return [plain, hashed].filter((id) => id !== current);
+}
+function pathHash(absolutePath) {
+  const windows = /^[a-zA-Z]:[\\/]|^\\\\/.test(absolutePath);
+  return hashText(windows ? absolutePath.toLowerCase() : absolutePath);
+}
+function hashText(text) {
+  let h1 = 3735928559;
+  let h2 = 1103547991;
+  for (let i = 0; i < text.length; i++) {
+    const code = text.charCodeAt(i);
+    h1 = Math.imul(h1 ^ code, 2654435761);
+    h2 = Math.imul(h2 ^ code, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
+  return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(36);
+}
+
+// ../host/dist/workspace-ids.js
+function workspaceIdRemap(paths, sessionsOf) {
+  const byLegacy = /* @__PURE__ */ new Map();
+  for (const path25 of paths) {
+    const id = workspaceIdFromPath(path25);
+    for (const legacy of formerWorkspaceIdsFromPath(path25)) {
+      const group = byLegacy.get(legacy) ?? [];
+      if (!group.some((target) => target.id === id))
+        group.push({ id, path: path25 });
+      byLegacy.set(legacy, group);
+    }
+  }
+  const owners = /* @__PURE__ */ new Map();
+  return {
+    targets: (id) => (byLegacy.get(id) ?? []).map((target) => target.id),
+    owner: async (id, sessionId) => {
+      const group = byLegacy.get(id);
+      if (!group)
+        return void 0;
+      if (group.length === 1)
+        return group[0].id;
+      let lookup = owners.get(id);
+      if (!lookup) {
+        lookup = (async () => {
+          const found = /* @__PURE__ */ new Map();
+          for (const target of group) {
+            for (const session of await sessionsOf(target.path))
+              found.set(session, target.id);
+          }
+          return found;
+        })();
+        owners.set(id, lookup);
+      }
+      return (await lookup).get(sessionId);
+    }
+  };
 }
 
 // ../host/dist/session.js
@@ -3831,6 +3892,27 @@ var AntigravityStore = class {
     await this.#load();
     return [...this.#records.values()].filter((r) => r.workspaceId === workspaceId);
   }
+  /**
+   * Перенести записи с id проекта прежнего формата на нынешний (см.
+   * [`workspace-ids.ts`](./workspace-ids.ts)). Какому из проектов, деливших
+   * прежний id, принадлежит сессия, здесь видно без поиска — по её `cwd`.
+   */
+  async remapWorkspaceIds(remap) {
+    await this.#load();
+    let changed = false;
+    for (const record of this.#records.values()) {
+      const targets = remap.targets(record.workspaceId);
+      const own = workspaceIdFromPath(record.cwd);
+      const next = targets.find((target) => target === own) ?? targets[0];
+      if (!next || next === record.workspaceId)
+        continue;
+      record.workspaceId = next;
+      changed = true;
+    }
+    if (changed)
+      await this.#persist();
+    return changed;
+  }
   async save(record) {
     await this.#load();
     this.#records.set(record.id, { ...record });
@@ -5060,6 +5142,10 @@ var WorkspaceRegistry = class {
   listArchived() {
     return this.#entries.filter((e) => e.archivedAt).map((e) => toInfo(e));
   }
+  /** Каталоги всех проектов реестра, открытых и закрытых. */
+  paths() {
+    return this.#entries.map((e) => e.path);
+  }
   find(id) {
     const entry = this.#entries.find((e) => workspaceIdFromPath(e.path) === id);
     return entry ? toInfo(entry) : void 0;
@@ -5251,6 +5337,25 @@ var SessionArchive = class {
       this.#restored = /* @__PURE__ */ new Map();
     }
   }
+  /**
+   * Перенести записи с id проекта прежнего формата на нынешний (см.
+   * [`workspace-ids.ts`](./workspace-ids.ts)). Запись о сессии, которой нет ни
+   * в одном из проектов, деливших прежний id, уходит первому из них — там её
+   * уберёт обычное подметание.
+   */
+  async remapWorkspaceIds(remap) {
+    let changed = false;
+    for (const [id, record] of this.#archived) {
+      const next = await remap.owner(record.workspaceId, id) ?? remap.targets(record.workspaceId)[0];
+      if (!next || next === record.workspaceId)
+        continue;
+      this.#archived.set(id, { ...record, workspaceId: next });
+      changed = true;
+    }
+    if (changed)
+      await this.#persist();
+    return changed;
+  }
   find(sessionId) {
     return this.#archived.get(sessionId);
   }
@@ -5369,6 +5474,24 @@ var SessionPins = class {
       this.#moved = /* @__PURE__ */ new Map();
     }
   }
+  /**
+   * Перенести записи с id проекта прежнего формата на нынешний — то же, что
+   * `SessionArchive.remapWorkspaceIds`, и с той же оговоркой про сессию,
+   * которой нет ни в одном из проектов.
+   */
+  async remapWorkspaceIds(remap) {
+    let changed = false;
+    for (const [id, record] of this.#pinned) {
+      const next = await remap.owner(record.workspaceId, id) ?? remap.targets(record.workspaceId)[0];
+      if (!next || next === record.workspaceId)
+        continue;
+      this.#pinned.set(id, { ...record, workspaceId: next });
+      changed = true;
+    }
+    if (changed)
+      await this.#persist();
+    return changed;
+  }
   find(sessionId) {
     return this.#pinned.get(sessionId);
   }
@@ -5544,6 +5667,48 @@ var ListOrderStore = class {
     } else {
       this.#order[scope] = clean ?? [];
     }
+    await this.#persist();
+  }
+  /**
+   * Перенести порядок с id проектов прежнего формата на нынешние (см.
+   * [`workspace-ids.ts`](./workspace-ids.ts)).
+   *
+   * Порядок сессий, записанный под id, который делили несколько проектов,
+   * раскладывается по владельцам сессий: общий список у каждого из них
+   * переставлял бы чужие строки, которых в его списке нет.
+   */
+  async remapWorkspaceIds(remap) {
+    let changed = false;
+    const workspaces = dedupe(this.#order.workspaces.flatMap((id) => {
+      const targets = remap.targets(id);
+      return targets.length > 0 ? targets : [id];
+    }));
+    if (workspaces.join("\n") !== this.#order.workspaces.join("\n")) {
+      this.#order.workspaces = workspaces;
+      changed = true;
+    }
+    for (const [workspaceId, ids] of Object.entries(this.#order.sessions)) {
+      const targets = remap.targets(workspaceId);
+      if (targets.length === 0)
+        continue;
+      const split = /* @__PURE__ */ new Map();
+      for (const id of ids) {
+        const owner = await remap.owner(workspaceId, id);
+        if (!owner)
+          continue;
+        split.set(owner, [...split.get(owner) ?? [], id]);
+      }
+      delete this.#order.sessions[workspaceId];
+      for (const [owner, own] of split) {
+        this.#order.sessions[owner] ??= own;
+      }
+      changed = true;
+    }
+    if (changed)
+      await this.#persist();
+    return changed;
+  }
+  async #persist() {
     await mkdir8(path15.dirname(this.#storePath), { recursive: true });
     await writeFile9(this.#storePath, JSON.stringify(this.#order, null, 2), "utf8");
   }
@@ -5608,6 +5773,60 @@ var Folders = class {
       this.#pinnedAssignments = /* @__PURE__ */ new Map();
     }
   }
+  /**
+   * Перенести папки с id проектов прежнего формата на нынешние (см.
+   * [`workspace-ids.ts`](./workspace-ids.ts)).
+   *
+   * Проект в папке проектов, чей id делили несколько проектов, — это все они:
+   * в списке они и стояли в ней вместе. Папка сессий так не делится, она
+   * принадлежит одному проекту — тому, чьих сессий в ней больше; сессии
+   * остальных из неё вынимаются, иначе они указывали бы на папку, которой в
+   * их списке нет.
+   */
+  async remapWorkspaceIds(remap) {
+    let changed = false;
+    for (const [workspaceId, folderId] of [...this.#workspaceAssignments]) {
+      const targets = remap.targets(workspaceId);
+      if (targets.length === 0)
+        continue;
+      this.#workspaceAssignments.delete(workspaceId);
+      for (const target of targets) {
+        if (!this.#workspaceAssignments.has(target))
+          this.#workspaceAssignments.set(target, folderId);
+      }
+      changed = true;
+    }
+    for (const [folderId, record] of [...this.#sessionFolders]) {
+      const targets = remap.targets(record.workspaceId);
+      if (targets.length === 0)
+        continue;
+      const owners = /* @__PURE__ */ new Map();
+      const votes = /* @__PURE__ */ new Map();
+      for (const [sessionId, assigned] of this.#sessionAssignments) {
+        if (assigned !== folderId)
+          continue;
+        const owner = await remap.owner(record.workspaceId, sessionId);
+        if (!owner)
+          continue;
+        owners.set(sessionId, owner);
+        votes.set(owner, (votes.get(owner) ?? 0) + 1);
+      }
+      let winner = targets[0];
+      for (const [owner, count2] of votes) {
+        if (count2 > (votes.get(winner) ?? 0))
+          winner = owner;
+      }
+      for (const [sessionId, owner] of owners) {
+        if (owner !== winner)
+          this.#sessionAssignments.delete(sessionId);
+      }
+      this.#sessionFolders.set(folderId, { ...record, workspaceId: winner });
+      changed = true;
+    }
+    if (changed)
+      await this.#persist();
+    return changed;
+  }
   /** Все папки — для кадра `folder.list`. */
   list() {
     return {
@@ -7311,12 +7530,33 @@ var HostServer = class {
       void this.#sendAuthStatus();
     });
   }
+  /**
+   * Перенести всё, что записано под id проектов прежнего формата, на нынешние.
+   *
+   * До первого кадра клиенту: списки собираются по id, и запись под прежним
+   * не нашлась бы — закрепления выглядели бы пропавшими, а подметание стёрло
+   * бы их уже по-настоящему. Повторный запуск ничего не находит и не пишет.
+   */
+  async #carryOverWorkspaceIds() {
+    const remap = workspaceIdRemap(this.#workspaces.paths(), async (dir) => {
+      const id = workspaceIdFromPath(dir);
+      const onDisk = await this.#workspaces.sessionsOnDisk(id);
+      const antigravity = await this.#antigravity.list(id);
+      return [...onDisk.map((s) => s.sessionId), ...antigravity.map((r) => r.id)];
+    });
+    await this.#antigravity.remapWorkspaceIds(remap);
+    await this.#archive.remapWorkspaceIds(remap);
+    await this.#pins.remapWorkspaceIds(remap);
+    await this.#order.remapWorkspaceIds(remap);
+    await this.#folders.remapWorkspaceIds(remap);
+  }
   async start() {
     await this.#workspaces.load();
     await this.#archive.load();
     await this.#pins.load();
     await this.#order.load();
     await this.#folders.load();
+    await this.#carryOverWorkspaceIds();
     await this.#settings.load();
     await this.#limitStop.load();
     await this.#github.load();
@@ -7523,6 +7763,7 @@ var HostServer = class {
         return;
       case "workspace.open":
         await this.#workspaces.open(frame.path);
+        await this.#carryOverWorkspaceIds();
         this.#broadcastWorkspaces();
         await this.#closeFinder();
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i14ks/ccv",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "license": "UNLICENSED",
   "description": "GUI для Claude Code: сессии агента в каталогах проектов, дерево файлов и редактор рядом с разговором.",
   "homepage": "https://claudevisual.com",

package/web/assets/{codemirror-DcwBBoHv.js → codemirror-lu8HamKP.js}

@@ -1 +1 @@
-import{s as r,H as a}from"./index-TIzoSl17.js";import{E as e}from"./index-891wE-Rj.js";import{t as o}from"./index-RifJd-I8.js";import"./index-BHot-lnj.js";const m=e.theme({"&":{height:"100%",color:"var(--text)",backgroundColor:"var(--bg)",fontSize:"13px"},".cm-scroller":{fontFamily:"var(--mono)",lineHeight:"1.6"},".cm-content":{caretColor:"var(--accent)"},".cm-cursor, .cm-dropCursor":{borderLeftColor:"var(--accent)"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:"var(--cm-selection)"},".cm-gutters":{backgroundColor:"var(--bg)",color:"var(--muted)",borderRight:"1px solid var(--border-soft)"},".cm-activeLineGutter":{backgroundColor:"var(--surface-2)",color:"var(--text-2)"},".cm-activeLine":{backgroundColor:"var(--cm-active)"},".cm-selectionMatch":{backgroundColor:"var(--cm-match)"},"&.cm-focused .cm-matchingBracket":{backgroundColor:"var(--cm-match)",outline:"1px solid var(--accent-line)"},".cm-foldPlaceholder":{backgroundColor:"var(--surface-2)",border:"1px solid var(--border)",color:"var(--muted)"},".cm-panels":{backgroundColor:"var(--surface)",color:"var(--text)",border:"1px solid var(--border)"},".cm-panels input, .cm-panels button, .cm-panels select":{fontFamily:"var(--sans)",fontSize:"12px",background:"var(--surface-2)",color:"var(--text)",border:"1px solid var(--border)",borderRadius:"6px",padding:"3px 6px"},".cm-searchMatch":{backgroundColor:"var(--cm-match)"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"var(--accent-soft)"},".cm-tooltip":{background:"var(--surface)",border:"1px solid var(--border)",borderRadius:"8px",boxShadow:"var(--shadow-md)",color:"var(--text)"},".cm-tooltip-autocomplete ul li[aria-selected]":{background:"var(--surface-2)",color:"var(--text)"}}),i=r(a.define([{tag:[o.keyword,o.modifier,o.controlKeyword,o.moduleKeyword],color:"var(--cm-key)"},{tag:[o.name,o.deleted,o.character,o.macroName],color:"var(--text)"},{tag:[o.propertyName],color:"var(--cm-prop)"},{tag:[o.function(o.variableName),o.labelName],color:"var(--cm-fn)"},{tag:[o.color,o.constant(o.name),o.standard(o.name),o.bool],color:"var(--cm-const)"},{tag:[o.definition(o.name),o.separator],color:"var(--text)"},{tag:[o.typeName,o.className,o.changed,o.annotation,o.self,o.namespace],color:"var(--cm-type)"},{tag:[o.number,o.integer,o.float],color:"var(--cm-num)"},{tag:[o.string,o.special(o.string),o.regexp],color:"var(--cm-str)"},{tag:[o.operator,o.operatorKeyword,o.escape],color:"var(--cm-op)"},{tag:[o.meta,o.comment],color:"var(--cm-comment)",fontStyle:"italic"},{tag:o.strong,fontWeight:"650"},{tag:o.emphasis,fontStyle:"italic"},{tag:o.strikethrough,textDecoration:"line-through"},{tag:o.link,color:"var(--cm-str)",textDecoration:"underline"},{tag:o.heading,fontWeight:"650",color:"var(--cm-key)"},{tag:o.invalid,color:"var(--danger)"}]));export{i as editorHighlight,m as editorTheme};
+import{s as r,H as a}from"./index-Cc7JijiI.js";import{E as e}from"./index-891wE-Rj.js";import{t as o}from"./index-C4wYlk_J.js";import"./index-BHot-lnj.js";const m=e.theme({"&":{height:"100%",color:"var(--text)",backgroundColor:"var(--bg)",fontSize:"13px"},".cm-scroller":{fontFamily:"var(--mono)",lineHeight:"1.6"},".cm-content":{caretColor:"var(--accent)"},".cm-cursor, .cm-dropCursor":{borderLeftColor:"var(--accent)"},"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":{backgroundColor:"var(--cm-selection)"},".cm-gutters":{backgroundColor:"var(--bg)",color:"var(--muted)",borderRight:"1px solid var(--border-soft)"},".cm-activeLineGutter":{backgroundColor:"var(--surface-2)",color:"var(--text-2)"},".cm-activeLine":{backgroundColor:"var(--cm-active)"},".cm-selectionMatch":{backgroundColor:"var(--cm-match)"},"&.cm-focused .cm-matchingBracket":{backgroundColor:"var(--cm-match)",outline:"1px solid var(--accent-line)"},".cm-foldPlaceholder":{backgroundColor:"var(--surface-2)",border:"1px solid var(--border)",color:"var(--muted)"},".cm-panels":{backgroundColor:"var(--surface)",color:"var(--text)",border:"1px solid var(--border)"},".cm-panels input, .cm-panels button, .cm-panels select":{fontFamily:"var(--sans)",fontSize:"12px",background:"var(--surface-2)",color:"var(--text)",border:"1px solid var(--border)",borderRadius:"6px",padding:"3px 6px"},".cm-searchMatch":{backgroundColor:"var(--cm-match)"},".cm-searchMatch.cm-searchMatch-selected":{backgroundColor:"var(--accent-soft)"},".cm-tooltip":{background:"var(--surface)",border:"1px solid var(--border)",borderRadius:"8px",boxShadow:"var(--shadow-md)",color:"var(--text)"},".cm-tooltip-autocomplete ul li[aria-selected]":{background:"var(--surface-2)",color:"var(--text)"}}),i=r(a.define([{tag:[o.keyword,o.modifier,o.controlKeyword,o.moduleKeyword],color:"var(--cm-key)"},{tag:[o.name,o.deleted,o.character,o.macroName],color:"var(--text)"},{tag:[o.propertyName],color:"var(--cm-prop)"},{tag:[o.function(o.variableName),o.labelName],color:"var(--cm-fn)"},{tag:[o.color,o.constant(o.name),o.standard(o.name),o.bool],color:"var(--cm-const)"},{tag:[o.definition(o.name),o.separator],color:"var(--text)"},{tag:[o.typeName,o.className,o.changed,o.annotation,o.self,o.namespace],color:"var(--cm-type)"},{tag:[o.number,o.integer,o.float],color:"var(--cm-num)"},{tag:[o.string,o.special(o.string),o.regexp],color:"var(--cm-str)"},{tag:[o.operator,o.operatorKeyword,o.escape],color:"var(--cm-op)"},{tag:[o.meta,o.comment],color:"var(--cm-comment)",fontStyle:"italic"},{tag:o.strong,fontWeight:"650"},{tag:o.emphasis,fontStyle:"italic"},{tag:o.strikethrough,textDecoration:"line-through"},{tag:o.link,color:"var(--cm-str)",textDecoration:"underline"},{tag:o.heading,fontWeight:"650",color:"var(--cm-key)"},{tag:o.invalid,color:"var(--danger)"}]));export{i as editorHighlight,m as editorTheme};