clawdex-mobile 2.0.1 → 3.0.0

package/apps/mobile/src/navigation/__tests__/chatThreadTree.test.ts

@@ -0,0 +1,89 @@
+import type { ChatSummary } from '../../api/types';
+import { buildChatWorkspaceSections } from '../chatThreadTree';
+
+function chat(partial: Partial<ChatSummary> & Pick<ChatSummary, 'id' | 'updatedAt'>): ChatSummary {
+  return {
+    id: partial.id,
+    title: partial.title ?? partial.id,
+    status: partial.status ?? 'idle',
+    createdAt: partial.createdAt ?? '2026-03-19T00:00:00.000Z',
+    updatedAt: partial.updatedAt,
+    statusUpdatedAt: partial.statusUpdatedAt ?? partial.updatedAt,
+    lastMessagePreview: partial.lastMessagePreview ?? '',
+    cwd: partial.cwd,
+    modelProvider: partial.modelProvider,
+    sourceKind: partial.sourceKind,
+    parentThreadId: partial.parentThreadId,
+    subAgentDepth: partial.subAgentDepth,
+    lastRunStartedAt: partial.lastRunStartedAt,
+    lastRunFinishedAt: partial.lastRunFinishedAt,
+    lastRunDurationMs: partial.lastRunDurationMs,
+    lastRunExitCode: partial.lastRunExitCode,
+    lastRunTimedOut: partial.lastRunTimedOut,
+    lastError: partial.lastError,
+  };
+}
+
+describe('buildChatWorkspaceSections', () => {
+  it('nests sub-agent rows below their root thread', () => {
+    const sections = buildChatWorkspaceSections([
+      chat({
+        id: 'root',
+        title: 'Review repo',
+        cwd: '/workspace/repo',
+        updatedAt: '2026-03-20T10:00:00.000Z',
+      }),
+      chat({
+        id: 'agent-a',
+        title: 'Review app',
+        cwd: '/workspace/repo/sub',
+        updatedAt: '2026-03-20T09:59:00.000Z',
+        parentThreadId: 'root',
+        sourceKind: 'subAgentThreadSpawn',
+        subAgentDepth: 1,
+      }),
+      chat({
+        id: 'agent-b',
+        title: 'Review bridge',
+        cwd: '/workspace/repo',
+        updatedAt: '2026-03-20T09:58:00.000Z',
+        parentThreadId: 'root',
+        sourceKind: 'subAgentReview',
+        subAgentDepth: 1,
+      }),
+    ]);
+
+    expect(sections).toHaveLength(1);
+    expect(sections[0].title).toBe('repo');
+    expect(sections[0].itemCount).toBe(3);
+    expect(sections[0].data.map((row) => [row.chat.id, row.indentLevel])).toEqual([
+      ['root', 0],
+      ['agent-a', 1],
+      ['agent-b', 1],
+    ]);
+  });
+
+  it('groups sub-agent rows under the root workspace', () => {
+    const sections = buildChatWorkspaceSections([
+      chat({
+        id: 'root',
+        title: 'Root',
+        cwd: '/workspace/one',
+        updatedAt: '2026-03-20T10:00:00.000Z',
+      }),
+      chat({
+        id: 'child',
+        title: 'Child',
+        cwd: '/workspace/two',
+        updatedAt: '2026-03-20T09:59:00.000Z',
+        parentThreadId: 'root',
+        sourceKind: 'subAgentThreadSpawn',
+        subAgentDepth: 1,
+      }),
+    ]);
+
+    expect(sections).toHaveLength(1);
+    expect(sections[0].key).toBe('/workspace/one');
+    expect(sections[0].data.map((row) => row.chat.id)).toEqual(['root', 'child']);
+  });
+});

package/apps/mobile/src/navigation/__tests__/drawerChats.test.ts

@@ -0,0 +1,65 @@
+import type { ChatSummary } from '../../api/types';
+import { filterDrawerChats, isSubAgentChat } from '../drawerChats';
+
+function chat(
+  id: string,
+  partial: Partial<ChatSummary> = {}
+): ChatSummary {
+  return {
+    id,
+    title: partial.title ?? id,
+    status: partial.status ?? 'idle',
+    createdAt: partial.createdAt ?? '2026-03-20T00:00:00.000Z',
+    updatedAt: partial.updatedAt ?? '2026-03-20T00:00:00.000Z',
+    statusUpdatedAt: partial.statusUpdatedAt ?? '2026-03-20T00:00:00.000Z',
+    lastMessagePreview: partial.lastMessagePreview ?? '',
+    cwd: partial.cwd,
+    modelProvider: partial.modelProvider,
+    sourceKind: partial.sourceKind,
+    parentThreadId: partial.parentThreadId,
+    subAgentDepth: partial.subAgentDepth,
+    lastRunStartedAt: partial.lastRunStartedAt,
+    lastRunFinishedAt: partial.lastRunFinishedAt,
+    lastRunDurationMs: partial.lastRunDurationMs,
+    lastRunExitCode: partial.lastRunExitCode,
+    lastRunTimedOut: partial.lastRunTimedOut,
+    lastError: partial.lastError,
+  };
+}
+
+describe('drawerChats', () => {
+  it('recognizes sub-agent chats from parent thread or source kind', () => {
+    expect(isSubAgentChat(chat('root'))).toBe(false);
+    expect(
+      isSubAgentChat(
+        chat('child-parent', {
+          parentThreadId: 'root',
+        })
+      )
+    ).toBe(true);
+    expect(
+      isSubAgentChat(
+        chat('child-source', {
+          sourceKind: 'subAgentThreadSpawn',
+        })
+      )
+    ).toBe(true);
+  });
+
+  it('filters sub-agent chats out of the top-level drawer list', () => {
+    const chats = [
+      chat('root', { title: 'Main thread' }),
+      chat('worker-1', {
+        title: 'Spawned worker',
+        sourceKind: 'subAgentThreadSpawn',
+        parentThreadId: 'root',
+      }),
+      chat('worker-2', {
+        title: 'Review worker',
+        sourceKind: 'subAgentReview',
+      }),
+    ];
+
+    expect(filterDrawerChats(chats).map((entry) => entry.id)).toEqual(['root']);
+  });
+});

package/apps/mobile/src/navigation/chatThreadTree.ts

@@ -0,0 +1,191 @@
+import type { ChatSummary } from '../api/types';
+
+export interface DrawerThreadRow {
+  chat: ChatSummary;
+  indentLevel: number;
+  rootThreadId: string;
+}
+
+export interface ChatWorkspaceSection {
+  key: string;
+  title: string;
+  subtitle?: string;
+  itemCount: number;
+  data: DrawerThreadRow[];
+}
+
+const DEFAULT_WORKSPACE_KEY = '__bridge_default_workspace__';
+
+export function buildChatWorkspaceSections(chats: ChatSummary[]): ChatWorkspaceSection[] {
+  if (chats.length === 0) {
+    return [];
+  }
+
+  const chatMap = new Map<string, ChatSummary>();
+  for (const chat of chats) {
+    chatMap.set(chat.id, chat);
+  }
+
+  const childrenByParentId = new Map<string, ChatSummary[]>();
+  const roots: ChatSummary[] = [];
+
+  for (const chat of chats) {
+    const parentThreadId = normalizeThreadId(chat.parentThreadId);
+    if (!parentThreadId || !chatMap.has(parentThreadId) || parentThreadId === chat.id) {
+      roots.push(chat);
+      continue;
+    }
+
+    const siblings = childrenByParentId.get(parentThreadId);
+    if (siblings) {
+      siblings.push(chat);
+    } else {
+      childrenByParentId.set(parentThreadId, [chat]);
+    }
+  }
+
+  const rootsByWorkspace = new Map<
+    string,
+    {
+      cwd: string | null;
+      roots: ChatSummary[];
+      latestUpdatedAt: string;
+    }
+  >();
+
+  for (const root of roots.sort(compareByUpdatedAtDesc)) {
+    const rootCwd = normalizeCwd(root.cwd);
+    const key = workspaceKey(rootCwd);
+    const existing = rootsByWorkspace.get(key);
+
+    if (existing) {
+      existing.roots.push(root);
+      if (root.updatedAt.localeCompare(existing.latestUpdatedAt) > 0) {
+        existing.latestUpdatedAt = root.updatedAt;
+      }
+      continue;
+    }
+
+    rootsByWorkspace.set(key, {
+      cwd: rootCwd,
+      roots: [root],
+      latestUpdatedAt: root.updatedAt,
+    });
+  }
+
+  return Array.from(rootsByWorkspace.entries())
+    .sort(([, left], [, right]) => right.latestUpdatedAt.localeCompare(left.latestUpdatedAt))
+    .map(([key, bucket]) => {
+      const data: DrawerThreadRow[] = [];
+      for (const root of bucket.roots.sort(compareByUpdatedAtDesc)) {
+        appendChatBranch(data, root, 0, root.id, childrenByParentId);
+      }
+
+      return {
+        key,
+        title: workspaceTitle(bucket.cwd),
+        subtitle: workspaceSubtitle(bucket.cwd),
+        itemCount: data.length,
+        data,
+      };
+    });
+}
+
+function appendChatBranch(
+  rows: DrawerThreadRow[],
+  chat: ChatSummary,
+  indentLevel: number,
+  rootThreadId: string,
+  childrenByParentId: Map<string, ChatSummary[]>
+): void {
+  rows.push({
+    chat,
+    indentLevel,
+    rootThreadId,
+  });
+
+  const children = [...(childrenByParentId.get(chat.id) ?? [])].sort(compareBranchChildren);
+  for (const child of children) {
+    appendChatBranch(rows, child, indentLevel + 1, rootThreadId, childrenByParentId);
+  }
+}
+
+function compareBranchChildren(left: ChatSummary, right: ChatSummary): number {
+  if (left.status === 'running' && right.status !== 'running') {
+    return -1;
+  }
+  if (right.status === 'running' && left.status !== 'running') {
+    return 1;
+  }
+
+  const depthDiff = (left.subAgentDepth ?? 0) - (right.subAgentDepth ?? 0);
+  if (depthDiff !== 0) {
+    return depthDiff;
+  }
+
+  const updatedDiff = right.updatedAt.localeCompare(left.updatedAt);
+  if (updatedDiff !== 0) {
+    return updatedDiff;
+  }
+
+  return left.title.localeCompare(right.title);
+}
+
+function compareByUpdatedAtDesc(left: ChatSummary, right: ChatSummary): number {
+  return right.updatedAt.localeCompare(left.updatedAt);
+}
+
+function normalizeThreadId(value: string | null | undefined): string | null {
+  if (typeof value !== 'string') {
+    return null;
+  }
+
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function normalizeCwd(value: string | null | undefined): string | null {
+  if (typeof value !== 'string') {
+    return null;
+  }
+
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function workspaceKey(cwd: string | null): string {
+  return cwd ?? DEFAULT_WORKSPACE_KEY;
+}
+
+function workspaceTitle(cwd: string | null): string {
+  if (!cwd) {
+    return 'Bridge default workspace';
+  }
+
+  const normalized = cwd.replace(/\\/g, '/').replace(/\/+$/, '');
+  if (!normalized) {
+    return cwd;
+  }
+
+  const lastSlash = normalized.lastIndexOf('/');
+  if (lastSlash === -1) {
+    return normalized;
+  }
+
+  return normalized.slice(lastSlash + 1) || normalized;
+}
+
+function workspaceSubtitle(cwd: string | null): string | undefined {
+  if (!cwd) {
+    return undefined;
+  }
+
+  const normalized = cwd.replace(/\\/g, '/').replace(/\/+$/, '');
+  const segments = normalized.split('/').filter(Boolean);
+
+  if (segments.length <= 2) {
+    return normalized;
+  }
+
+  return `.../${segments.slice(-2).join('/')}`;
+}

package/apps/mobile/src/navigation/drawerChats.ts

@@ -0,0 +1,9 @@
+import type { ChatSummary } from '../api/types';
+
+export function filterDrawerChats(chats: ChatSummary[]): ChatSummary[] {
+  return chats.filter((chat) => !isSubAgentChat(chat));
+}
+
+export function isSubAgentChat(chat: ChatSummary): boolean {
+  return Boolean(chat.parentThreadId) || chat.sourceKind?.startsWith('subAgent') === true;
+}

package/apps/mobile/src/screens/GitScreen.tsx

@@ -461,6 +461,7 @@ export function GitScreen({ api, chat, onBack, onChatUpdated }: GitScreenProps)
             style={styles.input}
             value={workspaceDraft}
             onChangeText={setWorkspaceDraft}
+            keyboardAppearance="dark"
             onSubmitEditing={commitWorkspaceIfChanged}
             onBlur={commitWorkspaceIfChanged}
             placeholder="/path/to/project"
@@ -515,6 +516,7 @@ export function GitScreen({ api, chat, onBack, onChatUpdated }: GitScreenProps)
               style={styles.input}
               value={commitMessage}
               onChangeText={setCommitMessage}
+              keyboardAppearance="dark"
               placeholder="Commit message..."
               placeholderTextColor={colors.textMuted}
             />