@nextclaw/ui 0.15.11 → 0.15.13

package/src/features/chat/features/project/components/__tests__/chat-project-add-dialog.test.tsx

@@ -0,0 +1,116 @@
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { ComponentProps } from 'react';
+import userEvent from '@testing-library/user-event';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ChatProjectAddDialog } from '@/features/chat/features/project/components/chat-project-add-dialog';
+import { setLanguage } from '@/shared/lib/i18n';
+
+const pathPickerSpy = vi.fn();
+
+vi.mock('@/shared/components/path-picker/server-path-picker-dialog', () => ({
+  ServerPathPickerDialog: (props: unknown) => pathPickerSpy(props),
+}));
+
+function renderDialog(overrides: Partial<ComponentProps<typeof ChatProjectAddDialog>> = {}) {
+  const onCreate = vi.fn(async () => undefined);
+  const onAddExisting = vi.fn(async () => undefined);
+  render(
+    <ChatProjectAddDialog
+      open
+      defaultWorkspacePath="/workspace"
+      templates={[
+        { id: 'empty', name: 'Empty', description: 'Empty project' },
+        {
+          id: 'knowledge-base',
+          name: 'Knowledge base',
+          description: 'Knowledge base project',
+        },
+      ]}
+      isCreating={false}
+      isAddingExisting={false}
+      onOpenChange={() => {}}
+      onCreate={onCreate}
+      onAddExisting={onAddExisting}
+      {...overrides}
+    />,
+  );
+  return { onCreate, onAddExisting };
+}
+
+describe('ChatProjectAddDialog', () => {
+  beforeEach(() => {
+    setLanguage('zh');
+    pathPickerSpy.mockClear();
+  });
+
+  it('creates a new project with an optional project directory and template', async () => {
+    const user = userEvent.setup();
+    const { onCreate, onAddExisting } = renderDialog();
+
+    expect(screen.getByRole('heading', { name: '添加项目' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: '新建项目' }).getAttribute('aria-pressed')).toBe(
+      'true',
+    );
+    await user.type(screen.getByLabelText('项目名称'), '个人知识库');
+    fireEvent.change(document.querySelector('select')!, {
+      target: { value: 'knowledge-base' },
+    });
+    await user.click(screen.getByRole('button', { name: '浏览' }));
+    expect(pathPickerSpy).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        open: true,
+        allowCreateDirectory: true,
+        currentPath: '',
+        defaultWorkspacePath: '/workspace',
+        title: '选择或新建项目目录',
+      }),
+    );
+    const pickerProps = pathPickerSpy.mock.lastCall?.[0] as {
+      onConfirm: (path: string) => void;
+    };
+    act(() => pickerProps.onConfirm('/srv/knowledge'));
+    expect((screen.getByLabelText('项目目录（可选）') as HTMLInputElement).value).toBe(
+      '/srv/knowledge',
+    );
+    await user.click(screen.getByRole('button', { name: '创建项目' }));
+
+    await waitFor(() => {
+      expect(onCreate).toHaveBeenCalledWith({
+        name: '个人知识库',
+        rootPath: '/srv/knowledge',
+        template: 'knowledge-base',
+      });
+    });
+    expect(onAddExisting).not.toHaveBeenCalled();
+  });
+
+  it('adds an existing directory without exposing project initialization', async () => {
+    const user = userEvent.setup();
+    const { onCreate, onAddExisting } = renderDialog();
+
+    await user.click(screen.getByRole('button', { name: '添加已有目录' }));
+    expect(screen.queryByLabelText('项目名称')).toBeNull();
+    expect(screen.queryByLabelText('项目模板')).toBeNull();
+    expect(screen.getByText(
+      '选择服务端机器上的已有目录。项目名称取目录名，不会修改或初始化目录内容。',
+    )).toBeTruthy();
+    await user.click(screen.getByRole('button', { name: '浏览' }));
+    expect(pathPickerSpy).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        open: true,
+        allowCreateDirectory: false,
+        title: '选择已有项目目录',
+      }),
+    );
+    const pickerProps = pathPickerSpy.mock.lastCall?.[0] as {
+      onConfirm: (path: string) => void;
+    };
+    act(() => pickerProps.onConfirm('/srv/existing-project'));
+    await user.click(screen.getByRole('button', { name: '添加到项目列表' }));
+
+    await waitFor(() => {
+      expect(onAddExisting).toHaveBeenCalledWith({ rootPath: '/srv/existing-project' });
+    });
+    expect(onCreate).not.toHaveBeenCalled();
+  });
+});

package/src/features/chat/features/project/components/chat-project-add-dialog.tsx

@@ -0,0 +1,305 @@
+import { useState } from 'react';
+import { FolderOpen } from 'lucide-react';
+import type {
+  ProjectAddExistingRequest,
+  ProjectCreateRequest,
+  ProjectTemplateView,
+} from '@/shared/lib/api';
+import { ServerPathPickerDialog } from '@/shared/components/path-picker/server-path-picker-dialog';
+import { Button } from '@/shared/components/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/shared/components/ui/dialog';
+import { Input } from '@/shared/components/ui/input';
+import { Label } from '@/shared/components/ui/label';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/shared/components/ui/select';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/shared/components/ui/tabs';
+import { t } from '@/shared/lib/i18n';
+
+type ProjectTemplateId = NonNullable<ProjectCreateRequest['template']>;
+type ProjectAddMode = 'create' | 'existing';
+
+type ChatProjectAddDialogProps = {
+  open: boolean;
+  defaultWorkspacePath?: string | null;
+  templates: readonly ProjectTemplateView[];
+  isCreating: boolean;
+  isAddingExisting: boolean;
+  createErrorMessage?: string | null;
+  addExistingErrorMessage?: string | null;
+  onOpenChange: (open: boolean) => void;
+  onCreate: (input: ProjectCreateRequest) => Promise<void>;
+  onAddExisting: (input: ProjectAddExistingRequest) => Promise<void>;
+};
+
+function projectTemplateLabel(templateId: ProjectTemplateId): string {
+  return t(
+    templateId === 'knowledge-base'
+      ? 'chatProjectTemplateKnowledgeBase'
+      : 'chatProjectTemplateEmpty',
+  );
+}
+
+export function ChatProjectAddDialog({
+  open,
+  defaultWorkspacePath,
+  templates,
+  isCreating,
+  isAddingExisting,
+  createErrorMessage,
+  addExistingErrorMessage,
+  onOpenChange,
+  onCreate,
+  onAddExisting,
+}: ChatProjectAddDialogProps) {
+  const [mode, setMode] = useState<ProjectAddMode>('create');
+  const [name, setName] = useState('');
+  const [createRootPath, setCreateRootPath] = useState('');
+  const [existingRootPath, setExistingRootPath] = useState('');
+  const [pathPickerOpen, setPathPickerOpen] = useState(false);
+  const [template, setTemplate] = useState<ProjectTemplateId>('empty');
+  const availableTemplateIds = templates.length > 0
+    ? templates.map((entry) => entry.id)
+    : ['empty' as const];
+  const normalizedName = name.trim();
+  const normalizedCreateRootPath = createRootPath.trim();
+  const normalizedExistingRootPath = existingRootPath.trim();
+  const isSubmitting = isCreating || isAddingExisting;
+  const submitDisabled = isSubmitting || (
+    mode === 'create' ? !normalizedName : !normalizedExistingRootPath
+  );
+  const errorMessage = mode === 'create' ? createErrorMessage : addExistingErrorMessage;
+
+  const resetForm = () => {
+    setMode('create');
+    setName('');
+    setCreateRootPath('');
+    setExistingRootPath('');
+    setTemplate('empty');
+    setPathPickerOpen(false);
+  };
+
+  const closeDialog = () => {
+    if (isSubmitting) {
+      return;
+    }
+    resetForm();
+    onOpenChange(false);
+  };
+
+  return (
+    <>
+      <Dialog
+        open={open}
+        onOpenChange={(nextOpen) => {
+          if (nextOpen) {
+            onOpenChange(true);
+            return;
+          }
+          closeDialog();
+        }}
+      >
+        <DialogContent className="sm:max-w-lg">
+          <DialogHeader>
+            <DialogTitle>{t('chatProjectAddTitle')}</DialogTitle>
+            <DialogDescription>{t('chatProjectAddDescription')}</DialogDescription>
+          </DialogHeader>
+          <form
+            className="space-y-4"
+            onSubmit={(event) => {
+              event.preventDefault();
+              if (submitDisabled) {
+                return;
+              }
+              const submit = mode === 'create'
+                ? onCreate({
+                    name: normalizedName,
+                    template,
+                    rootPath: normalizedCreateRootPath || undefined,
+                  })
+                : onAddExisting({ rootPath: normalizedExistingRootPath });
+              void submit.then(resetForm).catch(() => undefined);
+            }}
+          >
+            <Tabs
+              value={mode}
+              onValueChange={(value) => {
+                if (!isSubmitting) {
+                  setMode(value === 'existing' ? 'existing' : 'create');
+                }
+              }}
+            >
+              <TabsList className="grid w-full grid-cols-2">
+                <TabsTrigger value="create">{t('chatProjectCreateMode')}</TabsTrigger>
+                <TabsTrigger value="existing">{t('chatProjectExistingMode')}</TabsTrigger>
+              </TabsList>
+
+              <TabsContent value="create" className="mt-4 space-y-4">
+                <p className="text-sm leading-relaxed text-muted-foreground">
+                  {t('chatProjectCreateModeDescription')}
+                </p>
+                <div className="space-y-2">
+                  <Label htmlFor="chat-project-name">{t('chatProjectNameLabel')}</Label>
+                  <Input
+                    id="chat-project-name"
+                    value={name}
+                    onChange={(event) => setName(event.target.value)}
+                    placeholder={t('chatProjectNamePlaceholder')}
+                    autoFocus
+                    disabled={isSubmitting}
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <Label htmlFor="chat-project-template">{t('chatProjectTemplateLabel')}</Label>
+                  <Select
+                    value={template}
+                    onValueChange={(value) => setTemplate(value as ProjectTemplateId)}
+                    disabled={isSubmitting}
+                  >
+                    <SelectTrigger id="chat-project-template">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {availableTemplateIds.map((templateId) => (
+                        <SelectItem key={templateId} value={templateId}>
+                          {projectTemplateLabel(templateId)}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                <div className="space-y-2">
+                  <Label htmlFor="chat-project-create-root-path">
+                    {t('chatProjectCreatePathLabel')}
+                  </Label>
+                  <div className="flex gap-2">
+                    <Input
+                      id="chat-project-create-root-path"
+                      value={createRootPath}
+                      onChange={(event) => setCreateRootPath(event.target.value)}
+                      placeholder={t('chatProjectCreatePathPlaceholder')}
+                      disabled={isSubmitting}
+                    />
+                    <Button
+                      type="button"
+                      variant="outline"
+                      onClick={() => setPathPickerOpen(true)}
+                      disabled={isSubmitting}
+                    >
+                      <FolderOpen className="mr-2 h-4 w-4" />
+                      {t('browse')}
+                    </Button>
+                  </div>
+                  <p className="text-xs leading-relaxed text-muted-foreground">
+                    {t('chatProjectCreatePathHint')}
+                  </p>
+                </div>
+              </TabsContent>
+
+              <TabsContent value="existing" className="mt-4 space-y-4">
+                <p className="text-sm leading-relaxed text-muted-foreground">
+                  {t('chatProjectExistingModeDescription')}
+                </p>
+                <div className="space-y-2">
+                  <Label htmlFor="chat-project-existing-root-path">
+                    {t('chatProjectExistingPathLabel')}
+                  </Label>
+                  <div className="flex gap-2">
+                    <Input
+                      id="chat-project-existing-root-path"
+                      value={existingRootPath}
+                      onChange={(event) => setExistingRootPath(event.target.value)}
+                      placeholder={t('chatProjectExistingPathPlaceholder')}
+                      autoFocus
+                      disabled={isSubmitting}
+                    />
+                    <Button
+                      type="button"
+                      variant="outline"
+                      onClick={() => setPathPickerOpen(true)}
+                      disabled={isSubmitting}
+                    >
+                      <FolderOpen className="mr-2 h-4 w-4" />
+                      {t('browse')}
+                    </Button>
+                  </div>
+                  <p className="text-xs leading-relaxed text-muted-foreground">
+                    {t('chatProjectExistingPathHint')}
+                  </p>
+                </div>
+              </TabsContent>
+            </Tabs>
+
+            {errorMessage ? (
+              <p role="alert" className="text-sm text-destructive">
+                {errorMessage}
+              </p>
+            ) : null}
+
+            <DialogFooter>
+              <Button type="button" variant="outline" onClick={closeDialog} disabled={isSubmitting}>
+                {t('cancel')}
+              </Button>
+              <Button type="submit" disabled={submitDisabled}>
+                {isSubmitting
+                  ? t('saving')
+                  : t(mode === 'create' ? 'chatProjectCreateAction' : 'chatProjectExistingAction')}
+              </Button>
+            </DialogFooter>
+          </form>
+        </DialogContent>
+      </Dialog>
+      <ServerPathPickerDialog
+        open={pathPickerOpen}
+        allowCreateDirectory={mode === 'create'}
+        currentPath={mode === 'create' ? createRootPath : existingRootPath}
+        defaultWorkspacePath={defaultWorkspacePath}
+        isSaving={false}
+        onOpenChange={setPathPickerOpen}
+        onConfirm={(path) => {
+          if (mode === 'create') {
+            setCreateRootPath(path);
+          } else {
+            setExistingRootPath(path);
+          }
+          setPathPickerOpen(false);
+        }}
+        title={t(
+          mode === 'create'
+            ? 'chatProjectCreatePathPickerTitle'
+            : 'chatProjectExistingPathPickerTitle',
+        )}
+        description={t(
+          mode === 'create'
+            ? 'chatProjectCreatePathPickerDescription'
+            : 'chatProjectExistingPathPickerDescription',
+        )}
+        pathLabel={t(
+          mode === 'create' ? 'chatProjectCreatePathLabel' : 'chatProjectExistingPathLabel',
+        )}
+        pathPlaceholder={t(
+          mode === 'create'
+            ? 'chatProjectCreatePathPlaceholder'
+            : 'chatProjectExistingPathPlaceholder',
+        )}
+        confirmLabel={t('selectCurrentDirectory')}
+        hint={t(
+          mode === 'create' ? 'chatProjectCreatePathHint' : 'chatProjectExistingPathHint',
+        )}
+      />
+    </>
+  );
+}

package/src/features/chat/features/session/components/__tests__/chat-sidebar-project-groups.test.tsx

@@ -67,10 +67,11 @@ describe("ChatSidebarProjectGroups", () => {
   });
 
   it("keeps the project header as the full-width folder row and collapses its sessions", () => {
-    renderProjectGroups();
+    const { container } = renderProjectGroups();
 
     const header = screen.getByLabelText("Collapse project");
-    expect(header.parentElement?.className).toContain("h-10");
+    expect(container.firstElementChild?.className).toBe("space-y-0.5");
+    expect(header.parentElement?.className).toContain("h-8");
     expect(header.parentElement?.className).toContain("hover:bg-gray-200/60");
     expect(header.parentElement?.className).not.toContain("focus-within:bg");
     expect(screen.getByText("analysis-project").nextElementSibling?.tagName).toBe("svg");

package/src/features/chat/features/session/components/chat-sidebar-project-groups.tsx

@@ -46,7 +46,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
   const supportsSessionTypeChoice = sessionTypeOptions.length > 1;
 
   return (
-    <div className="space-y-3">
+    <div className="space-y-0.5">
       {groups.map((group) => {
         const actionLabel = `${t('chatSidebarNewTask')} · ${group.projectName}`;
         const isCollapsed = collapsedProjectRoots.includes(group.projectRoot);
@@ -56,7 +56,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
 
         return (
           <div key={group.projectRoot}>
-            <div className="group/project relative h-10 rounded-lg px-2 text-muted-foreground transition-colors hover:bg-gray-200/60 hover:text-gray-900">
+            <div className="group/project relative h-8 rounded-lg px-2 text-muted-foreground transition-colors hover:bg-gray-200/60 hover:text-gray-900">
               <button
                 type="button"
                 aria-expanded={!isCollapsed}

package/src/features/chat/features/workspace/components/__tests__/workspace-file-preview-error-text.test.ts

@@ -0,0 +1,22 @@
+import { NextClawClientError } from "@nextclaw/client-sdk";
+import { describe, expect, it } from "vitest";
+import { resolveWorkspacePreviewErrorText } from "@/features/chat/features/workspace/components/chat-session-workspace-file-preview";
+import { t } from "@/shared/lib/i18n";
+
+describe("resolveWorkspacePreviewErrorText", () => {
+  it.each([
+    [
+      new NextClawClientError({
+        code: "SERVER_PATH_NOT_FOUND",
+        message: "server path does not exist",
+        status: 404,
+      }),
+      "chatWorkspacePreviewNotFound",
+    ],
+    [new Error("private upstream diagnostic"), "chatWorkspacePreviewFailed"],
+  ] as const)("maps preview errors to %s", (error, translationKey) => {
+    const message = resolveWorkspacePreviewErrorText(error);
+    expect(message).toBe(t(translationKey));
+    expect(message).not.toContain(error.message);
+  });
+});

package/src/features/chat/features/workspace/components/chat-session-workspace-file-preview.tsx

@@ -3,6 +3,7 @@ import type {
   ChatFileOpenActionViewModel,
   ChatFileOperationBlockViewModel,
 } from "@nextclaw/agent-chat-ui";
+import { NextClawClientError } from "@nextclaw/client-sdk";
 import {
   ChatMessageMarkdown,
   FileOperationCodeSurface,
@@ -141,6 +142,13 @@ function WorkspaceFilePreviewStatus({
   );
 }
 
+export function resolveWorkspacePreviewErrorText(error: unknown): string {
+  return error instanceof NextClawClientError &&
+    error.code === "SERVER_PATH_NOT_FOUND"
+    ? t("chatWorkspacePreviewNotFound")
+    : t("chatWorkspacePreviewFailed");
+}
+
 function WorkspaceDiffBody({
   diffBlock,
 }: {
@@ -247,11 +255,7 @@ function WorkspacePreviewBody({
     return (
       <WorkspaceFilePreviewStatus
         tone="error"
-        text={
-          previewQuery.error instanceof Error
-            ? previewQuery.error.message
-            : String(previewQuery.error)
-        }
+        text={resolveWorkspacePreviewErrorText(previewQuery.error)}
       />
     );
   }

package/src/features/chat/managers/__tests__/chat-ui.manager.test.ts

@@ -125,4 +125,28 @@ describe('ChatUiManager content display', () => {
       title: 'Reader',
     });
   });
+
+  it('opens an explicit external panel app path without resolving the standard catalog', async () => {
+    const docBrowserManager = createDocBrowserManager();
+    const manager = new ChatUiManager(
+      docBrowserManager as unknown as ConstructorParameters<typeof ChatUiManager>[0],
+    );
+
+    await manager.showContent({
+      target: {
+        type: 'panel_app',
+        payload: {
+          appId: 'external-reader',
+          path: '/tmp/external-reader.panel',
+        },
+      },
+      title: 'External Reader',
+    });
+
+    expect(listPanelAppsMock).not.toHaveBeenCalled();
+    expect(docBrowserManager.open).toHaveBeenCalledWith(
+      'nextclaw://panel-app/external-reader?path=%2Ftmp%2Fexternal-reader.panel',
+      { title: 'External Reader' },
+    );
+  });
 });

package/src/features/chat/managers/chat-ui.manager.ts

@@ -96,7 +96,13 @@ export class ChatUiManager {
       });
       return;
     }
-    const { appId } = target.payload;
+    const { appId, path } = target.payload;
+    if (path) {
+      this.docBrowserManager.open(createPanelAppResourceUri(appId, path), {
+        title,
+      });
+      return;
+    }
     const entry = await this.resolvePanelAppEntry(appId);
     if (entry) {
       this.docBrowserManager.openTarget(createPanelAppRightPanelResourceTarget(entry), {

package/src/features/cron/components/cron-task-discovery.tsx

@@ -123,12 +123,7 @@ export function CronTemplateGallery({
   const templates = compact ? CRON_TEMPLATES.slice(0, 4) : CRON_TEMPLATES;
 
   return (
-    <div
-      className={cn(
-        "grid gap-3 sm:grid-cols-2",
-        compact ? "xl:grid-cols-4" : "lg:grid-cols-3",
-      )}
-    >
+    <div className="grid grid-cols-[repeat(auto-fit,minmax(min(100%,17.5rem),1fr))] gap-3">
       {templates.map((template) => {
         const Icon = template.icon;
         return (

package/src/features/right-panel-resources/configs/right-panel-resource-routes.config.ts

@@ -13,6 +13,7 @@ import type {
   RightPanelResourceTarget,
 } from '@/features/right-panel-resources/types/right-panel-resource.types';
 import {
+  createPanelAppContentPath,
   RIGHT_PANEL_APPS_URL,
   RIGHT_PANEL_APPS_TAB_KIND,
   RIGHT_PANEL_HOME_TAB_KIND,
@@ -77,12 +78,21 @@ function isPanelAppContentUri(uri: ParsedResourceUri): boolean {
 
 function resolvePanelAppPlaceholderUrl(uri: ParsedResourceUri): string {
   const appId = getPanelAppId(uri);
-  return appId ? `/api/panel-apps/${encodeURIComponent(decodeURIComponent(appId))}/content` : 'nextclaw://panel-app';
+  if (!appId) {
+    return 'nextclaw://panel-app';
+  }
+  const path = uri.searchParams.get('path')?.trim();
+  return createPanelAppContentPath(decodeURIComponent(appId), path);
 }
 
 function createPanelAppResourceUri(uri: ParsedResourceUri): string {
   const appId = getPanelAppId(uri);
-  return appId ? `nextclaw://panel-app/${encodeURIComponent(decodeURIComponent(appId))}` : 'nextclaw://panel-app';
+  if (!appId) {
+    return 'nextclaw://panel-app';
+  }
+  const resourceUri = `nextclaw://panel-app/${encodeURIComponent(decodeURIComponent(appId))}`;
+  const path = uri.searchParams.get('path')?.trim();
+  return path ? `${resourceUri}?${new URLSearchParams({ path }).toString()}` : resourceUri;
 }
 
 function arePanelAppUrlsEquivalent(left: string, right: string): boolean {
@@ -90,8 +100,10 @@ function arePanelAppUrlsEquivalent(left: string, right: string): boolean {
   const rightUri = parseResourceUri(right);
   const leftAppId = getPanelAppId(leftUri);
   const rightAppId = getPanelAppId(rightUri);
+  const leftPath = leftUri.searchParams.get('path')?.trim() ?? '';
+  const rightPath = rightUri.searchParams.get('path')?.trim() ?? '';
   return leftAppId.length > 0 && rightAppId.length > 0
-    ? decodeURIComponent(leftAppId) === decodeURIComponent(rightAppId)
+    ? decodeURIComponent(leftAppId) === decodeURIComponent(rightAppId) && leftPath === rightPath
     : left === right;
 }
 
@@ -171,7 +183,9 @@ export const RIGHT_PANEL_RESOURCE_ROUTE_DEFINITIONS: RightPanelResourceRouteDefi
       const url = resolvePanelAppPlaceholderUrl(uri);
       const appId = getPanelAppId(uri);
       return {
-        dedupeKey: appId ? `panel-app:${decodeURIComponent(appId)}` : undefined,
+        dedupeKey: appId
+          ? `panel-app:${uri.searchParams.get('path')?.trim() || decodeURIComponent(appId)}`
+          : undefined,
         historyPolicy: 'managed',
         kind: RIGHT_PANEL_PANEL_APP_TAB_KIND,
         resourceUri: createPanelAppResourceUri(uri),

package/src/features/right-panel-resources/index.ts

@@ -7,6 +7,7 @@ export type {
   RightPanelResourceTarget,
 } from '@/features/right-panel-resources/types/right-panel-resource.types';
 export {
+  createPanelAppContentPath,
   createPanelAppResourceUri,
   createPanelAppRightPanelResourceTarget,
   RIGHT_PANEL_APPS_TAB_KIND,

package/src/features/right-panel-resources/utils/__tests__/right-panel-resource-route-resolver.utils.test.ts

@@ -59,4 +59,37 @@ describe('RightPanelResourceRouteResolver', () => {
       'panel-app',
     )).toBe(true);
   });
+
+  it('preserves an explicit panel app source path across resource and content URLs', () => {
+    const resolver = new RightPanelResourceRouteResolver();
+    const resourceUri = 'nextclaw://panel-app/timer?path=%2Ftmp%2Ftimer.panel';
+    const contentUrl = '/api/panel-apps/timer/content?path=%2Ftmp%2Ftimer.panel';
+
+    expect(resolver.resolve(resourceUri)).toMatchObject({
+      dedupeKey: 'panel-app:/tmp/timer.panel',
+      kind: 'panel-app',
+      resourceUri,
+      url: contentUrl,
+    });
+    expect(resolver.resolveOpenTarget({
+      kind: 'panel-app',
+      url: contentUrl,
+    })).toMatchObject({
+      dedupeKey: 'panel-app:/tmp/timer.panel',
+      resourceUri,
+      url: contentUrl,
+    });
+    expect(resolver.areUrlsEquivalent(
+      resourceUri,
+      contentUrl,
+      'panel-app',
+      'panel-app',
+    )).toBe(true);
+    expect(resolver.areUrlsEquivalent(
+      resourceUri,
+      'nextclaw://panel-app/timer?path=%2Ftmp%2Fother.panel',
+      'panel-app',
+      'panel-app',
+    )).toBe(false);
+  });
 });