@akira-tl/forgerelay 0.2.0 → 0.2.2

package/dist/server.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { access, realpath } from "node:fs/promises";
+import { tmpdir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
@@ -13,12 +14,13 @@ import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE, } from "@mode
 import express from "express";
 import * as z from "zod/v4";
 import { applyPatch } from "./apply-patch.js";
+import { deletePath, renamePath } from "./file-mutations.js";
 import { isArtifactDownloadSupportedPlatform, registerArtifactTools, } from "./artifact-tools.js";
 import { loadConfig } from "./config.js";
 import { attachHookReports, HookRunner, runToolWithHooks } from "./hooks.js";
 import { buildServerInstructions, buildToolDescriptions, toolNames, } from "./mcp/server-instructions.js";
 import { createOpenAIIncomingArtifactAdapter, } from "./incoming-artifacts.js";
-import { logEvent, requestIp, requestPath, commandPreview, sessionIdPrefix, } from "./logger.js";
+import { logEvent, requestIp, requestPath, commandPreview, sessionIdPrefix, workspaceLogLabel, } from "./logger.js";
 import { editFileTool, findFilesTool, grepFilesTool, listDirectoryTool, readFileTool, runShellTool, writeFileTool, } from "./pi-tools.js";
 import { SingleUserOAuthProvider } from "./oauth-provider.js";
 import { McpSessionRegistry, } from "./mcp-sessions.js";
@@ -78,6 +80,13 @@ function toolWidgetDescriptorMeta(config, kind) {
         },
     };
 }
+function workspaceLogContext(workspace, sessionId) {
+    return {
+        workspaceId: workspace.id,
+        workspace: workspaceLogLabel(workspace.root, workspace.id),
+        session: sessionIdPrefix(sessionId),
+    };
+}
 function formatVisibleAgent(agent) {
     const model = agent.model ? `, model ${agent.model}` : "";
     const thinking = agent.thinking ? `, thinking ${agent.thinking}` : "";
@@ -393,7 +402,7 @@ function registerCodexProcessTools(server, config, workspaces, processSessions,
         outputSchema: processOutputSchema(),
         ...toolWidgetDescriptorMeta(config, "shell"),
         annotations: SHELL_TOOL_ANNOTATIONS,
-    }, async ({ workspaceId, cmd, tty, columns, rows, workingDirectory, yieldTimeMs, maxOutputTokens }) => {
+    }, async ({ workspaceId, cmd, tty, columns, rows, workingDirectory, yieldTimeMs, maxOutputTokens }, extra) => {
         const workspace = workspaces.getWorkspace(workspaceId);
         return runToolWithHooks(hooks, {
             tool: "exec_command",
@@ -415,11 +424,14 @@ function registerCodexProcessTools(server, config, workspaces, processSessions,
                 });
                 logToolCall(config, {
                     tool: "exec_command",
-                    workspaceId,
+                    ...workspaceLogContext(workspace, extra.sessionId),
                     workingDirectory: workingDirectory ?? ".",
                     command: cmd,
                     commandLength: cmd.length,
-                    success: true,
+                    exitCode: snapshot.exitCode,
+                    running: snapshot.running,
+                    processSessionId: snapshot.sessionId,
+                    success: snapshot.running || snapshot.exitCode === 0,
                     durationMs: Math.round(performance.now() - startedAt),
                 });
                 return processToolResponse("exec_command", workspaceId, snapshot, {
@@ -459,7 +471,7 @@ function registerCodexProcessTools(server, config, workspaces, processSessions,
         outputSchema: processOutputSchema(),
         ...toolWidgetDescriptorMeta(config, "shell"),
         annotations: SHELL_TOOL_ANNOTATIONS,
-    }, async ({ workspaceId, sessionId, chars, columns, rows, yieldTimeMs, maxOutputTokens }) => {
+    }, async ({ workspaceId, sessionId, chars, columns, rows, yieldTimeMs, maxOutputTokens }, extra) => {
         const workspace = workspaces.getWorkspace(workspaceId);
         return runToolWithHooks(hooks, {
             tool: "write_stdin",
@@ -483,8 +495,11 @@ function registerCodexProcessTools(server, config, workspaces, processSessions,
                 });
                 logToolCall(config, {
                     tool: "write_stdin",
-                    workspaceId,
-                    success: true,
+                    ...workspaceLogContext(workspace, extra.sessionId),
+                    exitCode: snapshot.exitCode,
+                    running: snapshot.running,
+                    processSessionId: snapshot.sessionId,
+                    success: snapshot.running || snapshot.exitCode === 0,
                     durationMs: Math.round(performance.now() - startedAt),
                 });
                 return processToolResponse("write_stdin", workspaceId, snapshot, {
@@ -597,7 +612,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             idempotentHint: false,
             openWorldHint: false,
         },
-    }, async ({ path, mode, baseRef, newWorktree }, { _meta }) => {
+    }, async ({ path, mode, baseRef, newWorktree }, { _meta, sessionId }) => {
         const startedAt = performance.now();
         const { workspace, agentsFiles, availableAgentsFiles, hookReports, workspaceReused, includeBootstrapContext, } = await workspaces.openWorkspace({ path, mode, baseRef, newWorktree }, { conversationScopeId: openAiConversationScopeId(_meta) });
         const knownWorktrees = await workspaces.listKnownWorktrees(workspace);
@@ -692,7 +707,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         ];
         logToolCall(config, {
             tool: "open_workspace",
-            workspaceId: workspace.id,
+            ...workspaceLogContext(workspace, sessionId),
             path: workspace.root,
             success: true,
             durationMs: Math.round(performance.now() - startedAt),
@@ -772,7 +787,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         }),
         _meta: {},
         annotations: WRITE_TOOL_ANNOTATIONS,
-    }, async ({ workspaceId, commitMessage }) => {
+    }, async ({ workspaceId, commitMessage }, extra) => {
         const workspace = workspaces.getWorkspace(workspaceId);
         return runToolWithHooks(hooks, {
             tool: toolNames.closeWorktree,
@@ -793,7 +808,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 ].join("\n");
                 logToolCall(config, {
                     tool: toolNames.closeWorktree,
-                    workspaceId,
+                    ...workspaceLogContext(workspace, extra.sessionId),
                     path: closed.sourceRoot,
                     success: true,
                     durationMs: Math.round(performance.now() - startedAt),
@@ -825,8 +840,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             path: z
                 .string()
                 .describe(config.skillsEnabled
-                ? "File path to read, relative to the workspace root. May also be an advertised skill path from open_workspace skills."
-                : "File path to read, relative to the workspace root."),
+                ? "File path to read, relative to the workspace root or absolute inside the OS temp directory. May also be an advertised skill path from open_workspace skills."
+                : "File path to read, relative to the workspace root or absolute inside the OS temp directory."),
             offset: z
                 .number()
                 .int()
@@ -843,7 +858,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         outputSchema: resultOutputSchema(),
         ...toolWidgetDescriptorMeta(config, "read"),
         annotations: { readOnlyHint: true },
-    }, async ({ workspaceId, ...input }) => {
+    }, async ({ workspaceId, ...input }, extra) => {
         const workspace = workspaces.getWorkspace(workspaceId);
         return runToolWithHooks(hooks, {
             tool: toolNames.read,
@@ -861,7 +876,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 if (response.isError) {
                     logFailedToolResponse(config, {
                         tool: toolNames.read,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                     }, response.content, startedAt);
                     return response;
@@ -874,7 +889,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 };
                 logToolCall(config, {
                     tool: toolNames.read,
-                    workspaceId,
+                    ...workspaceLogContext(workspace, extra.sessionId),
                     path: input.path,
                     success: true,
                     durationMs: Math.round(performance.now() - startedAt),
@@ -907,13 +922,13 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     .describe("Workspace identifier returned by open_workspace."),
                 path: z
                     .string()
-                    .describe("File path to write, relative to the workspace root."),
+                    .describe("File path to write, relative to the workspace root or absolute inside the OS temp directory."),
                 content: z.string().describe("Complete new file content."),
             },
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "write"),
             annotations: WRITE_TOOL_ANNOTATIONS,
-        }, async ({ workspaceId, ...input }) => {
+        }, async ({ workspaceId, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.write,
@@ -923,15 +938,15 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 changedPaths: (result) => toolResultIsError(result) ? [] : [input.path],
                 operation: async () => {
                     const startedAt = performance.now();
-                    workspaces.resolvePath(workspace, input.path);
                     const response = await writeFileTool(input, {
                         cwd: workspace.root,
                         root: workspace.root,
+                        fileRoots: workspaces.fileToolRoots(workspace),
                     });
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.write,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             path: input.path,
                         }, response.content, startedAt);
                         return response;
@@ -945,7 +960,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     };
                     logToolCall(config, {
                         tool: toolNames.write,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
@@ -980,7 +995,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     .describe("Workspace identifier returned by open_workspace."),
                 path: z
                     .string()
-                    .describe("File path to edit, relative to the workspace root."),
+                    .describe("File path to edit, relative to the workspace root or absolute inside the OS temp directory."),
                 edits: z
                     .array(z.object({
                     oldText: z
@@ -995,7 +1010,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             }),
             ...toolWidgetDescriptorMeta(config, "edit"),
             annotations: EDIT_TOOL_ANNOTATIONS,
-        }, async ({ workspaceId, ...input }) => {
+        }, async ({ workspaceId, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.edit,
@@ -1005,15 +1020,15 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 changedPaths: (result) => toolResultIsError(result) ? [] : [input.path],
                 operation: async () => {
                     const startedAt = performance.now();
-                    workspaces.resolvePath(workspace, input.path);
                     const response = await editFileTool(input, {
                         cwd: workspace.root,
                         root: workspace.root,
+                        fileRoots: workspaces.fileToolRoots(workspace),
                     });
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.edit,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             path: input.path,
                         }, response.content, startedAt);
                         return response;
@@ -1027,7 +1042,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     const editContent = [textBlock(editResultText)];
                     logToolCall(config, {
                         tool: toolNames.edit,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
@@ -1055,6 +1070,148 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             });
         });
     }
+    registerAppTool(server, toolNames.rename, {
+        title: "Rename path",
+        description: toolDescriptions.rename,
+        inputSchema: {
+            workspaceId: z.string().describe("Workspace identifier returned by open_workspace."),
+            path: z.string().describe("Source file or directory path relative to the workspace root, or absolute inside the OS temp directory."),
+            newPath: z.string().describe("Destination path relative to the workspace root, or absolute inside the OS temp directory. The destination must not already exist."),
+        },
+        outputSchema: resultOutputSchema({
+            status: z.literal("renamed"),
+            path: z.string(),
+            newPath: z.string(),
+        }),
+        ...toolWidgetDescriptorMeta(config, "edit"),
+        annotations: EDIT_TOOL_ANNOTATIONS,
+    }, async ({ workspaceId, path, newPath }, extra) => {
+        const workspace = workspaces.getWorkspace(workspaceId);
+        return runToolWithHooks(hooks, {
+            tool: toolNames.rename,
+            invocation: workspaceHookInvocation(workspace),
+            payload: { path, newPath, paths: [path, newPath] },
+            changedPaths: () => [path, newPath],
+            operation: async () => {
+                const startedAt = performance.now();
+                try {
+                    await renamePath({ path, newPath }, {
+                        cwd: workspace.root,
+                        allowedRoots: workspaces.fileToolRoots(workspace),
+                    });
+                    const result = `Renamed ${path} to ${newPath}.`;
+                    const content = [textBlock(result)];
+                    logToolCall(config, {
+                        tool: toolNames.rename,
+                        ...workspaceLogContext(workspace, extra.sessionId),
+                        path: `${path} -> ${newPath}`,
+                        success: true,
+                        durationMs: Math.round(performance.now() - startedAt),
+                    });
+                    return {
+                        content,
+                        _meta: {
+                            tool: toolNames.rename,
+                            card: {
+                                workspaceId,
+                                path: newPath,
+                                summary: { previousPath: path },
+                                payload: { content },
+                            },
+                        },
+                        structuredContent: {
+                            result,
+                            status: "renamed",
+                            path,
+                            newPath,
+                        },
+                    };
+                }
+                catch (error) {
+                    logToolCall(config, {
+                        tool: toolNames.rename,
+                        ...workspaceLogContext(workspace, extra.sessionId),
+                        path: `${path} -> ${newPath}`,
+                        success: false,
+                        durationMs: Math.round(performance.now() - startedAt),
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                    throw error;
+                }
+            },
+        });
+    });
+    registerAppTool(server, toolNames.delete, {
+        title: "Delete path",
+        description: toolDescriptions.delete,
+        inputSchema: {
+            workspaceId: z.string().describe("Workspace identifier returned by open_workspace."),
+            path: z.string().describe("File or directory path relative to the workspace root, or absolute inside the OS temp directory."),
+            recursive: z.boolean().optional().describe("Delete a non-empty directory tree. Defaults to false."),
+        },
+        outputSchema: resultOutputSchema({
+            status: z.literal("deleted"),
+            path: z.string(),
+            recursive: z.boolean(),
+        }),
+        ...toolWidgetDescriptorMeta(config, "edit"),
+        annotations: EDIT_TOOL_ANNOTATIONS,
+    }, async ({ workspaceId, path, recursive }, extra) => {
+        const workspace = workspaces.getWorkspace(workspaceId);
+        return runToolWithHooks(hooks, {
+            tool: toolNames.delete,
+            invocation: workspaceHookInvocation(workspace),
+            payload: { path, recursive: recursive ?? false },
+            changedPaths: () => [path],
+            operation: async () => {
+                const startedAt = performance.now();
+                try {
+                    const deleted = await deletePath({ path, recursive }, {
+                        cwd: workspace.root,
+                        allowedRoots: workspaces.fileToolRoots(workspace),
+                    });
+                    const result = `Deleted ${path}${deleted.recursive ? " recursively" : ""}.`;
+                    const content = [textBlock(result)];
+                    logToolCall(config, {
+                        tool: toolNames.delete,
+                        ...workspaceLogContext(workspace, extra.sessionId),
+                        path,
+                        success: true,
+                        durationMs: Math.round(performance.now() - startedAt),
+                    });
+                    return {
+                        content,
+                        _meta: {
+                            tool: toolNames.delete,
+                            card: {
+                                workspaceId,
+                                path,
+                                summary: { recursive: deleted.recursive },
+                                payload: { content },
+                            },
+                        },
+                        structuredContent: {
+                            result,
+                            status: "deleted",
+                            path,
+                            recursive: deleted.recursive,
+                        },
+                    };
+                }
+                catch (error) {
+                    logToolCall(config, {
+                        tool: toolNames.delete,
+                        ...workspaceLogContext(workspace, extra.sessionId),
+                        path,
+                        success: false,
+                        durationMs: Math.round(performance.now() - startedAt),
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                    throw error;
+                }
+            },
+        });
+    });
     if (config.toolMode === "codex") {
         registerAppTool(server, "apply_patch", {
             title: "Apply patch",
@@ -1078,7 +1235,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             }),
             ...toolWidgetDescriptorMeta(config, "edit"),
             annotations: EDIT_TOOL_ANNOTATIONS,
-        }, async ({ workspaceId, patch }) => {
+        }, async ({ workspaceId, patch }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: "apply_patch",
@@ -1088,7 +1245,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     .filter((path) => Boolean(path)))),
                 operation: async () => {
                     const startedAt = performance.now();
-                    const applied = await applyPatch(workspace.root, patch);
+                    const applied = await applyPatch(workspace.root, patch, [tmpdir()]);
                     const paths = applied.files.map((file) => file.path).join(", ");
                     const result = `Applied patch to ${applied.files.length} file(s): ${paths}`;
                     const content = [textBlock(result)];
@@ -1097,7 +1254,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                         : `${applied.files.length} files`;
                     logToolCall(config, {
                         tool: "apply_patch",
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
+                        path: displayPath,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
                     });
@@ -1140,7 +1298,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "show_changes"),
             annotations: { readOnlyHint: true },
-        }, async ({ workspaceId }) => {
+        }, async ({ workspaceId }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: "show_changes",
@@ -1155,7 +1313,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     const content = [textBlock(review.result)];
                     logToolCall(config, {
                         tool: "show_changes",
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
                     });
@@ -1183,7 +1341,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
     if (config.toolMode === "full") {
         registerAppTool(server, toolNames.grep, {
             title: "Grep",
-            description: "Search file contents inside an open workspace. Use this before broad reads when looking for symbols, text, or usage sites. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
+            description: "Search file contents inside an open workspace or the OS temp directory. Use this before broad reads when looking for symbols, text, or usage sites. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
                     .string()
@@ -1192,13 +1350,13 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 path: z
                     .string()
                     .optional()
-                    .describe("Optional path or glob scope relative to the workspace root."),
+                    .describe("Optional path or glob scope relative to the workspace root, or an absolute path inside the OS temp directory."),
                 include: z.string().optional().describe("Optional include glob."),
             },
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "search"),
             annotations: { readOnlyHint: true },
-        }, async ({ workspaceId, ...input }) => {
+        }, async ({ workspaceId, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.grep,
@@ -1207,16 +1365,15 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 isFailure: toolResultIsError,
                 operation: async () => {
                     const startedAt = performance.now();
-                    if (input.path)
-                        workspaces.resolvePath(workspace, input.path);
                     const response = await grepFilesTool(input, {
                         cwd: workspace.root,
                         root: workspace.root,
+                        fileRoots: workspaces.fileToolRoots(workspace),
                     });
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.grep,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             path: input.path,
                         }, response.content, startedAt);
                         return response;
@@ -1228,7 +1385,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     };
                     logToolCall(config, {
                         tool: toolNames.grep,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
@@ -1253,7 +1410,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         });
         registerAppTool(server, toolNames.glob, {
             title: "Glob",
-            description: "Find files by glob pattern inside an open workspace. Use this to discover filenames or narrow file sets before reading. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
+            description: "Find files by glob pattern inside an open workspace or the OS temp directory. Use this to discover filenames or narrow file sets before reading. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
                     .string()
@@ -1262,12 +1419,12 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 path: z
                     .string()
                     .optional()
-                    .describe("Optional path scope relative to the workspace root."),
+                    .describe("Optional path scope relative to the workspace root, or an absolute path inside the OS temp directory."),
             },
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "search"),
             annotations: { readOnlyHint: true },
-        }, async ({ workspaceId, ...input }) => {
+        }, async ({ workspaceId, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.glob,
@@ -1276,16 +1433,15 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 isFailure: toolResultIsError,
                 operation: async () => {
                     const startedAt = performance.now();
-                    if (input.path)
-                        workspaces.resolvePath(workspace, input.path);
                     const response = await findFilesTool(input, {
                         cwd: workspace.root,
                         root: workspace.root,
+                        fileRoots: workspaces.fileToolRoots(workspace),
                     });
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.glob,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             path: input.path,
                         }, response.content, startedAt);
                         return response;
@@ -1297,7 +1453,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     };
                     logToolCall(config, {
                         tool: toolNames.glob,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
@@ -1322,19 +1478,19 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         });
         registerAppTool(server, toolNames.ls, {
             title: "Ls",
-            description: "List a directory inside an open workspace. Use this for directory inspection before reading files. Call open_workspace first and pass workspaceId.",
+            description: "List a directory inside an open workspace or the OS temp directory. Use this for directory inspection before reading files. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
                     .string()
                     .describe("Workspace identifier returned by open_workspace."),
                 path: z
                     .string()
-                    .describe("Directory path to list, relative to the workspace root."),
+                    .describe("Directory path to list, relative to the workspace root or absolute inside the OS temp directory."),
             },
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "directory"),
             annotations: { readOnlyHint: true },
-        }, async ({ workspaceId, ...input }) => {
+        }, async ({ workspaceId, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.ls,
@@ -1343,15 +1499,15 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 isFailure: toolResultIsError,
                 operation: async () => {
                     const startedAt = performance.now();
-                    workspaces.resolvePath(workspace, input.path);
                     const response = await listDirectoryTool(input, {
                         cwd: workspace.root,
                         root: workspace.root,
+                        fileRoots: workspaces.fileToolRoots(workspace),
                     });
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.ls,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             path: input.path,
                         }, response.content, startedAt);
                         return response;
@@ -1359,7 +1515,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     const summary = textSummary(response.content);
                     logToolCall(config, {
                         tool: toolNames.ls,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         path: input.path,
                         success: true,
                         durationMs: Math.round(performance.now() - startedAt),
@@ -1408,7 +1564,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "shell"),
             annotations: SHELL_TOOL_ANNOTATIONS,
-        }, async ({ workspaceId, workingDirectory, ...input }) => {
+        }, async ({ workspaceId, workingDirectory, ...input }, extra) => {
             const workspace = workspaces.getWorkspace(workspaceId);
             return runToolWithHooks(hooks, {
                 tool: toolNames.shell,
@@ -1429,7 +1585,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     if (response.isError) {
                         logFailedToolResponse(config, {
                             tool: toolNames.shell,
-                            workspaceId,
+                            ...workspaceLogContext(workspace, extra.sessionId),
                             workingDirectory: workingDirectory ?? ".",
                             command: input.command,
                             commandLength: input.command.length,
@@ -1443,7 +1599,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     };
                     logToolCall(config, {
                         tool: toolNames.shell,
-                        workspaceId,
+                        ...workspaceLogContext(workspace, extra.sessionId),
                         workingDirectory: workingDirectory ?? ".",
                         command: input.command,
                         commandLength: input.command.length,