specrails-desktop 2.30.2 → 2.31.0

package/server/dist/workspace-manager.js

@@ -97,15 +97,60 @@ function ensureFrameworkAgents(workspaceDir, providerDir, home) {
     }
     return copied;
 }
-/** The framework subtrees `assemble` installs as a single DIR-symlink into
- *  `current/<provider>/` (unlike agents, which are per-file). `/specrails:*`
- *  slash commands live under `commands/`. (`/opsx:*` is NOT framework — the
- *  external OpenSpec binary installs it into the REPO's provider dir; isolated
- *  rails receive it via the worktree overlay's repo fallback root.) */
+/** Whole-directory framework links for the legacy provider layouts. */
 const DIR_LINKED_SUBTREES = ['commands', 'skills', 'rules'];
 /**
- * Windows repair for the DIR-symlinked framework subtrees (`commands`, `skills`,
- * `rules`) — the sibling of `ensureFrameworkAgents` for the whole-directory links.
+ * Kimi's framework layout is deliberately mixed:
+ *
+ * - `rules/` and `specrails/` are whole-directory framework links.
+ * - `skills/` is a real merged directory. Core links only its framework-owned
+ *   `specrails-*` workflow and `sr-*` role children so OpenSpec, custom, and
+ *   other user-owned direct-child skills can coexist.
+ *
+ * The Windows repair must mirror that ownership boundary exactly. Replacing the
+ * Kimi `skills/` root would destroy user state; merely seeing entries in that
+ * root would also hide broken framework-child links.
+ */
+const KIMI_DIR_LINKED_SUBTREES = ['rules', 'specrails'];
+const KIMI_FRAMEWORK_SKILL = /^(?:specrails-|sr-)/;
+/** Remove a missing/unreadable/empty framework destination without ever
+ * traversing a live symlink target. */
+function removeBrokenFrameworkDestination(dest) {
+    try {
+        const st = fs_1.default.lstatSync(dest);
+        if (st.isSymbolicLink()) {
+            fs_1.default.unlinkSync(dest);
+        }
+        else {
+            fs_1.default.rmSync(dest, { recursive: true, force: true });
+        }
+    }
+    catch {
+        try {
+            fs_1.default.rmdirSync(dest);
+        }
+        catch {
+            try {
+                fs_1.default.rmSync(dest, { recursive: true, force: true });
+            }
+            catch {
+                /* dest may be absent — fine */
+            }
+        }
+    }
+}
+/** True only when a destination can actually be traversed and contains data. */
+function hasReadableFrameworkContent(dest) {
+    try {
+        return fs_1.default.readdirSync(dest).length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Windows repair for provider-owned framework links — the sibling of
+ * `ensureFrameworkAgents`.
  *
  * Why a SEPARATE repair: agents are linked per-file, so a broken `current`
  * junction leaves an EMPTY-but-real `agents/` dir that `ensureFrameworkAgents`
@@ -117,10 +162,15 @@ const DIR_LINKED_SUBTREES = ['commands', 'skills', 'rules'];
  * unreadable/missing link with a REAL recursively-copied directory read straight
  * from the versioned framework dir (never through `current`).
  *
- * SAFETY: only heals when the dest is missing OR unreadable OR empty — a dest
- * that lists content is a working link/dir and is left untouched, so a working
- * symlink's real target is NEVER deleted through. NO-OP on POSIX (per-provider
- * symlinks resolve normally). Best-effort + idempotent. Returns the count healed.
+ * Kimi needs an additional per-child repair because its `skills/` root is a real
+ * merged directory. Only `specrails-*` and `sr-*` children are framework-owned;
+ * `openspec-*`, `custom-*`, and unknown children are never copied, replaced, or
+ * removed.
+ *
+ * SAFETY: only heals a managed destination when it is missing, unreadable, or
+ * empty. A destination that lists content is left untouched, so a working
+ * symlink's real target is never deleted through. NO-OP on POSIX. Best-effort +
+ * idempotent. Returns the number of repaired subtrees/managed skill children.
  */
 function ensureFrameworkCommandSubtrees(workspaceDir, providerDir, home) {
     if (process.platform !== 'win32')
@@ -130,7 +180,8 @@ function ensureFrameworkCommandSubtrees(workspaceDir, providerDir, home) {
     if (!version)
         return 0;
     let healed = 0;
-    for (const subtree of DIR_LINKED_SUBTREES) {
+    const dirLinkedSubtrees = providerDir === '.kimi-code' ? KIMI_DIR_LINKED_SUBTREES : DIR_LINKED_SUBTREES;
+    for (const subtree of dirLinkedSubtrees) {
         const src = path_1.default.join(root, version, providerDir, subtree);
         // The versioned source must be a real, readable, non-empty dir to heal from.
         let srcEntries;
@@ -143,45 +194,57 @@ function ensureFrameworkCommandSubtrees(workspaceDir, providerDir, home) {
         if (srcEntries.length === 0)
             continue;
         const dest = path_1.default.join(workspaceDir, providerDir, subtree);
-        // A dest that lists entries is a working link/dir → leave it (never risk
-        // deleting through a live symlink). Heal only when unreadable / empty.
+        if (hasReadableFrameworkContent(dest))
+            continue;
+        removeBrokenFrameworkDestination(dest);
         try {
-            if (fs_1.default.readdirSync(dest).length > 0)
-                continue;
+            fs_1.default.mkdirSync(path_1.default.dirname(dest), { recursive: true });
+            fs_1.default.cpSync(src, dest, { recursive: true });
+            healed += 1;
         }
         catch {
-            /* unreadable (broken/untraversable link, or missing) → heal below */
+            /* best-effort per subtree — a copy failure must never abort the spawn */
         }
-        // Remove the broken link / empty dir. We only reach here when there is no
-        // traversable content, so no real framework files can be destroyed. Layered
-        // removal because a Windows dir-junction resists unlink/rmdir differently.
+    }
+    if (providerDir !== '.kimi-code')
+        return healed;
+    const srcSkills = path_1.default.join(root, version, providerDir, 'skills');
+    let skillNames;
+    try {
+        skillNames = fs_1.default.readdirSync(srcSkills);
+    }
+    catch {
+        return healed;
+    }
+    for (const name of skillNames) {
+        if (!KIMI_FRAMEWORK_SKILL.test(name))
+            continue;
+        const src = path_1.default.join(srcSkills, name);
+        // A materialized Core framework owns directory-form skills with SKILL.md.
+        // Reject special files/symlinked source children instead of copying through
+        // a locally tampered framework store.
         try {
-            const st = fs_1.default.lstatSync(dest);
-            if (st.isSymbolicLink()) {
-                fs_1.default.unlinkSync(dest);
-            }
-            else {
-                fs_1.default.rmSync(dest, { recursive: true, force: true });
+            const sourceStat = fs_1.default.lstatSync(src);
+            if (!sourceStat.isDirectory() ||
+                sourceStat.isSymbolicLink() ||
+                !fs_1.default.statSync(path_1.default.join(src, 'SKILL.md')).isFile()) {
+                continue;
             }
         }
         catch {
-            try {
-                fs_1.default.rmdirSync(dest);
-            }
-            catch {
-                try {
-                    fs_1.default.rmSync(dest, { recursive: true, force: true });
-                }
-                catch { /* dest may be absent — fine */ }
-            }
+            continue;
         }
+        const dest = path_1.default.join(workspaceDir, providerDir, 'skills', name);
+        if (hasReadableFrameworkContent(dest))
+            continue;
+        removeBrokenFrameworkDestination(dest);
         try {
             fs_1.default.mkdirSync(path_1.default.dirname(dest), { recursive: true });
             fs_1.default.cpSync(src, dest, { recursive: true });
             healed += 1;
         }
         catch {
-            /* best-effort per subtree — a copy failure must never abort the spawn */
+            /* best-effort per skill — one failure must never abort the spawn */
         }
     }
     return healed;
@@ -281,7 +344,7 @@ function assembleWorkspaceFramework(slug, projectPath, provider, opts = {}) {
     // the repo). Best-effort: a failure here must not break workspace assembly.
     try {
         const port = Number(process.env.SPECRAILS_MCP_PORT || process.env.SPECRAILS_PORT || 4200);
-        (0, agent_mcp_config_1.mergeSpecrailsIntoWorkspaceMcp)(ws, port);
+        (0, agent_mcp_config_1.mergeSpecrailsIntoWorkspaceMcp)(ws, port, provider);
     }
     catch {
         /* non-fatal */

package/server/dist/worktree-manager.js

@@ -126,6 +126,10 @@ exports.PR_NEVER_STAGE_PATHS = [
     '.gemini/agent-memory/**',
     '.gemini/agent-memory/explanations',
     '.gemini/agent-memory/explanations/**',
+    '.kimi-code/agent-memory',
+    '.kimi-code/agent-memory/**',
+    '.kimi-code/agent-memory/explanations',
+    '.kimi-code/agent-memory/explanations/**',
 ];
 const PR_NEVER_STAGE_EXCLUDE_MARKER_BEGIN = '# specrails: never stage private agent artifacts';
 const PR_NEVER_STAGE_EXCLUDE_MARKER_END = '# /specrails: never stage private agent artifacts';

package/server/dist/worktree-overlay.js

@@ -500,6 +500,9 @@ function copyIfAbsent(src, dest, rel, created, warnings) {
     if (lstatSafe(dest))
         return; // checkout (or a prior pass, re-claimed via manifest) wins
     try {
+        // Adapter instruction paths may be nested (Kimi uses
+        // `.kimi-code/AGENTS.md`), unlike the historical root-level CLAUDE.md.
+        fs_1.default.mkdirSync(path_1.default.dirname(dest), { recursive: true });
         fs_1.default.copyFileSync(src, dest);
         created.push(rel);
     }
@@ -531,6 +534,9 @@ function applyWorktreeOverlay(input) {
         // 1. providerDir merge-overlay (commands/agents/skills/rules/settings/…),
         //    over the UNION of entries across the configured roots (earlier wins).
         const srcProviders = roots.map((root) => path_1.default.join(root, providerDir)).filter((p) => isDir(p));
+        const nestedInstructionsEntry = path_1.default.normalize(path_1.default.dirname(instructionsFilename)) === path_1.default.normalize(providerDir)
+            ? path_1.default.basename(instructionsFilename)
+            : null;
         if (srcProviders.length > 0) {
             const destProvider = path_1.default.join(worktreePath, providerDir);
             // The providerDir root is ALWAYS a real local dir (never a link) so
@@ -562,7 +568,10 @@ function applyWorktreeOverlay(input) {
                     }
                 }
                 for (const name of [...names].sort()) {
-                    if (SKIP_PROVIDER_ENTRIES.has(name))
+                    // A nested provider instruction (Kimi's `.kimi-code/AGENTS.md`) must
+                    // follow the spawn-local COPY semantics in step 3, not become a link
+                    // merely because it also lives directly under providerDir.
+                    if (SKIP_PROVIDER_ENTRIES.has(name) || name === nestedInstructionsEntry)
                         continue;
                     const childSrcs = srcProviders.map((srcProvider) => path_1.default.join(srcProvider, name)).filter((p) => lstatSafe(p) !== null);
                     mergeLink(childSrcs, path_1.default.join(destProvider, name), `${providerDir}/${name}`, created, warnings, priorOwned, converted);
@@ -574,8 +583,8 @@ function applyWorktreeOverlay(input) {
         const mcpSrc = roots.map((root) => path_1.default.join(root, '.mcp.json')).find((p) => fs_1.default.existsSync(p));
         if (mcpSrc)
             copyIfAbsent(mcpSrc, path_1.default.join(worktreePath, '.mcp.json'), '.mcp.json', created, warnings);
-        // 3. Provider instruction file — COPY when a source has one and the
-        //    checkout doesn't (a repo-tracked CLAUDE.md always wins).
+        // 3. Provider instruction path — COPY when a source has one and the
+        //    checkout doesn't (a repo-tracked provider instruction always wins).
         const instructionsSrc = roots.map((root) => path_1.default.join(root, instructionsFilename)).find((p) => fs_1.default.existsSync(p));
         if (instructionsSrc) {
             copyIfAbsent(instructionsSrc, path_1.default.join(worktreePath, instructionsFilename), instructionsFilename, created, warnings);

package/client/dist/assets/AgentModeCodePane-BAYyFRmY.js

@@ -1,2 +0,0 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/CodePage-vyQr40Vl.js","assets/rolldown-runtime-CNC7AqOf.js","assets/jsx-runtime-zu2_FqZY.js","assets/react-dom-DiWzBDP9.js","assets/preload-helper-Czpn1I53.js","assets/chunk-KS7C4IRE-Cx5sqopX.js","assets/createLucideIcon-Bjbbp_KS.js","assets/dist-bVqfYmby.js","assets/useBrowserCaptureSession-CkBJShUw.js","assets/i18n-Bf9Ckd10.js","assets/activity-DiyjsgQV.js","assets/addspec-Rw8uVBC1.js","assets/agent-BuUpgqVx.js","assets/agents-DhG7mg6-.js","assets/agentstudio-BIUe1Im2.js","assets/aiedit-iIjz2_Qk.js","assets/analytics-DZ8Aoq3I.js","assets/attachments-B53PG733.js","assets/browser-CXUcnTMI.js","assets/builder-Cc_Lf79C.js","assets/chat-BGD7MXAy.js","assets/code-BDXEM4ml.js","assets/commands-DyUZQ1FI.js","assets/common-DHsv9N5d.js","assets/dashboard-Cslu_GCH.js","assets/explore-DgBACn39.js","assets/integrations-mB-7zoyT.js","assets/jira-CmKWERE0.js","assets/jobs-DoSaFzAa.js","assets/loops-BzfXWEwO.js","assets/mcp-uDkXYu4L.js","assets/nav-myFaXRHD.js","assets/settings-B0ypw9uw.js","assets/setup-ajB4rYm-.js","assets/specs-DII0C8gw.js","assets/terminal-BFRZnMPP.js","assets/tickets-D_yDquEw.js","assets/auth-D_5bQv5W.js","assets/api-B2M7CtDw.js","assets/MinimizedChatsContext-Cs34FPTz.js","assets/sparkles-DrY8hb0X.js","assets/x-CBMI9ejn.js","assets/useSharedWebSocket-DaPh7QBL.js","assets/useDesktop-B4pSBIDd.js","assets/external-link-BcU5EWZp.js","assets/chevron-right-CViMxucY.js","assets/TicketDetailModal-CI47Dq9E.js","assets/Trans-CPISVji8.js","assets/arrow-left-CpIR4j7G.js","assets/circle-x-CMYsN4ZH.js","assets/download-CFHyyHcw.js","assets/file-text-CFT-xXKN.js","assets/git-branch-BRM0F5GN.js","assets/loader-circle-DcygOQpC.js","assets/pencil-C9RkrIPZ.js","assets/play-DNlrawbS.js","assets/plus-CsnjfkmX.js","assets/save-28sIlCdr.js","assets/search-Cq_gE3Ik.js","assets/trash-2-BOU3WdZZ.js","assets/triangle-alert-H9T4jAmh.js","assets/zap-CHo3aCD1.js","assets/button-BUIIBQPT.js","assets/dist-Cez5CRkX.js","assets/clsx-CjueKrWZ.js","assets/utils-BC4DHlz2.js","assets/dialog-CzIekCw0.js","assets/jira-api-BgFIr8eD.js","assets/lib-CGdyxIWg.js","assets/formatDistanceToNow-ByKli7Q_.js","assets/getTimezoneOffsetInMilliseconds-qrcBaLW1.js","assets/spending-DMnCXy84.js","assets/index-F9r8mWP_.js","assets/arrow-up-right-9DoMn7fD.js","assets/index-Dh9i4CnN.css"])))=>i.map(i=>d[i]);
-import{a as e}from"./rolldown-runtime-CNC7AqOf.js";import{n as t,t as n}from"./jsx-runtime-zu2_FqZY.js";import{t as r}from"./preload-helper-Czpn1I53.js";import{n as i}from"./createLucideIcon-Bjbbp_KS.js";import{t as a}from"./x-CBMI9ejn.js";import{i as o,mt as s,pt as c}from"./index-F9r8mWP_.js";var l=e(t(),1),u=n(),d=(0,l.lazy)(()=>r(()=>import(`./CodePage-vyQr40Vl.js`),__vite__mapDeps([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74]))),f=new Map,p=420,m=560;function h({projectId:e,conversationId:t}){let{t:n}=i(`agent`),{closeCodePane:r}=o(),[h,g]=(0,l.useState)(m),[_,v]=(0,l.useState)(!1),y=(0,l.useRef)(null),b=`${e}:${t}`,x=(0,l.useCallback)(e=>{f.set(b,e)},[b]),S=(0,l.useCallback)(e=>{let t=e.clientX,n=h,r=window.innerWidth-p;try{e.currentTarget.setPointerCapture(e.pointerId)}catch{}let i=e=>{let i=Math.min(Math.max(n+(t-e.clientX),p),r);g(i)},a=()=>{window.removeEventListener(`pointermove`,i),window.removeEventListener(`pointerup`,a),window.removeEventListener(`pointercancel`,a)};window.addEventListener(`pointermove`,i),window.addEventListener(`pointerup`,a),window.addEventListener(`pointercancel`,a)},[h]);return(0,u.jsxs)(`div`,{ref:y,className:`flex h-full flex-col overflow-hidden border-l border-border bg-background${_?` absolute inset-0 z-30 border-l-0`:``}`,style:_?void 0:{width:h,flexShrink:0},children:[(0,u.jsx)(`div`,{className:`relative flex items-center`,children:!_&&(0,u.jsx)(`div`,{role:`separator`,"aria-orientation":`vertical`,onPointerDown:S,className:`absolute left-0 top-0 h-full w-1.5 -translate-x-full cursor-col-resize select-none touch-none hover:bg-accent-primary/20`,title:n(`workspace.resizeCode`)})}),(0,u.jsxs)(`div`,{className:`flex items-center gap-2 border-b border-border/60 bg-surface/40 px-3 py-1.5`,children:[(0,u.jsx)(`span`,{className:`text-xs font-medium text-foreground/70`,children:n(`workspace.files`)}),(0,u.jsxs)(`div`,{className:`ml-auto flex items-center gap-1`,children:[(0,u.jsx)(`button`,{type:`button`,onClick:()=>v(e=>!e),"aria-label":n(_?`restore`:`maximize`),title:n(_?`restore`:`maximize`),className:`rounded-md p-1 text-foreground/60 hover:bg-surface hover:text-foreground`,children:_?(0,u.jsx)(c,{className:`h-4 w-4`}):(0,u.jsx)(s,{className:`h-4 w-4`})}),(0,u.jsx)(`button`,{type:`button`,onClick:r,"aria-label":n(`workspace.closeFiles`),title:n(`workspace.closeFiles`),className:`rounded-md p-1 text-foreground/60 hover:bg-surface hover:text-foreground`,children:(0,u.jsx)(a,{className:`h-4 w-4`})})]})]}),(0,u.jsx)(`div`,{className:`min-h-0 flex-1 overflow-hidden`,children:(0,u.jsx)(l.Suspense,{fallback:(0,u.jsx)(`div`,{className:`flex h-full items-center justify-center text-sm text-muted-foreground`,children:`…`}),children:(0,u.jsx)(d,{embedded:!0,initialPath:f.get(b)??null,onSelectedPathChange:x})})})]},b)}export{h as AgentModeCodePane};