mulmoterminal 4.7.1 → 4.7.2

package/README.md

@@ -847,7 +847,9 @@ In dev, open the Vite URL; its proxy forwards `/ws`, `/ws/pubsub`, and `/api` to
 
 An empty grid cell's launcher sets the **Working directory** by typing, by a preset
 chip, or with the **📁 folder button** (a native OS folder dialog). The preset chips are
-the directories you have launched in; the **workspace** leads them always, labelled
+the directories you have launched in — **worktrees excluded**, since one is a single task's
+branch that is deleted with the task, not a place to launch in again; the
+**workspace** leads them always, labelled
 **WORKSPACE** and marked with an icon, whether or not you have ever launched there — it is
 the one directory where a claude or codex session reaches every GUI tool (agy and grok get
 what the directory registered, there as anywhere — see

package/common/worktreePath.ts

@@ -0,0 +1,62 @@
+// What a managed worktree's path says about it, for the two sides that both have to ask.
+//
+// In `common/` because the launch form and `mulmoterminal init` each decide from it — the browser
+// records the directory a cell launched in, the CLI seeds the same list from Claude's history — and
+// a rule mirrored into `src/` and `server/` is a rule that drifts.
+
+import { dirPathKey } from "./dirPathKey.js";
+
+// A managed worktree lives at <root>/<repo>-<8hex>/<task> (see the server's `worktreesRoot`).
+const MANAGED_DIR = /^(.+)-[0-9a-f]{8}$/;
+
+/**
+ * The repo and task to CALL a worktree path, for a header that would otherwise show a long managed
+ * path. Shape alone, with no idea where the managed root is — which is why it is only ever used to
+ * name something. Getting it wrong shows a label; it decides nothing.
+ */
+export function worktreeLabel(cwd: string | null): { repo: string; task: string } | null {
+  if (!cwd) return null;
+  const parts = cwd.split(/[/\\]/).filter(Boolean);
+  const i = parts.indexOf("worktrees");
+  const dir = parts[i + 1];
+  const task = parts[i + 2];
+  if (i < 0 || !dir || !task) return null;
+  const m = MANAGED_DIR.exec(dir);
+  return m?.[1] === undefined ? null : { repo: m[1], task };
+}
+
+/**
+ * Whether this directory is one WE created — asked before recording it as a working-directory
+ * preset, which a worktree must never become: it is one branch for one task, deleted when the task
+ * is done, and nothing prunes the chip when the directory goes (the close button is the only
+ * remover), so the row filled with paths that no longer exist.
+ *
+ * Anchored on the managed ROOT, not on the shape above. Shape alone matches any
+ * `…/worktrees/<name>-<8hex>/<task>` a person or another tool happens to have, and the cost here is
+ * not a wrong label — it is a real working directory silently missing from the launcher (Codex on
+ * #1543). The root is the same authority the server's own `worktreeTask` uses; the browser is told
+ * it by `/api/config`.
+ *
+ * **An unknown root answers `false`** — record the directory. Before `/api/config` resolves there is
+ * nothing to compare against, and of the two ways to be wrong, an extra chip the user can delete
+ * beats a directory that quietly never appears.
+ *
+ * Lexical containment (`dirPathKey`), because the browser has no filesystem: it folds both
+ * separators, `.`/`..` and a trailing slash, but not a symlink or Windows' case-insensitivity.
+ * Both values come from the same server, so they agree in practice — and a spelling it cannot fold
+ * falls back to "not ours", which is the safe direction above.
+ */
+export function isManagedWorktreePath(cwd: string | null | undefined, worktreesRoot: string | null | undefined): boolean {
+  if (!cwd || !worktreesRoot) return false;
+  const rootKey = dirPathKey(worktreesRoot);
+  if (rootKey === "") return false;
+  const prefix = rootKey.endsWith("/") ? rootKey : `${rootKey}/`;
+  const key = dirPathKey(cwd);
+  if (!key.startsWith(prefix)) return false;
+  const below = key.slice(prefix.length).split("/").filter(Boolean);
+  // `<repo>-<hash>/<task>` at least, and the first segment has to be a name WE mint. The root
+  // holds worktrees but is not one, the per-repo directory above a task is not one either, and a
+  // directory someone put under the root by hand carries no hash — all three are places a person
+  // could reasonably be working, and dropping one loses it from the launcher (Codex on #1543).
+  return below.length >= 2 && MANAGED_DIR.test(below[0] ?? "");
+}

package/dist/assets/{abnfDiagram-VRR7QNED-WSmThe6b-dBgFOZJ6.js → abnfDiagram-VRR7QNED-WSmThe6b-DknQ8qLF.js}

@@ -1 +1 @@
-import{n as e}from"./chunk-Y2CYZVJY-Bdt8pFDJ-DsF7k-Jl.js";import{f as t}from"./src-CvsWqFln-Tc7ZSrRz.js";import{_ as n,g as r}from"./mermaid-parser.core-C1baW7NG-DMZf-3IA.js";import"./chunk-WYO6CB5R-nS6zX9ct-KrP8SxMs.js";import"./chunk-VAUOI2AC-BKx35BBi-E0yAewsj.js";import{n as i,r as a,t as o}from"./chunk-MOJQB5TN-CorQ_Pl1-mXFOYgnO.js";import{t as s}from"./chunk-JWPE2WC7-BQ3zXr2k-DSd3Ct95.js";var c=r().RailroadAbnf.parser.LangiumParser,l=e(e=>{let t=e.alternatives.map(u);return t.length===1?t[0]:{type:`choice`,alternatives:t}},`transformAlternation`),u=e(e=>{let t=e.elements.map(f);return t.length===1?t[0]:{type:`sequence`,elements:t}},`transformConcatenation`),d=e(e=>{if(e.includes(`*`)){let[t,n]=e.split(`*`);return{min:t?parseInt(t,10):0,max:n?parseInt(n,10):1/0}}let t=parseInt(e,10);return{min:t,max:t}},`parseRepeat`),f=e(e=>{let t=p(e.primary);if(!e.repeat)return t;let{min:n,max:r}=d(e.repeat);return n===0&&r===1?{type:`optional`,element:t}:{type:`repetition`,element:t,min:n,max:r}},`transformElement`),p=e(e=>{switch(e.$type){case`AbnfStringLiteral`:return{type:`terminal`,value:e.value};case`AbnfNumVal`:return{type:`terminal`,value:e.value};case`AbnfRuleName`:return{type:`nonterminal`,name:e.name};case`AbnfGroup`:return l(e.element);case`AbnfOptionalGroup`:return{type:`optional`,element:l(e.element)};default:throw Error(`Unsupported ABNF primary node: ${e.$type}`)}},`transformPrimary`),m=e(e=>({name:e.name,definition:l(e.definition)}),`transformRule`),h=e(e=>{s(e,a),e.title&&a.setTitle(e.title),e.rules.map(e=>a.addRule(m(e)))},`populateDb`),g={parser:{parse:e(e=>{a.clear(),t.debug(`[ABNF Parser] Starting Langium parse`);let r=c.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new n(r);let i=r.value;t.debug(`[ABNF Parser] Parsed rules:`,i.rules.length),h(i),t.debug(`[ABNF Parser] Parse complete`)},`parse`),parser:{yy:a}},db:a,renderer:o,styles:i};export{g as diagram};
+import{n as e}from"./chunk-Y2CYZVJY-Bdt8pFDJ-DsF7k-Jl.js";import{f as t}from"./src-CvsWqFln-Tc7ZSrRz.js";import{_ as n,g as r}from"./mermaid-parser.core-C1baW7NG-CX-WYPvl.js";import"./chunk-WYO6CB5R-nS6zX9ct-BCV_YuAf.js";import"./chunk-VAUOI2AC-BKx35BBi-_cGUYYkB.js";import{n as i,r as a,t as o}from"./chunk-MOJQB5TN-CorQ_Pl1-BbhhBfNZ.js";import{t as s}from"./chunk-JWPE2WC7-BQ3zXr2k-DSd3Ct95.js";var c=r().RailroadAbnf.parser.LangiumParser,l=e(e=>{let t=e.alternatives.map(u);return t.length===1?t[0]:{type:`choice`,alternatives:t}},`transformAlternation`),u=e(e=>{let t=e.elements.map(f);return t.length===1?t[0]:{type:`sequence`,elements:t}},`transformConcatenation`),d=e(e=>{if(e.includes(`*`)){let[t,n]=e.split(`*`);return{min:t?parseInt(t,10):0,max:n?parseInt(n,10):1/0}}let t=parseInt(e,10);return{min:t,max:t}},`parseRepeat`),f=e(e=>{let t=p(e.primary);if(!e.repeat)return t;let{min:n,max:r}=d(e.repeat);return n===0&&r===1?{type:`optional`,element:t}:{type:`repetition`,element:t,min:n,max:r}},`transformElement`),p=e(e=>{switch(e.$type){case`AbnfStringLiteral`:return{type:`terminal`,value:e.value};case`AbnfNumVal`:return{type:`terminal`,value:e.value};case`AbnfRuleName`:return{type:`nonterminal`,name:e.name};case`AbnfGroup`:return l(e.element);case`AbnfOptionalGroup`:return{type:`optional`,element:l(e.element)};default:throw Error(`Unsupported ABNF primary node: ${e.$type}`)}},`transformPrimary`),m=e(e=>({name:e.name,definition:l(e.definition)}),`transformRule`),h=e(e=>{s(e,a),e.title&&a.setTitle(e.title),e.rules.map(e=>a.addRule(m(e)))},`populateDb`),g={parser:{parse:e(e=>{a.clear(),t.debug(`[ABNF Parser] Starting Langium parse`);let r=c.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new n(r);let i=r.value;t.debug(`[ABNF Parser] Parsed rules:`,i.rules.length),h(i),t.debug(`[ABNF Parser] Parse complete`)},`parse`),parser:{yy:a}},db:a,renderer:o,styles:i};export{g as diagram};

package/dist/assets/architecture-TIHT7OUA-Cqhmai3f-C07fcF9Q.js

@@ -0,0 +1 @@
+import{f as e}from"./mermaid-parser.core-C1baW7NG-CX-WYPvl.js";export{e as createArchitectureServices};