@civilization/dsh-git-workbench 0.4.0 → 0.4.1

package/lib/index.js

@@ -1157,118 +1157,215 @@ function registerGitTool(ctx, resolveDir) {
 /** Cordis plugin name */
 const name = "@civilization/dsh-git-workbench";
 /** Required host services */
-const inject = ["connection", "webServer"];
+const inject = [
+	"webServer",
+	"sessions",
+	"sandboxPolicy"
+];
 /**
-* Apply the Git host plugin.
-* Sets up authenticated RPC handlers under `/git/*` and registers the model tool.
-* @param ctx - Context carrying the connection and optional session services.
+* Execute Git operations based on requested endpoint and payload.
 */
-function apply(ctx) {
-	const host = ctx;
-	const resolveTargetDir = (sessionId) => {
-		if (sessionId) {
-			const liveCwd = host.sessions?.get(sessionId)?.header?.cwd;
-			if (liveCwd) return liveCwd;
-		}
-		return host.sandboxPolicy?.workspaceRoot ?? process.cwd();
-	};
-	host.connection.rpc.handle("/git", async (endpoint, payload, _signal) => {
+async function executeGitEndpoint(endpoint, payload, resolveTargetDir) {
+	try {
 		const body = typeof payload === "object" && payload !== null ? payload : {};
 		const sessionId = typeof body.sessionId === "string" ? body.sessionId : void 0;
 		const cwd = typeof body.path === "string" ? body.path : resolveTargetDir(sessionId);
-		try {
-			if (endpoint === "status") return {
-				ok: true,
-				value: await getGitStatus(cwd)
-			};
-			if (endpoint === "log") return {
-				ok: true,
-				value: await getGitLog(cwd, typeof body.maxCount === "number" ? body.maxCount : 50)
-			};
-			if (endpoint === "commitDetails") return {
+		if (endpoint === "status") return {
+			ok: true,
+			value: await getGitStatus(cwd)
+		};
+		if (endpoint === "log") return {
+			ok: true,
+			value: await getGitLog(cwd, typeof body.maxCount === "number" ? body.maxCount : 50)
+		};
+		if (endpoint === "commitDetails") return {
+			ok: true,
+			value: await getGitCommitDetails(cwd, typeof body.commit === "string" ? body.commit : "")
+		};
+		if (endpoint === "diff") {
+			const path = typeof body.filePath === "string" ? body.filePath : void 0;
+			const staged = typeof body.staged === "boolean" ? body.staged : false;
+			const commit = typeof body.commit === "string" ? body.commit : void 0;
+			return {
 				ok: true,
-				value: await getGitCommitDetails(cwd, typeof body.commit === "string" ? body.commit : "")
+				value: await getGitDiff(cwd, {
+					...path !== void 0 ? { path } : {},
+					staged,
+					...commit !== void 0 ? { commit } : {}
+				})
 			};
-			if (endpoint === "diff") {
-				const path = typeof body.filePath === "string" ? body.filePath : void 0;
-				const staged = typeof body.staged === "boolean" ? body.staged : false;
-				const commit = typeof body.commit === "string" ? body.commit : void 0;
-				return {
-					ok: true,
-					value: await getGitDiff(cwd, {
-						...path !== void 0 ? { path } : {},
-						staged,
-						...commit !== void 0 ? { commit } : {}
-					})
-				};
+		}
+		if (endpoint === "branches") return {
+			ok: true,
+			value: await getGitAllBranches(cwd)
+		};
+		if (endpoint === "checkout") return {
+			ok: true,
+			value: await gitCheckout(cwd, typeof body.branch === "string" ? body.branch : "", typeof body.create === "boolean" ? body.create : false)
+		};
+		if (endpoint === "stage") return {
+			ok: true,
+			value: await gitStage(cwd, Array.isArray(body.paths) ? body.paths : body.paths === "all" ? "all" : typeof body.path === "string" ? [body.path] : "all")
+		};
+		if (endpoint === "unstage") return {
+			ok: true,
+			value: await gitUnstage(cwd, Array.isArray(body.paths) ? body.paths : body.paths === "all" ? "all" : typeof body.path === "string" ? [body.path] : "all")
+		};
+		if (endpoint === "discard") return {
+			ok: true,
+			value: await gitDiscard(cwd, Array.isArray(body.paths) ? body.paths : typeof body.path === "string" ? [body.path] : [])
+		};
+		if (endpoint === "commit") return {
+			ok: true,
+			value: await gitCommit(cwd, typeof body.message === "string" ? body.message : "")
+		};
+		if (endpoint === "fetch") return {
+			ok: true,
+			value: await gitFetch(cwd)
+		};
+		if (endpoint === "pull") return {
+			ok: true,
+			value: await gitPull(cwd)
+		};
+		if (endpoint === "push") return {
+			ok: true,
+			value: await gitPush(cwd)
+		};
+		if (endpoint === "tags") return {
+			ok: true,
+			value: await getGitTags(cwd)
+		};
+		if (endpoint === "createTag") return {
+			ok: true,
+			value: await gitCreateTag(cwd, typeof body.name === "string" ? body.name : "", typeof body.commit === "string" ? body.commit : void 0, typeof body.message === "string" ? body.message : void 0)
+		};
+		if (endpoint === "deleteTag") return {
+			ok: true,
+			value: await gitDeleteTag(cwd, typeof body.name === "string" ? body.name : "")
+		};
+		return {
+			ok: false,
+			error: {
+				code: "git/not_found",
+				message: `Unknown git RPC endpoint: ${endpoint}`,
+				details: {}
 			}
-			if (endpoint === "branches") return {
-				ok: true,
-				value: await getGitAllBranches(cwd)
-			};
-			if (endpoint === "checkout") return {
-				ok: true,
-				value: await gitCheckout(cwd, typeof body.branch === "string" ? body.branch : "", typeof body.create === "boolean" ? body.create : false)
-			};
-			if (endpoint === "stage") return {
-				ok: true,
-				value: await gitStage(cwd, Array.isArray(body.paths) ? body.paths : body.paths === "all" ? "all" : typeof body.path === "string" ? [body.path] : "all")
-			};
-			if (endpoint === "unstage") return {
-				ok: true,
-				value: await gitUnstage(cwd, Array.isArray(body.paths) ? body.paths : body.paths === "all" ? "all" : typeof body.path === "string" ? [body.path] : "all")
-			};
-			if (endpoint === "discard") return {
-				ok: true,
-				value: await gitDiscard(cwd, Array.isArray(body.paths) ? body.paths : typeof body.path === "string" ? [body.path] : [])
-			};
-			if (endpoint === "commit") return {
-				ok: true,
-				value: await gitCommit(cwd, typeof body.message === "string" ? body.message : "")
-			};
-			if (endpoint === "fetch") return {
-				ok: true,
-				value: await gitFetch(cwd)
-			};
-			if (endpoint === "pull") return {
-				ok: true,
-				value: await gitPull(cwd)
-			};
-			if (endpoint === "push") return {
-				ok: true,
-				value: await gitPush(cwd)
-			};
-			if (endpoint === "tags") return {
-				ok: true,
-				value: await getGitTags(cwd)
-			};
-			if (endpoint === "createTag") return {
-				ok: true,
-				value: await gitCreateTag(cwd, typeof body.name === "string" ? body.name : "", typeof body.commit === "string" ? body.commit : void 0, typeof body.message === "string" ? body.message : void 0)
-			};
-			if (endpoint === "deleteTag") return {
-				ok: true,
-				value: await gitDeleteTag(cwd, typeof body.name === "string" ? body.name : "")
-			};
-			return {
-				ok: false,
-				error: {
-					code: "git/not_found",
-					message: `Unknown git RPC endpoint: ${endpoint}`,
-					details: {}
+		};
+	} catch (error) {
+		return {
+			ok: false,
+			error: {
+				code: "git/error",
+				message: error instanceof Error ? error.message : String(error),
+				details: {}
+			}
+		};
+	}
+}
+/**
+* Apply the Git host plugin.
+* Sets up direct WebServer HTTP route handlers under `/git/*` and registers the model tool.
+* @param ctx - Context carrying the webServer, sessions, and sandboxPolicy services.
+*/
+function apply(ctx) {
+	const host = ctx;
+	const resolveTargetDir = (sessionId) => {
+		try {
+			if (sessionId) {
+				const liveCwd = host.sessions?.get?.(sessionId)?.header?.cwd;
+				if (liveCwd) return liveCwd;
+			}
+		} catch {}
+		try {
+			const workspaceRoot = host.sandboxPolicy?.workspaceRoot;
+			if (workspaceRoot) return workspaceRoot;
+		} catch {}
+		return process.cwd();
+	};
+	const webServer = ctx.webServer;
+	if (webServer?.register) ctx.effect(() => webServer.register({
+		kind: "prefix",
+		path: "/git",
+		handler: async (req, res) => {
+			try {
+				if (req.method === "OPTIONS") {
+					res.writeHead(204, {
+						"Access-Control-Allow-Origin": "*",
+						"Access-Control-Allow-Methods": "GET, POST, OPTIONS",
+						"Access-Control-Allow-Headers": "Content-Type, Authorization"
+					});
+					return res.end();
 				}
-			};
-		} catch (error) {
-			return {
-				ok: false,
-				error: {
-					code: "git/error",
-					message: error instanceof Error ? error.message : String(error),
-					details: {}
+				if (req.method !== "POST") {
+					res.writeHead(405, { "Content-Type": "application/json" });
+					return res.end(JSON.stringify({
+						ok: false,
+						error: { message: "Method Not Allowed" }
+					}));
 				}
-			};
+				const match = new URL(req.url ?? "/", "http://localhost").pathname.match(/^\/git\/([a-zA-Z0-9_-]+)/);
+				const endpoint = match ? match[1] : void 0;
+				if (!endpoint) {
+					res.writeHead(404, { "Content-Type": "application/json" });
+					return res.end(JSON.stringify({
+						ok: false,
+						error: { message: "Not Found" }
+					}));
+				}
+				let rawBody = "";
+				req.on("data", (chunk) => {
+					rawBody += chunk.toString("utf8");
+				});
+				req.on("end", async () => {
+					try {
+						let body = {};
+						try {
+							if (rawBody.trim()) body = JSON.parse(rawBody);
+						} catch {
+							res.writeHead(400, { "Content-Type": "application/json" });
+							return res.end(JSON.stringify({
+								ok: false,
+								error: { message: "Invalid JSON body" }
+							}));
+						}
+						const rpcId = body?.type === "client-request" ? body.rpcId : void 0;
+						const payload = body?.type === "client-request" ? body.payload ?? {} : body;
+						const result = await executeGitEndpoint(endpoint, payload, resolveTargetDir);
+						res.writeHead(200, {
+							"Content-Type": "application/json; charset=utf-8",
+							"Access-Control-Allow-Origin": "*"
+						});
+						if (rpcId !== void 0) res.end(JSON.stringify({
+							type: "server-response",
+							rpcId,
+							result
+						}));
+						else res.end(JSON.stringify(result));
+					} catch (err) {
+						res.writeHead(500, { "Content-Type": "application/json" });
+						res.end(JSON.stringify({
+							ok: false,
+							error: {
+								code: "git/internal_error",
+								message: err?.message ?? String(err)
+							}
+						}));
+					}
+				});
+			} catch (err) {
+				try {
+					res.writeHead(500, { "Content-Type": "application/json" });
+					res.end(JSON.stringify({
+						ok: false,
+						error: {
+							code: "git/internal_error",
+							message: err?.message ?? String(err)
+						}
+					}));
+				} catch {}
+			}
 		}
-	});
+	}), "git-workbench: /git routes");
 	registerGitTool(ctx, resolveTargetDir);
 }
-export { apply, inject, name };
+export { apply, executeGitEndpoint, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civilization/dsh-git-workbench",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "IntelliJ IDEA-grade Git Workbench, DAG topology graph, branch switcher, tag manager and agent tools for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",

package/src/index.ts

@@ -30,17 +30,9 @@ export type * from './types.ts'
 export const name = '@civilization/dsh-git-workbench'
 
 /** Required host services */
-export const inject = ['connection', 'webServer']
+export const inject = ['webServer', 'sessions', 'sandboxPolicy']
 
 interface HostServices {
-  connection: {
-    rpc: {
-      handle: (
-        channel: string,
-        handler: (endpoint: string, payload: unknown, signal: AbortSignal) => Promise<unknown>
-      ) => () => void
-    }
-  }
   webServer?: {
     register: (route: unknown) => () => void
   }
@@ -53,168 +45,260 @@ interface HostServices {
 }
 
 /**
- * Apply the Git host plugin.
- * Sets up authenticated RPC handlers under `/git/*` and registers the model tool.
- * @param ctx - Context carrying the connection and optional session services.
+ * Execute Git operations based on requested endpoint and payload.
  */
-export function apply(ctx: Context): void {
-  const host = ctx as any as HostServices
-  const resolveTargetDir = (sessionId?: string): string => {
-    if (sessionId) {
-      const liveCwd = host.sessions?.get(sessionId)?.header?.cwd
-      if (liveCwd) return liveCwd
+export async function executeGitEndpoint(
+  endpoint: string,
+  payload: unknown,
+  resolveTargetDir: (sessionId?: string) => string,
+): Promise<{ ok: true; value: unknown } | { ok: false; error: { code: string; message: string; details: Record<string, unknown> } }> {
+  try {
+    const body = (typeof payload === 'object' && payload !== null ? payload : {}) as Record<string, unknown>
+    const sessionId = typeof body.sessionId === 'string' ? body.sessionId : undefined
+    const cwd = typeof body.path === 'string' ? body.path : resolveTargetDir(sessionId)
+
+    if (endpoint === 'status') {
+      const status = await getGitStatus(cwd)
+      return { ok: true, value: status }
     }
-    const workspaceRoot = host.sandboxPolicy?.workspaceRoot
-    return workspaceRoot ?? process.cwd()
-  }
 
-  // Register dedicated /git RPC channel
-  host.connection.rpc.handle(
-    '/git',
-    async (endpoint: string, payload: unknown, _signal: AbortSignal) => {
-      const body = (typeof payload === 'object' && payload !== null ? payload : {}) as Record<string, unknown>
-      const sessionId = typeof body.sessionId === 'string' ? body.sessionId : undefined
-      const cwd = typeof body.path === 'string' ? body.path : resolveTargetDir(sessionId)
-
-      try {
-        if (endpoint === 'status') {
-          const status = await getGitStatus(cwd)
-          return { ok: true, value: status }
-        }
+    if (endpoint === 'log') {
+      const maxCount = typeof body.maxCount === 'number' ? body.maxCount : 50
+      const commits = await getGitLog(cwd, maxCount)
+      return { ok: true, value: commits }
+    }
 
-        if (endpoint === 'log') {
-          const maxCount = typeof body.maxCount === 'number' ? body.maxCount : 50
-          const commits = await getGitLog(cwd, maxCount)
-          return { ok: true, value: commits }
-        }
+    if (endpoint === 'commitDetails') {
+      const commit = typeof body.commit === 'string' ? body.commit : ''
+      const details = await getGitCommitDetails(cwd, commit)
+      return { ok: true, value: details }
+    }
 
-        if (endpoint === 'commitDetails') {
-          const commit = typeof body.commit === 'string' ? body.commit : ''
-          const details = await getGitCommitDetails(cwd, commit)
-          return { ok: true, value: details }
-        }
+    if (endpoint === 'diff') {
+      const path = typeof body.filePath === 'string' ? body.filePath : undefined
+      const staged = typeof body.staged === 'boolean' ? body.staged : false
+      const commit = typeof body.commit === 'string' ? body.commit : undefined
+      const diff = await getGitDiff(cwd, {
+        ...path !== undefined ? { path } : {},
+        staged,
+        ...commit !== undefined ? { commit } : {},
+      })
+      return { ok: true, value: diff }
+    }
 
-        if (endpoint === 'diff') {
-          const path = typeof body.filePath === 'string' ? body.filePath : undefined
-          const staged = typeof body.staged === 'boolean' ? body.staged : false
-          const commit = typeof body.commit === 'string' ? body.commit : undefined
-          const diff = await getGitDiff(cwd, {
-            ...path !== undefined ? { path } : {},
-            staged,
-            ...commit !== undefined ? { commit } : {},
-          })
-          return { ok: true, value: diff }
-        }
+    if (endpoint === 'branches') {
+      const branches = await getGitAllBranches(cwd)
+      return { ok: true, value: branches }
+    }
 
-        if (endpoint === 'branches') {
-          const branches = await getGitAllBranches(cwd)
-          return { ok: true, value: branches }
-        }
+    if (endpoint === 'checkout') {
+      const branch = typeof body.branch === 'string' ? body.branch : ''
+      const createNew = typeof body.create === 'boolean' ? body.create : false
+      const result = await gitCheckout(cwd, branch, createNew)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'checkout') {
-          const branch = typeof body.branch === 'string' ? body.branch : ''
-          const createNew = typeof body.create === 'boolean' ? body.create : false
-          const result = await gitCheckout(cwd, branch, createNew)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'stage') {
+      const paths = Array.isArray(body.paths)
+        ? (body.paths as string[])
+        : body.paths === 'all'
+          ? 'all'
+          : typeof body.path === 'string'
+            ? [body.path]
+            : 'all'
+      const result = await gitStage(cwd, paths)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'stage') {
-          const paths = Array.isArray(body.paths)
-            ? (body.paths as string[])
-            : body.paths === 'all'
-              ? 'all'
-              : typeof body.path === 'string'
-                ? [body.path]
-                : 'all'
-          const result = await gitStage(cwd, paths)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'unstage') {
+      const paths = Array.isArray(body.paths)
+        ? (body.paths as string[])
+        : body.paths === 'all'
+          ? 'all'
+          : typeof body.path === 'string'
+            ? [body.path]
+            : 'all'
+      const result = await gitUnstage(cwd, paths)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'unstage') {
-          const paths = Array.isArray(body.paths)
-            ? (body.paths as string[])
-            : body.paths === 'all'
-              ? 'all'
-              : typeof body.path === 'string'
-                ? [body.path]
-                : 'all'
-          const result = await gitUnstage(cwd, paths)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'discard') {
+      const paths = Array.isArray(body.paths)
+        ? (body.paths as string[])
+        : typeof body.path === 'string'
+          ? [body.path]
+          : []
+      const result = await gitDiscard(cwd, paths)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'discard') {
-          const paths = Array.isArray(body.paths)
-            ? (body.paths as string[])
-            : typeof body.path === 'string'
-              ? [body.path]
-              : []
-          const result = await gitDiscard(cwd, paths)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'commit') {
+      const message = typeof body.message === 'string' ? body.message : ''
+      const result = await gitCommit(cwd, message)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'commit') {
-          const message = typeof body.message === 'string' ? body.message : ''
-          const result = await gitCommit(cwd, message)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'fetch') {
+      const result = await gitFetch(cwd)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'fetch') {
-          const result = await gitFetch(cwd)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'pull') {
+      const result = await gitPull(cwd)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'pull') {
-          const result = await gitPull(cwd)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'push') {
+      const result = await gitPush(cwd)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'push') {
-          const result = await gitPush(cwd)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'tags') {
+      const tags = await getGitTags(cwd)
+      return { ok: true, value: tags }
+    }
 
-        if (endpoint === 'tags') {
-          const tags = await getGitTags(cwd)
-          return { ok: true, value: tags }
-        }
+    if (endpoint === 'createTag') {
+      const name = typeof body.name === 'string' ? body.name : ''
+      const commit = typeof body.commit === 'string' ? body.commit : undefined
+      const message = typeof body.message === 'string' ? body.message : undefined
+      const result = await gitCreateTag(cwd, name, commit, message)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'createTag') {
-          const name = typeof body.name === 'string' ? body.name : ''
-          const commit = typeof body.commit === 'string' ? body.commit : undefined
-          const message = typeof body.message === 'string' ? body.message : undefined
-          const result = await gitCreateTag(cwd, name, commit, message)
-          return { ok: true, value: result }
-        }
+    if (endpoint === 'deleteTag') {
+      const name = typeof body.name === 'string' ? body.name : ''
+      const result = await gitDeleteTag(cwd, name)
+      return { ok: true, value: result }
+    }
 
-        if (endpoint === 'deleteTag') {
-          const name = typeof body.name === 'string' ? body.name : ''
-          const result = await gitDeleteTag(cwd, name)
-          return { ok: true, value: result }
-        }
+    return {
+      ok: false,
+      error: {
+        code: 'git/not_found',
+        message: `Unknown git RPC endpoint: ${endpoint}`,
+        details: {},
+      },
+    }
+  } catch (error) {
+    return {
+      ok: false,
+      error: {
+        code: 'git/error',
+        message: error instanceof Error ? error.message : String(error),
+        details: {},
+      },
+    }
+  }
+}
 
+/**
+ * Apply the Git host plugin.
+ * Sets up direct WebServer HTTP route handlers under `/git/*` and registers the model tool.
+ * @param ctx - Context carrying the webServer, sessions, and sandboxPolicy services.
+ */
+export function apply(ctx: Context): void {
+  const host = ctx as any as HostServices
 
-        return {
-          ok: false,
-          error: {
-            code: 'git/not_found',
-            message: `Unknown git RPC endpoint: ${endpoint}`,
-            details: {},
-          },
-        }
-      } catch (error) {
-        return {
-          ok: false,
-          error: {
-            code: 'git/error',
-            message: error instanceof Error ? error.message : String(error),
-            details: {},
-          },
-        }
+  const resolveTargetDir = (sessionId?: string): string => {
+    try {
+      if (sessionId) {
+        const liveCwd = host.sessions?.get?.(sessionId)?.header?.cwd
+        if (liveCwd) return liveCwd
       }
-    },
-  )
+    } catch {}
+
+    try {
+      const workspaceRoot = host.sandboxPolicy?.workspaceRoot
+      if (workspaceRoot) return workspaceRoot
+    } catch {}
+
+    return process.cwd()
+  }
+
+  // 1. Direct WebServer route registration (Standard, robust DSH plugin route pattern)
+  const webServer = (ctx as any).webServer
+  if (webServer?.register) {
+    ctx.effect(() => webServer.register({
+      kind: 'prefix',
+      path: '/git',
+      handler: async (req: any, res: any) => {
+        try {
+          if (req.method === 'OPTIONS') {
+            res.writeHead(204, {
+              'Access-Control-Allow-Origin': '*',
+              'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
+              'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+            })
+            return res.end()
+          }
+
+          if (req.method !== 'POST') {
+            res.writeHead(405, { 'Content-Type': 'application/json' })
+            return res.end(JSON.stringify({ ok: false, error: { message: 'Method Not Allowed' } }))
+          }
+
+          const pathname = new URL(req.url ?? '/', 'http://localhost').pathname
+          const match = pathname.match(/^\/git\/([a-zA-Z0-9_-]+)/)
+          const endpoint = match ? match[1] : undefined
 
+          if (!endpoint) {
+            res.writeHead(404, { 'Content-Type': 'application/json' })
+            return res.end(JSON.stringify({ ok: false, error: { message: 'Not Found' } }))
+          }
+
+          let rawBody = ''
+          req.on('data', (chunk: Buffer) => { rawBody += chunk.toString('utf8') })
+          req.on('end', async () => {
+            try {
+              let body: any = {}
+              try {
+                if (rawBody.trim()) body = JSON.parse(rawBody)
+              } catch {
+                res.writeHead(400, { 'Content-Type': 'application/json' })
+                return res.end(JSON.stringify({ ok: false, error: { message: 'Invalid JSON body' } }))
+              }
+
+              const rpcId = body?.type === 'client-request' ? body.rpcId : undefined
+              const payload = body?.type === 'client-request' ? (body.payload ?? {}) : body
+
+              const result = await executeGitEndpoint(endpoint, payload, resolveTargetDir)
+
+              res.writeHead(200, {
+                'Content-Type': 'application/json; charset=utf-8',
+                'Access-Control-Allow-Origin': '*',
+              })
+
+              if (rpcId !== undefined) {
+                res.end(JSON.stringify({
+                  type: 'server-response',
+                  rpcId,
+                  result,
+                }))
+              } else {
+                res.end(JSON.stringify(result))
+              }
+            } catch (err: any) {
+              res.writeHead(500, { 'Content-Type': 'application/json' })
+              res.end(JSON.stringify({
+                ok: false,
+                error: { code: 'git/internal_error', message: err?.message ?? String(err) },
+              }))
+            }
+          })
+        } catch (err: any) {
+          try {
+            res.writeHead(500, { 'Content-Type': 'application/json' })
+            res.end(JSON.stringify({
+              ok: false,
+              error: { code: 'git/internal_error', message: err?.message ?? String(err) },
+            }))
+          } catch {}
+        }
+      },
+    }), 'git-workbench: /git routes')
+  }
 
-  // Register the agent tool
+  // 2. Register the agent tool
   registerGitTool(ctx, resolveTargetDir)
 }