@jupyter-ai/acp-client 0.0.7 → 0.0.9

package/README.md

@@ -28,13 +28,13 @@ package also provides a default ACP client implementation as `JaiAcpClient`.
   the persona name, the persona avatar, and the `executable` starting the ACP
   agent server.
 
-For example, the `@Claude-ACP` persona is defined in `claude.py` using less than
+For example, the `@Claude` persona is defined in `claude.py` using less than
 20 lines of code:
 
 ```py
 class ClaudeAcpPersona(BaseAcpPersona):
     def __init__(self, *args, **kwargs):
-        executable = ["claude-code-acp"]
+        executable = ["claude-agent-acp"]
         super().__init__(*args, executable=executable, **kwargs)
 
     @property
@@ -44,19 +44,24 @@ class ClaudeAcpPersona(BaseAcpPersona):
         ))
 
         return PersonaDefaults(
-            name="Claude-ACP",
+            name="Claude",
             description="Claude Code as an ACP agent persona.",
             avatar_path=avatar_path,
             system_prompt="unused"
         )
 ```
 
-Currently, this package provides 2 personas:
+Currently, this package provides 4 personas:
 
-1. `@Claude-ACP`
-   - requires `claude-code-acp`, installed via `npm install -g @zed-industries/claude-code-acp`
-2. `@Kiro`
-   - requires `kiro-cli`, installed from https://kiro.dev
+- `@Claude`
+  - requires `claude-agent-acp`, installed via `npm install -g @zed-industries/claude-agent-acp`
+  - optional env variable `CLAUDE_CODE_EXECUTABLE` points to your custom-installed Claude executable location. By default, claude-agent-acp uses Claude packaged in `@zed-industries/claude-agent-acp`.
+- `@Gemini`
+  - requires `gemini` CLI (>= 0.34.0), installed via https://geminicli.com/
+- `@Kiro`
+  - requires `kiro-cli` (>= 1.25.0, < 2), installed via https://kiro.dev
+- `@Mistral-Vibe`
+  - requires `vibe-acp`, installed via `uv tool install mistral-vibe` or `pip install mistral-vibe`
 
 ## Dependencies
 
@@ -68,8 +73,10 @@ Currently, this package provides 2 personas:
 
 **Optional**
 
-- `claude-code-acp` (enables `@Claude-ACP`)
+- `claude-agent-acp` (enables `@Claude`)
+- `gemini` (enables `@Gemini`)
 - `kiro-cli` (enables `@Kiro`)
+- `mistral-vibe` (enables `@Mistral-Vibe` via the `vibe-acp` command)
 
 ## Install
 

package/lib/diff-view.d.ts

@@ -2,7 +2,9 @@ import { IToolCallDiff } from '@jupyter/chat';
 /**
  * Renders one or more file diffs.
  */
-export declare function DiffView({ diffs, onOpenFile }: {
+export declare function DiffView({ diffs, onOpenFile, toDisplayPath, pendingPermission }: {
     diffs: IToolCallDiff[];
     onOpenFile?: (path: string) => void;
+    toDisplayPath?: (path: string) => string;
+    pendingPermission?: boolean;
 }): JSX.Element;

package/lib/diff-view.js

@@ -1,15 +1,25 @@
 import React from 'react';
+import { PathExt } from '@jupyterlab/coreutils';
 import { structuredPatch } from 'diff';
+import clsx from 'clsx';
 /** Maximum number of diff lines shown before truncation. */
 const MAX_DIFF_LINES = 20;
 /**
  * Renders a single file diff block with filename header, line-level
  * highlighting, and click-to-expand truncation.
  */
-function DiffBlock({ diff, onOpenFile }) {
-    var _a, _b;
+function DiffBlock({ diff, onOpenFile, toDisplayPath, pendingPermission }) {
+    var _a;
     const patch = structuredPatch(diff.path, diff.path, (_a = diff.old_text) !== null && _a !== void 0 ? _a : '', diff.new_text, undefined, undefined, { context: Infinity });
-    const filename = (_b = diff.path.split('/').pop()) !== null && _b !== void 0 ? _b : diff.path;
+    const displayPath = toDisplayPath
+        ? toDisplayPath(diff.path)
+        : PathExt.basename(diff.path);
+    // toDisplayPath makes paths inside the server root relative. A leading '/'
+    // means the file is outside it and cannot be opened via the Contents API.
+    const isOutsideRoot = displayPath.startsWith('/');
+    const isClickable = !!onOpenFile &&
+        !isOutsideRoot &&
+        !(pendingPermission && diff.old_text === undefined);
     const [expanded, setExpanded] = React.useState(false);
     // Flatten hunks into renderable lines
     const allLines = [];
@@ -37,7 +47,9 @@ function DiffBlock({ diff, onOpenFile }) {
     const visible = canTruncate && !expanded ? allLines.slice(0, MAX_DIFF_LINES) : allLines;
     const hiddenCount = allLines.length - MAX_DIFF_LINES;
     return (React.createElement("div", { className: "jp-jupyter-ai-acp-client-diff-block" },
-        React.createElement("div", { className: "jp-jupyter-ai-acp-client-diff-header", onClick: onOpenFile ? () => onOpenFile(diff.path) : undefined, title: diff.path }, filename),
+        React.createElement("div", { className: clsx('jp-jupyter-ai-acp-client-diff-header', {
+                'jp-jupyter-ai-acp-client-diff-header-clickable': isClickable
+            }), onClick: isClickable ? () => onOpenFile(diff.path) : undefined, title: diff.path }, displayPath),
         React.createElement("div", { className: "jp-jupyter-ai-acp-client-diff-content" },
             visible.map((line) => (React.createElement("div", { key: line.key, className: `jp-jupyter-ai-acp-client-diff-line ${line.cls}` },
                 React.createElement("span", { className: "jp-jupyter-ai-acp-client-diff-line-text" },
@@ -53,6 +65,6 @@ function DiffBlock({ diff, onOpenFile }) {
 /**
  * Renders one or more file diffs.
  */
-export function DiffView({ diffs, onOpenFile }) {
-    return (React.createElement("div", { className: "jp-jupyter-ai-acp-client-diff-container" }, diffs.map((d, i) => (React.createElement(DiffBlock, { key: i, diff: d, onOpenFile: onOpenFile })))));
+export function DiffView({ diffs, onOpenFile, toDisplayPath, pendingPermission }) {
+    return (React.createElement("div", { className: "jp-jupyter-ai-acp-client-diff-container" }, diffs.map((d, i) => (React.createElement(DiffBlock, { key: i, diff: d, onOpenFile: onOpenFile, toDisplayPath: toDisplayPath, pendingPermission: pendingPermission })))));
 }

package/lib/tool-calls.js

@@ -1,7 +1,28 @@
 import React from 'react';
+import { PageConfig, PathExt } from '@jupyterlab/coreutils';
 import { submitPermissionDecision } from './request';
 import clsx from 'clsx';
 import { DiffView } from './diff-view';
+/**
+ * Convert an absolute filesystem path to a server-relative path.
+ * Returns the path unchanged if the server root is not set or the path
+ * is outside it.
+ */
+function toServerRelativePath(absolutePath) {
+    const rootUri = PageConfig.getOption('rootUri');
+    const serverRoot = rootUri
+        ? new URL(rootUri).pathname
+        : PageConfig.getOption('serverRoot');
+    if (!serverRoot) {
+        return absolutePath;
+    }
+    const relativePath = PathExt.relative(serverRoot, absolutePath);
+    // Path is outside server root — keep absolute
+    if (relativePath.startsWith('..')) {
+        return absolutePath;
+    }
+    return relativePath;
+}
 /**
  * Preamble component that renders tool call status lines above message body.
  * Returns null if the message has no tool calls.
@@ -14,7 +35,7 @@ export function ToolCallsComponent(props) {
     }
     const onOpenFile = (path) => {
         var _a;
-        (_a = model.documentManager) === null || _a === void 0 ? void 0 : _a.openOrReveal(path);
+        (_a = model.documentManager) === null || _a === void 0 ? void 0 : _a.openOrReveal(toServerRelativePath(path));
     };
     return (React.createElement("div", { className: "jp-jupyter-ai-acp-client-tool-calls" }, ((_d = (_c = message.metadata) === null || _c === void 0 ? void 0 : _c.tool_calls) !== null && _d !== void 0 ? _d : []).map((tc) => (React.createElement(ToolCallLine, { key: tc.tool_call_id, toolCall: tc, onOpenFile: onOpenFile })))));
 }
@@ -51,7 +72,7 @@ function formatToolInput(input) {
 }
 /**
  * Compute the pre-permission detail text for a tool call, or null if nothing
- * to show beyond the title. Returns a plain string so callers can check null.
+ * to show beyond the title.
  */
 function buildPermissionDetail(toolCall) {
     const { kind, title, locations, raw_input } = toolCall;
@@ -72,8 +93,10 @@ function buildPermissionDetail(toolCall) {
     if ((kind === 'delete' || kind === 'move' || kind === 'read') &&
         (locations === null || locations === void 0 ? void 0 : locations.length)) {
         return kind === 'move' && locations.length >= 2
-            ? locations[0] + '  \u2192  ' + locations[1]
-            : locations.join('\n');
+            ? toServerRelativePath(locations[0]) +
+                '  \u2192  ' +
+                toServerRelativePath(locations[1])
+            : locations.map(toServerRelativePath).join('\n');
     }
     // Generic fallback for unknown/MCP kinds with raw_input.
     if (raw_input !== null &&
@@ -105,7 +128,7 @@ function buildPermissionDetail(toolCall) {
     }
     return null;
 }
-/** Tool kinds where expanded view shows full file path(s) from locations. */
+/** Tool kinds where expanded view shows file path(s) from locations. */
 const FILE_KINDS = new Set(['read', 'edit', 'delete', 'move']);
 /** Tool kinds where expanded view shows raw_output (stdout, search results, etc.). */
 const OUTPUT_KINDS = new Set(['search', 'execute', 'think', 'fetch']);
@@ -113,7 +136,7 @@ const OUTPUT_KINDS = new Set(['search', 'execute', 'think', 'fetch']);
  * Build the expandable details content for a tool call.
  * Returns lines of metadata to display, or empty array if nothing to show.
  *
- * File operations show full paths; output operations show raw_output;
+ * File operations show server-relative paths; output operations show raw_output;
  * switch_mode/other/None show nothing (clean title only).
  */
 function buildDetailsLines(toolCall) {
@@ -122,7 +145,7 @@ function buildDetailsLines(toolCall) {
     const kind = toolCall.kind;
     if (kind && FILE_KINDS.has(kind) && ((_a = toolCall.locations) === null || _a === void 0 ? void 0 : _a.length)) {
         for (const loc of toolCall.locations) {
-            lines.push(loc);
+            lines.push(toServerRelativePath(loc));
         }
     }
     else if (kind && OUTPUT_KINDS.has(kind) && toolCall.raw_output) {
@@ -172,7 +195,7 @@ function ToolCallLine({ toolCall, onOpenFile }) {
                     React.createElement("span", { className: "jp-jupyter-ai-acp-client-tool-call-icon" }, icon),
                     ' ',
                     React.createElement("em", null, displayTitle)),
-                React.createElement(DiffView, { diffs: toolCall.diffs, onOpenFile: onOpenFile })),
+                React.createElement(DiffView, { diffs: toolCall.diffs, onOpenFile: toolCall.kind === 'edit' ? onOpenFile : undefined, toDisplayPath: toServerRelativePath, pendingPermission: true })),
             React.createElement(PermissionButtons, { toolCall: toolCall })));
     }
     // Pending permission without diffs: show kind-specific detail if available
@@ -199,7 +222,7 @@ function ToolCallLine({ toolCall, onOpenFile }) {
                 ' ',
                 displayTitle,
                 React.createElement(PermissionLabel, { toolCall: toolCall })),
-            hasDiffs ? (React.createElement(DiffView, { diffs: toolCall.diffs, onOpenFile: onOpenFile })) : (React.createElement("div", { className: "jp-jupyter-ai-acp-client-tool-call-detail" }, detailsLines.join('\n')))));
+            hasDiffs ? (React.createElement(DiffView, { diffs: toolCall.diffs, onOpenFile: onOpenFile, toDisplayPath: toServerRelativePath })) : (React.createElement("div", { className: "jp-jupyter-ai-acp-client-tool-call-detail" }, detailsLines.join('\n')))));
     }
     // In-progress — italic
     if (isInProgress) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyter-ai/acp-client",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "The ACP client for Jupyter AI, allowing for ACP agents to be used in JupyterLab",
     "keywords": [
         "jupyter",

package/src/diff-view.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import { IToolCallDiff } from '@jupyter/chat';
+import { PathExt } from '@jupyterlab/coreutils';
 import { structuredPatch } from 'diff';
+import clsx from 'clsx';
 
 /** Maximum number of diff lines shown before truncation. */
 const MAX_DIFF_LINES = 20;
@@ -19,10 +21,14 @@ interface IDiffLineInfo {
  */
 function DiffBlock({
   diff,
-  onOpenFile
+  onOpenFile,
+  toDisplayPath,
+  pendingPermission
 }: {
   diff: IToolCallDiff;
   onOpenFile?: (path: string) => void;
+  toDisplayPath?: (path: string) => string;
+  pendingPermission?: boolean;
 }): JSX.Element {
   const patch = structuredPatch(
     diff.path,
@@ -33,7 +39,16 @@ function DiffBlock({
     undefined,
     { context: Infinity }
   );
-  const filename = diff.path.split('/').pop() ?? diff.path;
+  const displayPath = toDisplayPath
+    ? toDisplayPath(diff.path)
+    : PathExt.basename(diff.path);
+  // toDisplayPath makes paths inside the server root relative. A leading '/'
+  // means the file is outside it and cannot be opened via the Contents API.
+  const isOutsideRoot = displayPath.startsWith('/');
+  const isClickable =
+    !!onOpenFile &&
+    !isOutsideRoot &&
+    !(pendingPermission && diff.old_text === undefined);
   const [expanded, setExpanded] = React.useState(false);
 
   // Flatten hunks into renderable lines
@@ -67,11 +82,13 @@ function DiffBlock({
   return (
     <div className="jp-jupyter-ai-acp-client-diff-block">
       <div
-        className="jp-jupyter-ai-acp-client-diff-header"
-        onClick={onOpenFile ? () => onOpenFile(diff.path) : undefined}
+        className={clsx('jp-jupyter-ai-acp-client-diff-header', {
+          'jp-jupyter-ai-acp-client-diff-header-clickable': isClickable
+        })}
+        onClick={isClickable ? () => onOpenFile!(diff.path) : undefined}
         title={diff.path}
       >
-        {filename}
+        {displayPath}
       </div>
       <div className="jp-jupyter-ai-acp-client-diff-content">
         {visible.map((line: IDiffLineInfo) => (
@@ -110,15 +127,25 @@ function DiffBlock({
  */
 export function DiffView({
   diffs,
-  onOpenFile
+  onOpenFile,
+  toDisplayPath,
+  pendingPermission
 }: {
   diffs: IToolCallDiff[];
   onOpenFile?: (path: string) => void;
+  toDisplayPath?: (path: string) => string;
+  pendingPermission?: boolean;
 }): JSX.Element {
   return (
     <div className="jp-jupyter-ai-acp-client-diff-container">
       {diffs.map((d, i) => (
-        <DiffBlock key={i} diff={d} onOpenFile={onOpenFile} />
+        <DiffBlock
+          key={i}
+          diff={d}
+          onOpenFile={onOpenFile}
+          toDisplayPath={toDisplayPath}
+          pendingPermission={pendingPermission}
+        />
       ))}
     </div>
   );

package/src/tool-calls.tsx

@@ -4,10 +4,32 @@ import {
   IPermissionOption,
   MessagePreambleProps
 } from '@jupyter/chat';
+import { PageConfig, PathExt } from '@jupyterlab/coreutils';
 import { submitPermissionDecision } from './request';
 import clsx from 'clsx';
 import { DiffView } from './diff-view';
 
+/**
+ * Convert an absolute filesystem path to a server-relative path.
+ * Returns the path unchanged if the server root is not set or the path
+ * is outside it.
+ */
+function toServerRelativePath(absolutePath: string): string {
+  const rootUri = PageConfig.getOption('rootUri');
+  const serverRoot = rootUri
+    ? new URL(rootUri).pathname
+    : PageConfig.getOption('serverRoot');
+  if (!serverRoot) {
+    return absolutePath;
+  }
+  const relativePath = PathExt.relative(serverRoot, absolutePath);
+  // Path is outside server root — keep absolute
+  if (relativePath.startsWith('..')) {
+    return absolutePath;
+  }
+  return relativePath;
+}
+
 /**
  * Preamble component that renders tool call status lines above message body.
  * Returns null if the message has no tool calls.
@@ -21,7 +43,7 @@ export function ToolCallsComponent(
   }
 
   const onOpenFile = (path: string) => {
-    model.documentManager?.openOrReveal(path);
+    model.documentManager?.openOrReveal(toServerRelativePath(path));
   };
 
   return (
@@ -75,7 +97,7 @@ function formatToolInput(input: unknown): string {
 
 /**
  * Compute the pre-permission detail text for a tool call, or null if nothing
- * to show beyond the title. Returns a plain string so callers can check null.
+ * to show beyond the title.
  */
 function buildPermissionDetail(toolCall: IToolCall): string | null {
   const { kind, title, locations, raw_input } = toolCall;
@@ -105,8 +127,10 @@ function buildPermissionDetail(toolCall: IToolCall): string | null {
     locations?.length
   ) {
     return kind === 'move' && locations.length >= 2
-      ? locations[0] + '  \u2192  ' + locations[1]
-      : locations.join('\n');
+      ? toServerRelativePath(locations[0]) +
+          '  \u2192  ' +
+          toServerRelativePath(locations[1])
+      : locations.map(toServerRelativePath).join('\n');
   }
 
   // Generic fallback for unknown/MCP kinds with raw_input.
@@ -151,7 +175,7 @@ function buildPermissionDetail(toolCall: IToolCall): string | null {
   return null;
 }
 
-/** Tool kinds where expanded view shows full file path(s) from locations. */
+/** Tool kinds where expanded view shows file path(s) from locations. */
 const FILE_KINDS = new Set(['read', 'edit', 'delete', 'move']);
 
 /** Tool kinds where expanded view shows raw_output (stdout, search results, etc.). */
@@ -161,7 +185,7 @@ const OUTPUT_KINDS = new Set(['search', 'execute', 'think', 'fetch']);
  * Build the expandable details content for a tool call.
  * Returns lines of metadata to display, or empty array if nothing to show.
  *
- * File operations show full paths; output operations show raw_output;
+ * File operations show server-relative paths; output operations show raw_output;
  * switch_mode/other/None show nothing (clean title only).
  */
 function buildDetailsLines(toolCall: IToolCall): string[] {
@@ -170,7 +194,7 @@ function buildDetailsLines(toolCall: IToolCall): string[] {
 
   if (kind && FILE_KINDS.has(kind) && toolCall.locations?.length) {
     for (const loc of toolCall.locations) {
-      lines.push(loc);
+      lines.push(toServerRelativePath(loc));
     }
   } else if (kind && OUTPUT_KINDS.has(kind) && toolCall.raw_output) {
     lines.push(formatOutput(toolCall.raw_output));
@@ -240,7 +264,12 @@ function ToolCallLine({
             </span>{' '}
             <em>{displayTitle}</em>
           </summary>
-          <DiffView diffs={toolCall.diffs!} onOpenFile={onOpenFile} />
+          <DiffView
+            diffs={toolCall.diffs!}
+            onOpenFile={toolCall.kind === 'edit' ? onOpenFile : undefined}
+            toDisplayPath={toServerRelativePath}
+            pendingPermission
+          />
         </details>
         <PermissionButtons toolCall={toolCall} />
       </div>
@@ -286,7 +315,11 @@ function ToolCallLine({
           <PermissionLabel toolCall={toolCall} />
         </summary>
         {hasDiffs ? (
-          <DiffView diffs={toolCall.diffs!} onOpenFile={onOpenFile} />
+          <DiffView
+            diffs={toolCall.diffs!}
+            onOpenFile={onOpenFile}
+            toDisplayPath={toServerRelativePath}
+          />
         ) : (
           <div className="jp-jupyter-ai-acp-client-tool-call-detail">
             {detailsLines.join('\n')}

package/style/base.css

@@ -145,10 +145,13 @@ details[open].jp-jupyter-ai-acp-client-tool-call summary::after,
   font-size: var(--jp-ui-font-size0);
   font-family: var(--jp-code-font-family);
   color: var(--jp-ui-font-color2);
+}
+
+.jp-jupyter-ai-acp-client-diff-header-clickable {
   cursor: pointer;
 }
 
-.jp-jupyter-ai-acp-client-diff-header:hover {
+.jp-jupyter-ai-acp-client-diff-header-clickable:hover {
   text-decoration: underline;
 }