@nextclaw/ui 0.11.20 → 0.11.22

package/src/components/chat/adapters/file-operation/record-readers.ts

@@ -0,0 +1,233 @@
+import { readPartialJsonStringField } from "@/components/chat/adapters/chat-message.partial-json";
+
+export function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+export function readNonEmptyString(value: unknown): string | null {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function normalizePath(value: unknown): string | null {
+  if (typeof value === "string" && value.trim()) {
+    return value.trim();
+  }
+  return null;
+}
+
+function readPositiveInteger(value: unknown): number | null {
+  if (typeof value === "number" && Number.isInteger(value) && value > 0) {
+    return value;
+  }
+  if (typeof value === "string" && /^\d+$/.test(value.trim())) {
+    return Number(value.trim());
+  }
+  return null;
+}
+
+export function readRecordPayload(
+  value: unknown,
+): Record<string, unknown> | null {
+  if (isRecord(value)) {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{")) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(trimmed) as unknown;
+    return isRecord(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+
+export function readPartialRecordPayload(
+  value: unknown,
+): Record<string, unknown> | null {
+  if (isRecord(value)) {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{")) {
+    return null;
+  }
+  const path =
+    readPartialJsonStringField(trimmed, [
+      "path",
+      "filePath",
+      "file_path",
+      "targetPath",
+      "target_path",
+      "filename",
+      "name",
+    ])?.value ?? null;
+  const content =
+    readPartialJsonStringField(trimmed, [
+      "content",
+      "text",
+      "afterText",
+      "after_text",
+    ])?.value ?? null;
+  const oldText =
+    readPartialJsonStringField(trimmed, [
+      "oldText",
+      "beforeText",
+      "before_text",
+    ])?.value ?? null;
+  const newText =
+    readPartialJsonStringField(trimmed, ["newText", "afterText", "after_text"])
+      ?.value ?? null;
+  const patch =
+    readPartialJsonStringField(trimmed, [
+      "patch",
+      "diff",
+      "unifiedDiff",
+      "unified_diff",
+    ])?.value ?? null;
+
+  const partialRecord: Record<string, unknown> = {};
+  if (path) {
+    partialRecord.path = path;
+  }
+  if (content) {
+    partialRecord.content = content;
+  }
+  if (oldText) {
+    partialRecord.oldText = oldText;
+  }
+  if (newText) {
+    partialRecord.newText = newText;
+  }
+  if (patch) {
+    partialRecord.patch = patch;
+  }
+
+  return Object.keys(partialRecord).length > 0 ? partialRecord : null;
+}
+
+export function readPath(record: Record<string, unknown>): string | null {
+  return (
+    normalizePath(record.path) ??
+    normalizePath(record.filePath) ??
+    normalizePath(record.file_path) ??
+    normalizePath(record.targetPath) ??
+    normalizePath(record.target_path) ??
+    normalizePath(record.filename) ??
+    normalizePath(record.name)
+  );
+}
+
+export function readOperation(record: Record<string, unknown>): string | null {
+  return (
+    readNonEmptyString(record.operation) ??
+    readNonEmptyString(record.op) ??
+    readNonEmptyString(record.action) ??
+    readNonEmptyString(record.kind) ??
+    readNonEmptyString(record.type) ??
+    readNonEmptyString(record.status)
+  );
+}
+
+function readLineStart(
+  record: Record<string, unknown>,
+  keys: string[],
+): number | null {
+  for (const key of keys) {
+    const value = readPositiveInteger(record[key]);
+    if (value !== null) {
+      return value;
+    }
+  }
+  return null;
+}
+
+export function readOldStartLine(
+  record: Record<string, unknown>,
+): number | null {
+  return readLineStart(record, [
+    "oldStartLine",
+    "old_start_line",
+    "startOldLine",
+    "start_old_line",
+    "oldLineStart",
+    "old_line_start",
+    "oldLineNumber",
+    "old_line_number",
+    "lineStart",
+    "line_start",
+    "startLine",
+    "start_line",
+    "lineNumber",
+    "line_number",
+  ]);
+}
+
+export function readNewStartLine(
+  record: Record<string, unknown>,
+): number | null {
+  return readLineStart(record, [
+    "newStartLine",
+    "new_start_line",
+    "startNewLine",
+    "start_new_line",
+    "newLineStart",
+    "new_line_start",
+    "newLineNumber",
+    "new_line_number",
+    "lineStart",
+    "line_start",
+    "startLine",
+    "start_line",
+    "lineNumber",
+    "line_number",
+  ]);
+}
+
+export function readPatchText(record: Record<string, unknown>): string | null {
+  return (
+    readNonEmptyString(record.patch) ??
+    readNonEmptyString(record.diff) ??
+    readNonEmptyString(record.unifiedDiff) ??
+    readNonEmptyString(record.unified_diff)
+  );
+}
+
+export function readBeforeText(record: Record<string, unknown>): string | null {
+  return (
+    readNonEmptyString(record.beforeText) ??
+    readNonEmptyString(record.before_text) ??
+    readNonEmptyString(record.oldText) ??
+    readNonEmptyString(record.old_text) ??
+    readNonEmptyString(record.oldContent) ??
+    readNonEmptyString(record.old_content) ??
+    readNonEmptyString(record.before) ??
+    readNonEmptyString(record.previous)
+  );
+}
+
+export function readAfterText(record: Record<string, unknown>): string | null {
+  return (
+    readNonEmptyString(record.afterText) ??
+    readNonEmptyString(record.after_text) ??
+    readNonEmptyString(record.newText) ??
+    readNonEmptyString(record.new_text) ??
+    readNonEmptyString(record.newContent) ??
+    readNonEmptyString(record.new_content) ??
+    readNonEmptyString(record.content) ??
+    readNonEmptyString(record.text) ??
+    readNonEmptyString(record.after) ??
+    readNonEmptyString(record.updated)
+  );
+}

package/src/components/chat/chat-composer-state.ts

@@ -55,7 +55,7 @@ export function deriveSelectedAttachmentIdsFromComposer(nodes: ChatComposerNode[
 export function syncComposerSkills(
   nodes: ChatComposerNode[],
   nextSkills: string[],
-  skillRecords: Array<{ spec: string; label?: string }>
+  skillRecords: Array<{ ref: string; name: string }>
 ): ChatComposerNode[] {
   const nextSkillSet = new Set(nextSkills);
   const prunedNodes = removeChatComposerTokenNodes(
@@ -63,14 +63,14 @@ export function syncComposerSkills(
     (node) => node.tokenKind === 'skill' && !nextSkillSet.has(node.tokenKey)
   );
   const existingSkills = extractChatComposerTokenKeys(prunedNodes, 'skill');
-  const recordMap = new Map(skillRecords.map((record) => [record.spec, record]));
+  const recordMap = new Map(skillRecords.map((record) => [record.ref, record]));
   const appendedNodes = nextSkills
     .filter((skill) => !existingSkills.includes(skill))
     .map((skill) =>
       createChatComposerTokenNode({
         tokenKind: 'skill',
         tokenKey: skill,
-        label: recordMap.get(skill)?.label || skill
+        label: recordMap.get(skill)?.name || skill
       })
     );
 

package/src/components/chat/chat-session-display.test.ts

@@ -27,6 +27,27 @@ describe('chat-session-display', () => {
     expect(sessionMatchesQuery(createSession({ label: 'VIP Alpha Thread' }), 'alpha')).toBe(true);
   });
 
+  it('matches the search query against the project name and path', () => {
+    expect(
+      sessionMatchesQuery(
+        createSession({
+          projectRoot: '/Users/demo/workspace/project-apollo',
+          projectName: 'project-apollo'
+        }),
+        'apollo'
+      )
+    ).toBe(true);
+    expect(
+      sessionMatchesQuery(
+        createSession({
+          projectRoot: '/Users/demo/workspace/project-apollo',
+          projectName: 'project-apollo'
+        }),
+        'workspace/project'
+      )
+    ).toBe(true);
+  });
+
   it('treats an empty query as a match', () => {
     expect(sessionMatchesQuery(createSession({ label: 'Anything' }), '   ')).toBe(true);
   });

package/src/components/chat/chat-session-display.ts

@@ -18,7 +18,12 @@ export function sessionMatchesQuery(session: SessionEntryView, query: string): b
     return true;
   }
 
-  return [session.key, sessionDisplayName(session)]
+  return [
+    session.key,
+    sessionDisplayName(session),
+    session.projectRoot ?? '',
+    session.projectName ?? '',
+  ]
     .map(normalizeSessionSearchValue)
     .some((value) => value.includes(normalizedQuery));
 }

package/src/components/chat/containers/chat-input-bar.container.tsx

@@ -15,6 +15,7 @@ import {
   type ChatSkillRecord,
   type ChatThinkingLevel
 } from '@/components/chat/adapters/chat-input-bar.adapter';
+import { deriveSelectedSkillsFromComposer } from '@/components/chat/chat-composer-state';
 import { usePresenter } from '@/components/chat/presenter/chat-presenter-context';
 import {
   CHAT_RECENT_MODELS_MIN_OPTIONS,
@@ -26,6 +27,7 @@ import {
 } from '@/components/chat/chat-recent-skills.manager';
 import { useI18n } from '@/components/providers/I18nProvider';
 import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
+import type { SessionSkillEntryView } from '@/api/types';
 import { t } from '@/lib/i18n';
 import { toast } from 'sonner';
 
@@ -41,19 +43,17 @@ function buildThinkingLabels(): Record<ChatThinkingLevel, string> {
   };
 }
 
-function toSkillRecords(snapshotRecords: Array<{
-  spec: string;
-  label?: string;
-  description?: string;
-  descriptionZh?: string;
-  origin?: string;
-}>, officialBadgeLabel: string): ChatSkillRecord[] {
+function toSkillRecords(
+  snapshotRecords: SessionSkillEntryView[],
+  scopeLabels: Record<SessionSkillEntryView['scope'], string>
+): ChatSkillRecord[] {
   return snapshotRecords.map((record) => ({
-    key: record.spec,
-    label: record.label || record.spec,
+    key: record.ref,
+    label: record.name,
+    scopeLabel: scopeLabels[record.scope],
     description: record.description,
     descriptionZh: record.descriptionZh,
-    badgeLabel: record.origin === 'builtin' ? officialBadgeLabel : undefined
+    badgeLabel: scopeLabels[record.scope]
   }));
 }
 
@@ -87,20 +87,18 @@ export function ChatInputBarContainer() {
   const inputBarRef = useRef<ChatInputBarHandle | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
 
-  const officialSkillBadgeLabel = useMemo(() => {
-    // Keep memo reactive to locale switches even though `t` is imported as a stable function.
-    const locale = language;
-    void locale;
-    return t('chatSkillsPickerOfficial');
+  const skillScopeLabels = useMemo<Record<'project' | 'workspace', string>>(() => {
+    return {
+      project: t('chatSkillScopeProject'),
+      workspace: t('chatSkillScopeWorkspace'),
+    };
   }, [language]);
   const slashTexts = useMemo(
     () => {
-      // Keep memo reactive to locale switches even though `t` is imported as a stable function.
-      const locale = language;
-      void locale;
       return {
         slashSkillSubtitle: t('chatSlashTypeSkill'),
         slashSkillSpecLabel: t('chatSlashSkillSpec'),
+        slashSkillScopeLabel: t('chatSlashSkillScope'),
         noSkillDescription: t('chatSkillsPickerNoDescription')
       };
     },
@@ -108,8 +106,8 @@ export function ChatInputBarContainer() {
   );
 
   const skillRecords = useMemo(
-    () => toSkillRecords(snapshot.skillRecords, officialSkillBadgeLabel),
-    [snapshot.skillRecords, officialSkillBadgeLabel]
+    () => toSkillRecords(snapshot.skillRecords, skillScopeLabels),
+    [snapshot.skillRecords, skillScopeLabels]
   );
   const modelRecords = useMemo(() => toModelRecords(snapshot.modelOptions), [snapshot.modelOptions]);
   const recentModelValues = chatRecentModelsManager.resolveVisible({
@@ -136,10 +134,10 @@ export function ChatInputBarContainer() {
     : hasModelOptions
       ? t('chatInputPlaceholder')
       : t('chatModelNoOptions');
-  const recentModelsLabel = language === 'zh' ? '最近选择' : 'Recent';
-  const allModelsLabel = language === 'zh' ? '全部模型' : 'All models';
-  const recentSkillsLabel = language === 'zh' ? '最近使用' : 'Recent';
-  const allSkillsLabel = language === 'zh' ? '全部技能' : 'All skills';
+  const recentModelsLabel = t('chatPickerRecentModels');
+  const allModelsLabel = t('chatPickerAllModels');
+  const recentSkillsLabel = t('chatPickerRecent');
+  const allSkillsLabel = t('chatPickerAllSkills');
 
   const slashItems = useMemo(
     () => buildChatSlashItems(skillRecords, slashQuery ?? '', slashTexts, recentSkillValues),
@@ -236,6 +234,12 @@ export function ChatInputBarContainer() {
     }
   });
 
+  const composerSelectedSkillCount = deriveSelectedSkillsFromComposer(snapshot.composerNodes).length;
+  const hasSendableDraft =
+    snapshot.draft.trim().length > 0 ||
+    snapshot.attachments.length > 0 ||
+    composerSelectedSkillCount > 0;
+
   return (
     <>
       <ChatInputBar
@@ -296,14 +300,7 @@ export function ChatInputBarContainer() {
             sendError: snapshot.sendError,
             isSending: snapshot.isSending,
             canStopGeneration: snapshot.canStopGeneration,
-            sendDisabled:
-              (
-                snapshot.draft.trim().length === 0 &&
-                snapshot.attachments.length === 0 &&
-                snapshot.selectedSkills.length === 0
-              ) ||
-              !hasModelOptions ||
-              snapshot.sessionTypeUnavailable,
+            sendDisabled: !hasSendableDraft || !hasModelOptions || snapshot.sessionTypeUnavailable,
             stopDisabled: !snapshot.canStopGeneration,
             stopHint: resolvedStopHint,
             sendButtonLabel: t('chatSend'),

package/src/components/chat/containers/chat-message-list.container.tsx

@@ -40,6 +40,7 @@ function buildChatMessageAdapterTexts(
     reasoningLabel: t("chatReasoning"),
     toolCallLabel: t("chatToolCall"),
     toolResultLabel: t("chatToolResult"),
+    toolInputLabel: t("chatToolInput"),
     toolNoOutputLabel: t("chatToolNoOutput"),
     toolOutputLabel: t("chatToolOutput"),
     toolStatusPreparingLabel: t("chatToolStatusPreparing"),

package/src/components/chat/hooks/use-chat-session-label.ts

@@ -0,0 +1,19 @@
+import { t } from '@/lib/i18n';
+import { useChatSessionUpdate } from '@/components/chat/hooks/use-chat-session-update';
+
+type UpdateChatSessionLabelParams = {
+  sessionKey: string;
+  label: string | null;
+};
+
+export function useChatSessionLabel() {
+  const updateSession = useChatSessionUpdate();
+
+  return async (params: UpdateChatSessionLabelParams): Promise<void> => {
+    await updateSession({
+      sessionKey: params.sessionKey,
+      patch: { label: params.label },
+      successMessage: t('configSavedApplied'),
+    });
+  };
+}

package/src/components/chat/hooks/use-chat-session-project.test.tsx

@@ -0,0 +1,117 @@
+import { act, renderHook } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { toast } from 'sonner';
+import { useChatSessionProject } from '@/components/chat/hooks/use-chat-session-project';
+import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
+
+const mocks = vi.hoisted(() => ({
+  updateSession: vi.fn(),
+}));
+
+vi.mock('sonner', () => ({
+  toast: {
+    success: vi.fn(),
+  },
+}));
+
+vi.mock('@/components/chat/hooks/use-chat-session-update', () => ({
+  useChatSessionUpdate: () => mocks.updateSession,
+}));
+
+describe('useChatSessionProject', () => {
+  beforeEach(() => {
+    useChatInputStore.setState((state) => ({
+      snapshot: {
+        ...state.snapshot,
+        pendingProjectRoot: null,
+        pendingProjectRootSessionKey: null,
+      },
+    }));
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('stores the draft project root locally when the session does not exist yet', async () => {
+    const { result } = renderHook(() => useChatSessionProject());
+
+    await act(async () => {
+      await result.current({
+        sessionKey: 'draft-session-1',
+        projectRoot: '/tmp/project-alpha',
+        persistToServer: false,
+      });
+    });
+
+    expect(mocks.updateSession).not.toHaveBeenCalled();
+    expect(useChatInputStore.getState().snapshot).toMatchObject({
+      pendingProjectRoot: '/tmp/project-alpha',
+      pendingProjectRootSessionKey: 'draft-session-1',
+    });
+    expect(toast.success).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps an explicit draft override when clearing the project root locally', async () => {
+    const { result } = renderHook(() => useChatSessionProject());
+
+    await act(async () => {
+      await result.current({
+        sessionKey: 'draft-session-1',
+        projectRoot: null,
+        persistToServer: false,
+      });
+    });
+
+    expect(mocks.updateSession).not.toHaveBeenCalled();
+    expect(useChatInputStore.getState().snapshot).toMatchObject({
+      pendingProjectRoot: null,
+      pendingProjectRootSessionKey: 'draft-session-1',
+    });
+    expect(toast.success).toHaveBeenCalledTimes(1);
+  });
+
+  it('persists to the server and mirrors the updated project override locally for an existing session', async () => {
+    const { result } = renderHook(() => useChatSessionProject());
+
+    await act(async () => {
+      await result.current({
+        sessionKey: 'session-1',
+        projectRoot: '/tmp/project-beta',
+        persistToServer: true,
+      });
+    });
+
+    expect(mocks.updateSession).toHaveBeenCalledWith({
+      sessionKey: 'session-1',
+      patch: { projectRoot: '/tmp/project-beta' },
+      successMessage: 'Project directory updated',
+    });
+    expect(useChatInputStore.getState().snapshot).toMatchObject({
+      pendingProjectRoot: '/tmp/project-beta',
+      pendingProjectRootSessionKey: 'session-1',
+    });
+  });
+
+  it('persists clearing to the server and keeps the cleared override until session state catches up', async () => {
+    const { result } = renderHook(() => useChatSessionProject());
+
+    await act(async () => {
+      await result.current({
+        sessionKey: 'session-1',
+        projectRoot: null,
+        persistToServer: true,
+      });
+    });
+
+    expect(mocks.updateSession).toHaveBeenCalledWith({
+      sessionKey: 'session-1',
+      patch: { projectRoot: null },
+      successMessage: 'Project directory cleared',
+    });
+    expect(useChatInputStore.getState().snapshot).toMatchObject({
+      pendingProjectRoot: null,
+      pendingProjectRootSessionKey: 'session-1',
+    });
+  });
+});

package/src/components/chat/hooks/use-chat-session-project.ts

@@ -0,0 +1,40 @@
+import { toast } from 'sonner';
+import { t } from '@/lib/i18n';
+import { useChatSessionUpdate } from '@/components/chat/hooks/use-chat-session-update';
+import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
+
+type UpdateChatSessionProjectParams = {
+  sessionKey: string;
+  projectRoot: string | null;
+  persistToServer: boolean;
+};
+
+export function useChatSessionProject() {
+  const updateSession = useChatSessionUpdate();
+
+  return async (params: UpdateChatSessionProjectParams): Promise<void> => {
+    const successMessage = params.projectRoot
+      ? t('chatSessionProjectUpdated')
+      : t('chatSessionProjectCleared');
+
+    if (!params.persistToServer) {
+      useChatInputStore.getState().setSnapshot({
+        pendingProjectRoot: params.projectRoot,
+        pendingProjectRootSessionKey: params.sessionKey
+      });
+      toast.success(successMessage);
+      return;
+    }
+
+    await updateSession({
+      sessionKey: params.sessionKey,
+      patch: { projectRoot: params.projectRoot },
+      successMessage,
+    });
+
+    useChatInputStore.getState().setSnapshot({
+      pendingProjectRoot: params.projectRoot,
+      pendingProjectRootSessionKey: params.sessionKey,
+    });
+  };
+}

package/src/components/chat/{chat-session-label.service.ts → hooks/use-chat-session-update.ts}

@@ -1,24 +1,28 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { toast } from 'sonner';
+import type { SessionPatchUpdate } from '@/api/types';
 import { upsertNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
 import { updateNcpSession } from '@/api/ncp-session';
 import { t } from '@/lib/i18n';
 
-type UpdateChatSessionLabelParams = {
+type UpdateChatSessionParams = {
   sessionKey: string;
-  label: string | null;
+  patch: SessionPatchUpdate;
+  successMessage?: string;
 };
 
-export function useChatSessionLabelService() {
+export function useChatSessionUpdate() {
   const queryClient = useQueryClient();
 
-  return async (params: UpdateChatSessionLabelParams): Promise<void> => {
+  return async (params: UpdateChatSessionParams): Promise<void> => {
     try {
-      const updated = await updateNcpSession(params.sessionKey, { label: params.label });
+      const updated = await updateNcpSession(params.sessionKey, params.patch);
       upsertNcpSessionSummaryInQueryClient(queryClient, updated);
-      toast.success(t('configSavedApplied'));
+      toast.success(params.successMessage ?? t('configSavedApplied'));
     } catch (error) {
-      toast.error(t('configSaveFailed') + ': ' + (error instanceof Error ? error.message : String(error)));
+      toast.error(
+        t('configSaveFailed') + ': ' + (error instanceof Error ? error.message : String(error)),
+      );
       throw error;
     }
   };

package/src/components/chat/managers/chat-session-list.manager.ts

@@ -44,7 +44,11 @@ export class ChatSessionListManager {
         ? sessionType.trim()
         : defaultSessionType;
     this.streamActionsManager.resetStreamState();
-    useChatInputStore.getState().setSnapshot({ pendingSessionType: nextSessionType });
+    useChatInputStore.getState().setSnapshot({
+      pendingSessionType: nextSessionType,
+      pendingProjectRoot: null,
+      pendingProjectRootSessionKey: null
+    });
     this.uiManager.goToChatRoot();
   };