@wingsky-1/dsh-worktree-sidebar 0.2.6 → 0.2.7

package/lib/index.js

@@ -108,24 +108,33 @@ function bindTypert(lookups) {
 }
 
 // ../../shared/loopback.js
-function isLoopbackRequest(request, options = {}) {
+function isLoopbackPeerAddress(request) {
   const address = request.socket?.remoteAddress;
-  if (address !== "127.0.0.1" && address !== "::1" && address !== "::ffff:127.0.0.1") return false;
+  return address === "127.0.0.1" || address === "::1" || address === "::ffff:127.0.0.1";
+}
+function loopbackHostUrlOf(request) {
   const host = request.headers.host;
-  if (typeof host !== "string") return false;
+  if (typeof host !== "string") return void 0;
   let hostUrl;
   try {
     hostUrl = new URL(`http://${host}`);
   } catch {
-    return false;
+    return void 0;
   }
-  if (hostUrl.hostname !== "127.0.0.1" && hostUrl.hostname !== "localhost" && hostUrl.hostname !== "[::1]")
-    return false;
-  if (request.headers["sec-fetch-site"] === "cross-site") {
-    if (!(options.allowCrossSiteNoCors === true && request.headers["sec-fetch-mode"] === "no-cors")) {
-      return false;
-    }
+  if (hostUrl.hostname !== "127.0.0.1" && hostUrl.hostname !== "localhost" && hostUrl.hostname !== "[::1]") {
+    return void 0;
   }
+  return hostUrl;
+}
+function crossSiteRequestAllowed(request, options) {
+  if (request.headers["sec-fetch-site"] !== "cross-site") return true;
+  return options.allowCrossSiteNoCors === true && request.headers["sec-fetch-mode"] === "no-cors";
+}
+function isLoopbackRequest(request, options = {}) {
+  if (!isLoopbackPeerAddress(request)) return false;
+  const hostUrl = loopbackHostUrlOf(request);
+  if (hostUrl === void 0) return false;
+  if (!crossSiteRequestAllowed(request, options)) return false;
   const origin = request.headers.origin;
   if (origin === void 0) return true;
   try {
@@ -306,9 +315,9 @@ function validateRecord(value) {
   const branch = raw["branch"];
   const createdAt = raw["createdAt"];
   const sessionCreatedAt = raw["sessionCreatedAt"];
-  if (typeof repoRoot !== "string" || repoRoot.length === 0)
+  if (!isNonEmptyString(repoRoot))
     return void 0;
-  if (typeof worktreeRoot !== "string" || worktreeRoot.length === 0)
+  if (!isNonEmptyString(worktreeRoot))
     return void 0;
   if (typeof branch !== "string")
     return void 0;
@@ -318,33 +327,49 @@ function validateRecord(value) {
     return void 0;
   return { repoRoot, worktreeRoot, branch, createdAt, sessionCreatedAt };
 }
+function isNonEmptyString(value) {
+  return typeof value === "string" && value.length > 0;
+}
 function parseTable(text) {
-  let parsed;
+  const parsed = parseJsonOrUndefined(text);
+  if (parsed === void 0)
+    return emptyTable();
+  const header = tableHeaderOf(parsed);
+  if (header === void 0)
+    return emptyTable();
+  return { version: BINDINGS_VERSION, revision: header.revision, bindings: recordsOf(header) };
+}
+function parseJsonOrUndefined(text) {
   try {
-    parsed = JSON.parse(text);
+    return JSON.parse(text);
   } catch {
-    return emptyTable();
+    return void 0;
   }
+}
+function tableHeaderOf(parsed) {
   if (typeof parsed !== "object" || parsed === null)
-    return emptyTable();
+    return void 0;
   const raw = parsed;
   if (raw["version"] !== BINDINGS_VERSION)
-    return emptyTable();
+    return void 0;
   const revision2 = raw["revision"];
   if (typeof revision2 !== "number" || !Number.isFinite(revision2) || revision2 < 0)
-    return emptyTable();
+    return void 0;
   const entries = raw["bindings"];
   if (typeof entries !== "object" || entries === null)
-    return emptyTable();
+    return void 0;
+  return { revision: revision2, entries };
+}
+function recordsOf(header) {
   const bindings = {};
-  for (const [sessionId, value] of Object.entries(entries)) {
+  for (const [sessionId, value] of Object.entries(header.entries)) {
     if (sessionId.length === 0)
       continue;
     const record = validateRecord(value);
     if (record !== void 0)
       bindings[sessionId] = record;
   }
-  return { version: BINDINGS_VERSION, revision: revision2, bindings };
+  return bindings;
 }
 function serializeTable(table) {
   return JSON.stringify(table, null, 2) + "\n";
@@ -1223,21 +1248,17 @@ function argBool(args, key) {
 
 // lib/server/tools/impl/session/index.js
 function sessionOf(exec) {
-  if (typeof exec !== "object" || exec === null)
-    return void 0;
   const session = readObject(readObject(exec, "agent"), "session");
   if (session === void 0)
     return void 0;
-  const id = session.id;
+  const id = readField(session, "id");
   if (typeof id !== "string" || id.length === 0)
     return void 0;
   const header = readObject(session, "header");
-  const cwd = header === void 0 ? void 0 : header.cwd;
-  const createdAt = header === void 0 ? void 0 : header.createdAt;
   return {
     id,
-    cwd: typeof cwd === "string" && cwd.length > 0 ? cwd : void 0,
-    createdAt: typeof createdAt === "number" && Number.isFinite(createdAt) ? createdAt : void 0
+    cwd: nonEmptyTextOrUndefined(readField(header, "cwd")),
+    createdAt: finiteNumberOrUndefined(readField(header, "createdAt"))
   };
 }
 function readObject(source, key) {
@@ -1246,8 +1267,44 @@ function readObject(source, key) {
   const value = source[key];
   return typeof value === "object" && value !== null ? value : void 0;
 }
+function readField(source, key) {
+  if (typeof source !== "object" || source === null)
+    return void 0;
+  return source[key];
+}
+function nonEmptyTextOrUndefined(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function finiteNumberOrUndefined(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 
 // lib/server/tools/impl/create/index.js
+async function checkBranch(deps, origin, branch) {
+  if (branch === void 0)
+    return { ok: true };
+  if (await deps.git.checkRefFormat(branch))
+    return { ok: true };
+  return {
+    ok: false,
+    result: resultOf(origin, false, "Not a valid git branch name: " + branch + " (git check-ref-format --branch rejected it).")
+  };
+}
+async function resolveStartPoint(deps, repo, origin, base) {
+  if (base === void 0)
+    return { ok: true };
+  if (base.startsWith("-")) {
+    return {
+      ok: false,
+      result: resultOf(origin, false, "Not a valid start point: " + base + ' (a start point must not begin with "-").')
+    };
+  }
+  const startPoint = await deps.git.resolveCommit(repo, base);
+  if (startPoint === void 0) {
+    return { ok: false, result: resultOf(origin, false, "Not a valid start point: " + base + ".") };
+  }
+  return { ok: true, startPoint };
+}
 function buildCreateTool(deps) {
   return {
     name: "ws_worktree_create",
@@ -1297,20 +1354,13 @@ function buildCreateTool(deps) {
       const origin = read.origin;
       const target = resolveTarget(repo, raw);
       const branch = argString(args, "branch");
-      if (branch !== void 0 && !await deps.git.checkRefFormat(branch)) {
-        return resultOf(origin, false, "Not a valid git branch name: " + branch + " (git check-ref-format --branch rejected it).");
-      }
-      const base = argString(args, "base");
-      if (base !== void 0 && base.startsWith("-")) {
-        return resultOf(origin, false, "Not a valid start point: " + base + ' (a start point must not begin with "-").');
-      }
-      let startPoint;
-      if (base !== void 0) {
-        startPoint = await deps.git.resolveCommit(repo, base);
-        if (startPoint === void 0) {
-          return resultOf(origin, false, "Not a valid start point: " + base + ".");
-        }
-      }
+      const branchCheck = await checkBranch(deps, origin, branch);
+      if (!branchCheck.ok)
+        return branchCheck.result;
+      const start = await resolveStartPoint(deps, repo, origin, argString(args, "base"));
+      if (!start.ok)
+        return start.result;
+      const startPoint = start.startPoint;
       const created = await deps.git.addWorktree(repo, target, branch, startPoint);
       if (!created.ok) {
         return resultOf(origin, false, "git worktree add failed: " + created.reason);
@@ -1331,6 +1381,32 @@ function buildCreateTool(deps) {
 }
 
 // lib/server/tools/impl/remove/index.js
+async function unbindAndRemove(deps, sessionId, origin, force) {
+  const removed = await deps.git.removeWorktree(origin.record.repoRoot, origin.record.worktreeRoot, force);
+  if (!removed.ok) {
+    return resultOf(origin, false, "git worktree remove failed: " + removed.reason + " The binding is unchanged.");
+  }
+  const dropped = await deps.binding.drop(sessionId);
+  if (!dropped.ok) {
+    return resultOf(origin, false, "Removed the worktree directory, but the binding could not be dropped: " + dropped.reason + " It is now stale and will be treated as unbound; call this tool again to retry the unbind.");
+  }
+  const after = await readOrigin(deps, sessionId);
+  if (after.problem !== void 0) {
+    return resultOf(after.origin, true, "Unbound this session and removed the worktree directory with git worktree remove. The Files tab root could not be read back: " + after.problem);
+  }
+  return resultOf(after.origin, true, after.origin.kind === "inherited" ? "Unbound this session and removed the worktree directory with git worktree remove. The Files tab now follows the root inherited from session " + after.origin.ownerSessionId + "." : "Unbound this session and removed the worktree directory with git worktree remove.");
+}
+async function unbindOnly(deps, sessionId, origin) {
+  const dropped = await deps.binding.drop(sessionId);
+  if (!dropped.ok) {
+    return resultOf(origin, false, "Could not persist the unbind: " + dropped.reason);
+  }
+  const after = await readOrigin(deps, sessionId);
+  if (after.problem !== void 0) {
+    return resultOf(after.origin, true, "Unbound this session's own binding. The Files tab root could not be read back: " + after.problem);
+  }
+  return resultOf(after.origin, true, after.origin.kind === "inherited" ? "Unbound this session's own binding. The Files tab now follows the root inherited from session " + after.origin.ownerSessionId + "." : "Unbound the worktree from this session. The directory was left in place; open or refresh the Files tab to return to the session cwd.");
+}
 function inheritedHelp(ownerSessionId, cwd) {
   const main = "Nothing to unbind here: the Files tab root belongs to session " + ownerSessionId + ", not to this session. To stop following it: (1) unbind it in that session with ws_worktree_remove, or (2) bind this session to another worktree with ws_worktree_create / ws_worktree_register.";
   if (cwd === void 0)
@@ -1379,30 +1455,9 @@ function buildRemoveTool(deps) {
       if (force && !removeDirectory) {
         return resultOf(origin, false, "force only applies together with removeDirectory: true; the binding is unchanged.");
       }
-      if (!removeDirectory) {
-        const dropped2 = await deps.binding.drop(session.id);
-        if (!dropped2.ok) {
-          return resultOf(origin, false, "Could not persist the unbind: " + dropped2.reason);
-        }
-        const after2 = await readOrigin(deps, session.id);
-        if (after2.problem !== void 0) {
-          return resultOf(after2.origin, true, "Unbound this session's own binding. The Files tab root could not be read back: " + after2.problem);
-        }
-        return resultOf(after2.origin, true, after2.origin.kind === "inherited" ? "Unbound this session's own binding. The Files tab now follows the root inherited from session " + after2.origin.ownerSessionId + "." : "Unbound the worktree from this session. The directory was left in place; open or refresh the Files tab to return to the session cwd.");
-      }
-      const removed = await deps.git.removeWorktree(origin.record.repoRoot, origin.record.worktreeRoot, force);
-      if (!removed.ok) {
-        return resultOf(origin, false, "git worktree remove failed: " + removed.reason + " The binding is unchanged.");
-      }
-      const dropped = await deps.binding.drop(session.id);
-      if (!dropped.ok) {
-        return resultOf(origin, false, "Removed the worktree directory, but the binding could not be dropped: " + dropped.reason + " It is now stale and will be treated as unbound; call this tool again to retry the unbind.");
-      }
-      const after = await readOrigin(deps, session.id);
-      if (after.problem !== void 0) {
-        return resultOf(after.origin, true, "Unbound this session and removed the worktree directory with git worktree remove. The Files tab root could not be read back: " + after.problem);
-      }
-      return resultOf(after.origin, true, after.origin.kind === "inherited" ? "Unbound this session and removed the worktree directory with git worktree remove. The Files tab now follows the root inherited from session " + after.origin.ownerSessionId + "." : "Unbound this session and removed the worktree directory with git worktree remove.");
+      if (!removeDirectory)
+        return unbindOnly(deps, session.id, origin);
+      return unbindAndRemove(deps, session.id, origin, force);
     }
   };
 }

package/lib/server/tools/impl/bind/index.d.ts

@@ -2,6 +2,11 @@ import type { WorktreeOrigin } from "../../../scope/interface.js";
 import type { AgentFace, ToolsDeps } from "../../deps.js";
 import type { SessionFace } from "../session/index.js";
 import type { ToolResultValue } from "../protocol/index.js";
+/**
+ * 绑定来源的形态。本域内各工具一律从**这里**取，不各自直引 scope/interface：
+ * tools → scope 是域间引用，纪律要求它只出现在一个面上（bind 域已经替本域读过一次）。
+ */
+export type { WorktreeOrigin };
 /** 当前的绑定状态（三个工具的返回信封都要它）。 */
 export interface BindingState {
     readonly bound: boolean;

package/lib/server/tools/impl/remove/index.d.ts

@@ -1,12 +1,3 @@
-/**
- * `ws_worktree_remove`：摘掉登记；只有显式 `removeDirectory` 才连带 `git worktree remove`。
- *
- * 默认不删目录是刻意的：删除可能丢掉未提交改动，而「我只是想换个根」与「我要销毁这个工作区」
- * 是两件事，不该由同一个默认值承担。
- *
- * **继承态不摘任何东西**：本会话没有自己的登记时，右栏的根属于父会话——摘它是改别人的状态，
- * 删目录更是销毁别人的工作区。这一态只如实说明并给出路。
- */
 import type { ToolDefinition } from "@deepseek-ai/dsh-tools";
 import type { ToolsDeps } from "../../deps.js";
 export declare function buildRemoveTool(deps: ToolsDeps): ToolDefinition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wingsky-1/dsh-worktree-sidebar",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Point the current session's right-sidebar file tree at a git worktree without changing the session cwd. 把某个 git worktree 登记给当前会话，使该会话的官方右侧栏文件树根指向该 worktree；会话 cwd 不变。官方提供原生 worktree 会话能力即退役的过渡适配层。",
   "type": "module",
   "main": "lib/index.js",
@@ -59,7 +59,8 @@
     "@deepseek-ai/dsh-api-workspace-files": "0.1.7-rc.2",
     "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.2",
     "@deepseek-ai/dsh-tools": "0.1.7-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.2"
+    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -79,6 +80,9 @@
     },
     "@deepseek-ai/dsh-typert-protocol": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-session": {
+      "optional": true
     }
   },
   "engines": {