@windypro-rourou/dsh-code-studio 0.1.0 → 0.1.2

package/lib/client.js

@@ -166,6 +166,28 @@ window.__ModuleLoader__.load({
 		}
 		function subscribePanel(fn) { panel.listeners.add(fn); return () => panel.listeners.delete(fn); }
 
+		// current session id (per-session change isolation)
+		let currentSessionId = null;
+		const sessListeners = new Set();
+		function setSessionId(v) {
+			currentSessionId = v;
+			for (const fn of sessListeners) fn(v);
+		}
+		function subscribeSession(fn) { sessListeners.add(fn); return () => sessListeners.delete(fn); }
+
+		// per-session UI state memory (changes, tabs, width), persisted locally
+		const SESS_STATE_KEY = "cs.sessionStates.v1";
+		function loadSessionStates() {
+			try {
+				const raw = globalThis.localStorage?.getItem(SESS_STATE_KEY);
+				if (raw) return JSON.parse(raw);
+			} catch { /* ignore */ }
+			return {};
+		}
+		function persistSessionStates(map) {
+			try { globalThis.localStorage?.setItem(SESS_STATE_KEY, JSON.stringify(map)); } catch { /* ignore */ }
+		}
+
 		// ============================ CSS ============================
 		const CSS = [
 			".cs-root{position:absolute;top:0;right:0;bottom:0;display:flex;flex-direction:column;background:var(--dsw-alias-bg-layer-1,#151922);color:var(--dsw-alias-label-primary,#d7dde6);border-left:1px solid var(--dsw-alias-border-l1,#262a33);font:13px/1.55 -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,sans-serif;z-index:30;box-shadow:-12px 0 32px rgba(0,0,0,.18);animation:csSlideIn .18s ease-out;--cs-mono:ui-monospace,SFMono-Regular,Menlo,Consolas,\"Liberation Mono\",monospace}",
@@ -408,6 +430,32 @@ window.__ModuleLoader__.load({
 			});
 			const dragRef = React.useRef(null);
 			const changedSet = React.useMemo(() => new Set(changes.map((c) => c.path)), [changes]);
+			// current session for per-session isolation
+			const [sessId, setSessId] = React.useState(currentSessionId);
+			const sessIdRef = React.useRef(currentSessionId);
+			// per-session UI memory: save current snapshot on switch, restore target's
+			const sessStatesRef = React.useRef(loadSessionStates());
+			const snapRef = React.useRef({ changes, expandedPath, editor, tab, width });
+			snapRef.current = { changes, expandedPath, editor, tab, width };
+			React.useEffect(() => subscribeSession((v) => {
+				const cur = sessIdRef.current;
+				if (cur && cur !== v) {
+					sessStatesRef.current[cur] = snapRef.current;
+					persistSessionStates(sessStatesRef.current);
+				}
+				sessIdRef.current = v;
+				setSessId(v);
+				const st = sessStatesRef.current[v];
+				if (st) {
+					setChanges(st.changes ?? []);
+					setExpandedPath(st.expandedPath ?? null);
+					setEditor(st.editor ?? null);
+					setTab(st.tab ?? "changes");
+					setWidth(st.width ?? 400);
+				} else {
+					setChanges([]); setExpandedPath(null); setEditor(null); setTab("changes");
+				}
+			}), []);
 
 			React.useEffect(() => subscribePanel(setOpen), []);
 			React.useEffect(() => {
@@ -435,11 +483,16 @@ window.__ModuleLoader__.load({
 						try {
 							const ev = JSON.parse(msg.data);
 							if (!ev || typeof ev.path !== "string") return;
+							// per-session isolation: only react to changes owned by the active session
+							// (or unattributed ones, treated as the current session's/user's own edits)
+							// per-session isolation: only filter when we KNOW the active session.
+							// If current is null, do not filter - otherwise edits would never appear.
+							if (ev.sessionId && sessIdRef.current && ev.sessionId !== sessIdRef.current) return;
 							setConn("ok"); setConnText("已连接");
 							const name = ev.path.split(/[\\/]/).pop() || ev.path;
 							setChanges((prev) => {
 								const next = prev.filter((c) => c.path !== ev.path);
-								next.unshift({ path: ev.path, name, before: ev.before, after: ev.after, deleted: !!ev.deleted, ts: ev.ts });
+								next.unshift({ path: ev.path, name, before: ev.before, after: ev.after, deleted: !!ev.deleted, ts: ev.ts, sessionId: ev.sessionId });
 								return next.slice(0, 50);
 							});
 							setPanelOpen(true);
@@ -487,12 +540,17 @@ window.__ModuleLoader__.load({
 				setTab("changes");
 				setExpandedPath(path);
 				historyApi(path).then((data) => {
-					const last = data.events && data.events.length > 0 ? data.events[data.events.length - 1] : null;
-					if (!last) return;
+					const events = data.events && data.events.length > 0 ? data.events : [];
+					if (events.length === 0) return;
+					// prefer the latest event owned by the active session; fall back to the latest overall
+					let last = events[events.length - 1];
+					for (let i = events.length - 1; i >= 0; i--) {
+						if (events[i].sessionId && events[i].sessionId === sessIdRef.current) { last = events[i]; break; }
+					}
 					const name = path.split(/[\\/]/).pop() || path;
 					setChanges((prev) => {
 						if (prev.some((c) => c.path === path)) return prev;
-						return [{ path, name, before: last.before, after: last.after, deleted: !!last.deleted, ts: last.ts }, ...prev];
+						return [{ path, name, before: last.before, after: last.after, deleted: !!last.deleted, ts: last.ts, sessionId: last.sessionId }, ...prev];
 					});
 				}).catch(() => {});
 			};
@@ -513,7 +571,10 @@ window.__ModuleLoader__.load({
 				if (!dragRef.current) return;
 				dragRef.current = null;
 				e.currentTarget.classList.remove("cs-drag");
-				try { globalThis.localStorage?.setItem("cs.panelWidth", String(width)); } catch { /* ignore */ }
+				if (sessIdRef.current) {
+					sessStatesRef.current[sessIdRef.current] = { ...snapRef.current, width };
+					persistSessionStates(sessStatesRef.current);
+				}
 			};
 
 			if (!open) {
@@ -596,6 +657,7 @@ window.__ModuleLoader__.load({
 					el("span", { className: "cs-sdot cs-" + conn }),
 					el("span", null, connText),
 					el("span", { style: { marginLeft: "auto" } }, "变更 " + changes.length + " 文件"),
+					sessId ? el("span", { title: "仅显示当前会话的变更" }, "会话 " + String(sessId).slice(-6)) : null,
 					el("span", null, editor && editor.dirty ? "未保存" : "就绪")
 				)
 			);
@@ -662,6 +724,17 @@ window.__ModuleLoader__.load({
 				} catch (error) {
 					console.error("[code-studio] sidebar entry failed", error);
 				}
+				// track the active session so the panel only reacts to this session's edits
+				try {
+					const sessions = ctx.get("sessions");
+					if (sessions && typeof sessions.list?.getSnapshot === "function" && typeof sessions.list.subscribe === "function") {
+						const sync = () => { try { setSessionId(sessions.list.getSnapshot()?.current ?? null); } catch { /* ignore */ } };
+						disposers.push(sessions.list.subscribe(sync));
+						sync();
+					}
+				} catch (error) {
+					console.error("[code-studio] session tracking failed", error);
+				}
 				try {
 					const slots = ctx.get("slots");
 					if (slots !== void 0) {

package/lib/index.js

@@ -61,7 +61,9 @@ function safePath(raw) {
 
 class FileLedger {
   constructor(root) {
-    this.root = root;
+    /** watched workspace roots (one recursive watcher each) */
+    this.roots = new Set();
+    this.watchers = new Map();
     /** baseline cache: absolute path -> { content, mtimeMs, size } */
     this.baseline = new Map();
     /** change history: absolute path -> [{ ts, before, after, deleted }] */
@@ -69,7 +71,41 @@ class FileLedger {
     /** SSE subscribers */
     this.subscribers = new Set();
     this.debounce = new Map();
-    this.watcher = void 0;
+    /** file path -> owning session { sessionId, ts } (learnt from tool/call events) */
+    this.owners = new Map();
+    if (root) this.addRoot(root);
+  }
+
+  /** Add one workspace root (recursive watcher). Idempotent. */
+  addRoot(root) {
+    if (typeof root !== "string" || root === "") return;
+    let resolved;
+    try { resolved = realpathSync(root); } catch { return; }
+    if (this.roots.has(resolved)) return;
+    this.roots.add(resolved);
+    try {
+      const watcher = fsWatch(resolved, { recursive: true }, (_eventType, filename) => {
+        if (typeof filename !== "string") return;
+        this.schedule(join(resolved, filename));
+      });
+      watcher.on?.("error", () => { /* poll covers us */ });
+      this.watchers.set(resolved, watcher);
+    } catch { /* poll covers us */ }
+  }
+
+  /** Attribute a file to a session (from a session tool/call event). */
+  claim(path, sessionId) {
+    if (typeof path !== "string" || path === "" || typeof sessionId !== "string") return;
+    this.owners.set(path, { sessionId, ts: Date.now() });
+    if (this.owners.size > 2000) {
+      const oldest = [...this.owners.entries()].sort((a, b) => a[1].ts - b[1].ts)[0];
+      if (oldest) this.owners.delete(oldest[0]);
+    }
+  }
+
+  /** Owning session for a path, if known. */
+  ownerOf(path) {
+    return this.owners.get(path)?.sessionId ?? null;
   }
 
   snapshot(path) {
@@ -111,8 +147,9 @@ class FileLedger {
       if (error.code === "ENOENT") {
         const before = this.baseline.get(path);
         this.baseline.delete(path);
-        this.push({ path, ts: Date.now(), before: before?.content ?? null, after: null, deleted: true });
-        this.addHistory(path, { ts: Date.now(), before: before?.content ?? null, after: null, deleted: true });
+        const ev = { path, ts: Date.now(), before: before?.content ?? null, after: null, deleted: true, sessionId: this.ownerOf(path) };
+        this.push(ev);
+        this.addHistory(path, ev);
         return;
       }
       return;
@@ -121,7 +158,7 @@ class FileLedger {
     const before = prior && !prior.tooLarge ? prior.content : null;
     this.baseline.set(path, { ...current });
     if (prior && prior.mtimeMs === current.mtimeMs && prior.size === current.size && prior.content === current.content) return;
-    const event = { path, ts: Date.now(), before, after: current.tooLarge ? null : current.content, deleted: false, tooLarge: current.tooLarge };
+    const event = { path, ts: Date.now(), before, after: current.tooLarge ? null : current.content, deleted: false, tooLarge: current.tooLarge, sessionId: this.ownerOf(path) };
     this.push(event);
     this.addHistory(path, event);
   }
@@ -163,21 +200,14 @@ class FileLedger {
   }
 
   start() {
-    try {
-      this.watcher = fsWatch(this.root, { recursive: true }, (_eventType, filename) => {
-        if (typeof filename !== "string") return;
-        this.schedule(join(this.root, filename));
-      });
-      this.watcher.on?.("error", () => { /* recursive watch may fail on some mounts; poll covers us */ });
-    } catch (error) {
-      this.watcher = void 0;
-    }
+    for (const root of this.roots) this.addRoot(root);
   }
 
   stop() {
     for (const timer of this.debounce.values()) clearTimeout(timer);
     this.debounce.clear();
-    if (this.watcher) { try { this.watcher.close(); } catch { /* ignore */ } }
+    for (const watcher of this.watchers.values()) { try { watcher.close(); } catch { /* ignore */ } }
+    this.watchers.clear();
     for (const res of this.subscribers) { try { res.destroy(); } catch { /* ignore */ } }
     this.subscribers.clear();
   }
@@ -277,7 +307,8 @@ function makeRoutes(ledger, root, cwd) {
           before: ledger.snapshot(path)?.content ?? null,
           after: body.content,
           deleted: false,
-          source: "user"
+          source: "user",
+          sessionId: ledger.ownerOf(path)
         };
         ledger.recordBaseline(path, body.content, mtimeMs, body.content.length);
         ledger.push(event);
@@ -322,6 +353,21 @@ function makeRoutes(ledger, root, cwd) {
 
 /* ---------- plugin ---------- */
 
+/** Tool names whose arguments carry a file path we can attribute to a session. */
+const PATH_TOOLS = new Set(["write", "edit", "str-replace", "apply-patch", "fs-write", "write-file"]);
+const PATH_ARGS = ["file_path", "path", "filePath", "target", "file"];
+
+/** Resolve a tool argument to an absolute path, anchoring relative paths at the session cwd. */
+function toolPath(args, sessionCwd) {
+  for (const key of PATH_ARGS) {
+    const p = args?.[key];
+    if (typeof p === "string" && p !== "") {
+      return isAbsolute(p) ? resolve(p) : resolve(sessionCwd ?? process.cwd(), p);
+    }
+  }
+  return void 0;
+}
+
 function apply(ctx, config) {
   const root = realpathSync((config?.root && config.root !== "" ? config.root : process.env.DSH_WORKSPACE ?? process.cwd()));
   const cwd = process.cwd();
@@ -335,6 +381,58 @@ function apply(ctx, config) {
       const timer = setInterval(() => ledger.poll(), pollIntervalMs);
       timer.unref();
       disposers.push(() => clearInterval(timer));
+      // Watch every session's workspace, not just our cwd: agents edit files
+      // in whichever directory their session was started in.
+      const addSessionRoot = (session) => {
+        if (session?.header?.cwd) ledger.addRoot(session.header.cwd);
+      };
+      try {
+        const sessions = ctx.get("sessions");
+        if (sessions && typeof sessions.list === "function") {
+          for (const session of sessions.list()) addSessionRoot(session);
+        }
+      } catch { /* ignore */ }
+      // ---- reliable real-time change detection from tool events ----
+      // tool/call records { name, arguments, callId } per session; tool/result
+      // pairs by callId. On a file-writing tool completing, read the file NOW
+      // and push the change immediately (fs.watch on atomic writes/renames is
+      // unreliable and late), attributing it to the owning session.
+      const pendingCalls = new Map(); // callId -> { name, args, sessionId, cwd }
+      const offSession = ctx.on("session/event", (session, event) => {
+        addSessionRoot(session);
+        const data = event?.data;
+        if (!data || typeof data !== "object") return;
+        if (event.type === "tool/call") {
+          if (typeof data.name === "string" && data.arguments && typeof data.arguments === "object") {
+            pendingCalls.set(String(data.callId), {
+              name: data.name,
+              args: data.arguments,
+              sessionId: session?.id,
+              cwd: session?.header?.cwd
+            });
+            if (pendingCalls.size > 500) {
+              const oldest = pendingCalls.keys().next().value;
+              if (oldest !== void 0) pendingCalls.delete(oldest);
+            }
+          }
+          return;
+        }
+        if (event.type === "tool/result") {
+          const callId = data.message?.source?.callId ?? data.callId ?? data.call_id;
+          const call = callId !== void 0 ? pendingCalls.get(String(callId)) : void 0;
+          if (call === void 0) return;
+          pendingCalls.delete(String(callId));
+          if (!PATH_TOOLS.has(call.name)) return;
+          const abs = toolPath(call.args, call.cwd);
+          if (abs === void 0) return;
+          ledger.claim(abs, call.sessionId);
+          // proactive immediate read+push; fs.watch remains a fallback for
+          // writes that bypass tools (bash, user edits)
+          void ledger.handleChange(abs);
+          return;
+        }
+      });
+      disposers.push(offSession);
     } catch (error) {
       for (const dispose of disposers) dispose();
       ledger.stop();

package/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "@windypro-rourou/dsh-code-studio",
-  "description": "Code Studio for DSH Web GUI — a VS Code + Cline hybrid: file tree, syntax-highlighted editor, and Cline-style line-by-line diffs that auto-appear when the agent edits files.",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/types/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "types": "./lib/types/client/index.d.ts",
-      "default": "./lib/client.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime"
-      ],
-      "platform": "web"
-    }
-  },
-  "keywords": [
-    "dsh-plugin",
-    "dsh",
-    "deepseek-harness",
-    "code-studio",
-    "cline",
-    "diff",
-    "editor",
-    "web-ui"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/windypro-rourou/dsh-code-studio.git"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "react": "^18.2.0"
-  },
-  "files": [
-    "lib/**/*.js",
-    "lib/**/*.d.ts",
-    "cordis.patch.yml",
-    "README.md",
-    "scripts"
-  ],
-  "license": "MIT"
-}
+{
+    "name":  "@windypro-rourou/dsh-code-studio",
+    "description":  "Code Studio for DSH Web GUI 鈥?a VS Code + Cline hybrid: file tree, syntax-highlighted editor, and Cline-style line-by-line diffs that auto-appear when the agent edits files.",
+    "version":  "0.1.2",
+    "type":  "module",
+    "main":  "lib/index.js",
+    "types":  "lib/types/index.d.ts",
+    "exports":  {
+                    ".":  {
+                              "types":  "./lib/types/index.d.ts",
+                              "default":  "./lib/index.js"
+                          },
+                    "./client":  {
+                                     "types":  "./lib/types/client/index.d.ts",
+                                     "default":  "./lib/client.js"
+                                 },
+                    "./package.json":  "./package.json"
+                },
+    "dsh":  {
+                "bundle":  {
+                               "patch":  "./cordis.patch.yml"
+                           },
+                "client":  {
+                               "inject":  [
+                                              "@deepseek-ai/dsh-client-runtime"
+                                          ],
+                               "platform":  "web"
+                           }
+            },
+    "keywords":  [
+                     "dsh-plugin",
+                     "dsh",
+                     "deepseek-harness",
+                     "code-studio",
+                     "cline",
+                     "diff",
+                     "editor",
+                     "web-ui"
+                 ],
+    "repository":  {
+                       "type":  "git",
+                       "url":  "git+https://github.com/windypro-rourou/dsh-code-studio.git"
+                   },
+    "peerDependencies":  {
+                             "@deepseek-ai/cordis":  "^4.0.1",
+                             "react":  "^18.2.0"
+                         },
+    "files":  [
+                  "lib/**/*.js",
+                  "lib/**/*.d.ts",
+                  "cordis.patch.yml",
+                  "README.md",
+                  "scripts"
+              ],
+    "license":  "MIT"
+}