dsh-git-ui 0.1.0 → 0.1.2

package/lib/contracts/host-endpoints.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Host 端点契约：纯业务逻辑，零框架依赖。
+ *
+ * 将 `snapshotForSession` / `runAction` / `runQuery` 聚合为统一的
+ * `HostEndpoints` 接口——宿主适配层（Cordis/typert 或其他框架）只需调用
+ * `createHostEndpoints(deps, config)` 即可获得全部端点方法，再以任何
+ * RPC 机制暴露。业务层对此一无所知。
+ */
+import { type GitStatusConfig, type SnapshotDeps } from '../host/core.ts';
+import type { GitActionRequest, GitActionResult, GitQueryRequest, GitQueryResponse, GitSnapshotRequest, GitSnapshotResult } from '../host/types.ts';
+/**
+ * 业务端点集合：三个 RPC 方法的纯函数实现。
+ * 每个方法接收 wire 请求、可选取消信号，返回 wire 响应。
+ */
+export interface HostEndpoints {
+    snapshot(request: GitSnapshotRequest, signal?: AbortSignal): Promise<GitSnapshotResult>;
+    run(request: GitActionRequest, signal?: AbortSignal): Promise<GitActionResult>;
+    query(request: GitQueryRequest, signal?: AbortSignal): Promise<GitQueryResponse>;
+}
+/**
+ * 构造业务端点实例。
+ *
+ * `deps` 携带全部宿主能力（子进程、会话查找、文件系统）；`config` 携带
+ * 运行参数。两者均为结构化接口，与任何框架无关。返回的端点对象可直接
+ * 绑定到 RPC 装饰器、HTTP 路由、或测试桩。
+ */
+export declare function createHostEndpoints(deps: SnapshotDeps, config: GitStatusConfig): HostEndpoints;

package/lib/host/index.d.ts

@@ -1,28 +1,36 @@
 /**
- * dsh-git-ui host half: the `gitInfo` Remote service.
+ * dsh-git-ui host 适配层：Cordis/typert 壳。
  *
- * Cordis shell only — every behavior lives in `core.ts`/`actions.ts`/
- * `queries.ts` behind injected structural faces, so tests never need a
- * cordis runtime. The class is a plugin in its own right (class form),
- * mounted by the bundle patch row with the package name; the gateway exposes
- * `gitInfo/snapshot`, `gitInfo/run` and `gitInfo/query` through SRC
- * discovery (`typertRemote` binding + `@Remote` marker).
+ * 本文件是 host 端**唯一** import `@deepseek-ai/*` 的地方。职责：
+ *   1. 将 Cordis 服务（subprocess / sessions / sessionPersistence）适配为
+ *      结构化 `SnapshotDeps` 接口；
+ *   2. 调用 `createHostEndpoints(deps, config)` 获得纯业务端点；
+ *   3. 以 `@Remote` 装饰器将端点暴露给 typert Gateway。
+ *
+ * 业务逻辑全部在 `contracts/host-endpoints.ts` → `host/core.ts` /
+ * `host/actions.ts` / `host/queries.ts`，与框架无关。
  */
 import { TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 import type { Context } from '@deepseek-ai/cordis';
-import type { GitActionResult, GitActionRequest, GitQueryRequest, GitQueryResponse, GitSnapshotRequest, GitSnapshotResult } from './types.ts';
+import type { GitActionRequest, GitActionResult, GitQueryRequest, GitQueryResponse, GitSnapshotRequest, GitSnapshotResult } from './types.ts';
 export type { GitSnapshot, GitSnapshotResult, GitSnapshotFailure, GitSnapshotRequest, GitCommit, GitChange, GitAction, GitActionResult, GitActionRequest, GitQuery, GitQueryResult, GitQueryRequest, GitQueryResponse, GitBranch, GitFileStat, GitRef } from './types.ts';
 export { normalizeConfig, DEFAULT_CONFIG } from './core.ts';
 export { parseStatusOutput, parseLogOutput, parseBranchOutput, parseNameStatusOutput } from './parser.ts';
 export { isSafePath, isValidBranchName, runAction } from './actions.ts';
 export { runQuery } from './queries.ts';
-/** The `gitInfo` service: `snapshot` (read) and `run` (management) endpoints. */
+export { createHostEndpoints, type HostEndpoints } from '../contracts/host-endpoints.ts';
+/**
+ * gitInfo Remote 服务：Cordis 壳。
+ *
+ * 构造时从 Cordis Context 取出宿主服务，适配为 `SnapshotDeps`，再调用
+ * `createHostEndpoints` 获得纯业务端点。三个 `@Remote` 方法仅做委托。
+ */
 export declare class GitStatusService extends TypertRemoteService {
     static inject: string[];
-    private readonly config;
+    private readonly endpoints;
     constructor(ctx: Context, config: unknown);
-    /** Adapter face shared by both endpoints (injected services + runner). */
-    private deps;
+    /** 将 Cordis 服务适配为结构化 SnapshotDeps。 */
+    private buildDeps;
     snapshot(request: GitSnapshotRequest, signal?: AbortSignal): Promise<GitSnapshotResult>;
     run(request: GitActionRequest, signal?: AbortSignal): Promise<GitActionResult>;
     query(request: GitQueryRequest, signal?: AbortSignal): Promise<GitQueryResponse>;

package/lib/host/index.js

@@ -739,62 +739,82 @@ function gitError(label, stderr, stdout) {
   };
 }
 
+// src/contracts/host-endpoints.ts
+function createHostEndpoints(deps, config) {
+  return {
+    snapshot(request, signal) {
+      const merged = mergeSignals(deps.signal, signal);
+      const effectiveDeps = merged === deps.signal ? deps : { ...deps, signal: merged };
+      return snapshotForSession(effectiveDeps, config, request.sessionId);
+    },
+    run(request, signal) {
+      const merged = mergeSignals(deps.signal, signal);
+      const effectiveDeps = merged === deps.signal ? deps : { ...deps, signal: merged };
+      return runAction(effectiveDeps, config, request);
+    },
+    query(request, signal) {
+      const merged = mergeSignals(deps.signal, signal);
+      const effectiveDeps = merged === deps.signal ? deps : { ...deps, signal: merged };
+      return runQuery(effectiveDeps, config, request);
+    }
+  };
+}
+function mergeSignals(a, b) {
+  if (a === void 0) return b;
+  if (b === void 0) return a;
+  return AbortSignal.any([a, b]);
+}
+
 // src/host/index.ts
 var _query_dec, _run_dec, _snapshot_dec, _a, _init;
 var GitStatusService = class extends (_a = TypertRemoteService, _snapshot_dec = [Remote("snapshot")], _run_dec = [Remote("run")], _query_dec = [Remote("query")], _a) {
   constructor(ctx, config) {
     super(ctx, "gitInfo");
     __runInitializers(_init, 5, this);
-    __publicField(this, "config");
-    this.config = normalizeConfig(config);
-  }
-  /** Adapter face shared by both endpoints (injected services + runner). */
-  deps(signal) {
-    const subprocess = this.ctx.get("subprocess");
+    __publicField(this, "endpoints");
+    const normalizedConfig = normalizeConfig(config);
+    const deps = this.buildDeps(ctx, normalizedConfig);
+    this.endpoints = createHostEndpoints(deps, normalizedConfig);
+  }
+  /** 将 Cordis 服务适配为结构化 SnapshotDeps。 */
+  buildDeps(ctx, config) {
+    const subprocess = ctx.get("subprocess");
     if (subprocess === void 0) {
-      return { failure: { code: "git-unavailable", detail: "subprocess service unavailable" } };
+      return {
+        run: { run: async () => {
+          throw new Error("subprocess service unavailable");
+        } },
+        fs: { realpath, stat },
+        sessions: { liveCwd: () => void 0, persistedMeta: async () => void 0 }
+      };
     }
-    const sessions = this.ctx.get("sessions");
-    const persistence = this.ctx.get("sessionPersistence");
-    const runner = createGitRunner(subprocess, this.config.timeoutMs, this.config.maxStatusBytes);
+    const sessions = ctx.get("sessions");
+    const persistence = ctx.get("sessionPersistence");
     return {
-      deps: {
-        run: runner,
-        fs: { realpath, stat },
-        sessions: {
-          liveCwd: (id) => sessions?.get(id)?.header?.cwd,
-          persistedMeta: async (id) => {
-            if (persistence === void 0) return void 0;
-            try {
-              const inspection = await persistence.inspect(id);
-              return { cwd: inspection.meta.cwd };
-            } catch {
-              return void 0;
-            }
+      run: createGitRunner(subprocess, config.timeoutMs, config.maxStatusBytes),
+      fs: { realpath, stat },
+      sessions: {
+        liveCwd: (id) => sessions?.get(id)?.header?.cwd,
+        persistedMeta: async (id) => {
+          if (persistence === void 0) return void 0;
+          try {
+            const inspection = await persistence.inspect(id);
+            return { cwd: inspection.meta.cwd };
+          } catch {
+            return void 0;
           }
-        },
-        signal
+        }
       }
     };
   }
   async snapshot(request, signal) {
-    const adapted = this.deps(signal);
-    if ("failure" in adapted) return { ok: false, error: adapted.failure };
-    return snapshotForSession(adapted.deps, this.config, request.sessionId);
+    return this.endpoints.snapshot(request, signal);
   }
   async run(request, signal) {
-    const adapted = this.deps(signal);
-    if ("failure" in adapted) {
-      return { ok: false, error: { code: "git-error", message: adapted.failure.detail } };
-    }
-    return runAction(adapted.deps, this.config, request);
+    return this.endpoints.run(request, signal);
   }
   async query(request, signal) {
-    const adapted = this.deps(signal);
-    if ("failure" in adapted) {
-      return { ok: false, error: { code: "git-error", message: adapted.failure.detail } };
-    }
-    return runQuery(adapted.deps, this.config, request);
+    return this.endpoints.query(request, signal);
   }
 };
 _init = __decoratorStart(_a);
@@ -807,6 +827,7 @@ var index_default = GitStatusService;
 export {
   DEFAULT_CONFIG,
   GitStatusService,
+  createHostEndpoints,
   index_default as default,
   isSafePath,
   isValidBranchName,