@lobehub/lobehub 2.0.0-next.294 → 2.0.0-next.296

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.296](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.295...v2.0.0-next.296)
+
+<sup>Released on **2026-01-16**</sup>
+
+#### 💄 Styles
+
+- **misc**: Improve todo list.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Improve todo list, closes [#11533](https://github.com/lobehub/lobe-chat/issues/11533) ([a4b71e9](https://github.com/lobehub/lobe-chat/commit/a4b71e9))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.295](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.294...v2.0.0-next.295)
+
+<sup>Released on **2026-01-15**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Migrate Next.js navigation APIs to React Router for SPA.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Migrate Next.js navigation APIs to React Router for SPA, closes [#11394](https://github.com/lobehub/lobe-chat/issues/11394) ([2253d46](https://github.com/lobehub/lobe-chat/commit/2253d46))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.294](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.293...v2.0.0-next.294)
 
 <sup>Released on **2026-01-15**</sup>

package/apps/desktop/src/main/__mocks__/node-mac-permissions.ts

@@ -2,7 +2,6 @@
  * Mock for node-mac-permissions native module
  * Used in tests since the native module only works on macOS
  */
-
 import { vi } from 'vitest';
 
 export const askForAccessibilityAccess = vi.fn(() => undefined);

package/apps/desktop/src/main/__mocks__/setup.ts

@@ -1,7 +1,6 @@
 /**
  * Vitest setup file for mocking native modules
  */
-
 import { vi } from 'vitest';
 
 // Mock node-mac-permissions before any imports

package/apps/desktop/src/main/controllers/__tests__/SystemCtr.test.ts

@@ -4,10 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { App } from '@/core/App';
 import type { IpcContext } from '@/utils/ipc';
 import { IpcHandler } from '@/utils/ipc/base';
-import {
-  __resetMacPermissionsModuleCache,
-  __setMacPermissionsModule,
-} from '@/utils/permissions';
+import { __resetMacPermissionsModuleCache, __setMacPermissionsModule } from '@/utils/permissions';
 
 import SystemController from '../SystemCtr';
 

package/apps/desktop/tsconfig.json

@@ -15,15 +15,9 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "paths": {
-      "@/*": [
-        "./src/main/*"
-      ],
-      "~common/*": [
-        "./src/common/*"
-      ],
-      "*": [
-        "./*"
-      ]
+      "@/*": ["./src/main/*"],
+      "~common/*": ["./src/common/*"],
+      "*": ["./*"]
     }
   },
   "include": [
@@ -33,4 +27,4 @@
     "electron-builder.js",
     "native-deps.config.js"
   ]
-}
+}

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Improve todo list."
+      ]
+    },
+    "date": "2026-01-16",
+    "version": "2.0.0-next.296"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Migrate Next.js navigation APIs to React Router for SPA."
+      ]
+    },
+    "date": "2026-01-15",
+    "version": "2.0.0-next.295"
+  },
   {
     "children": {},
     "date": "2026-01-15",

package/e2e/scripts/setup.ts

@@ -16,9 +16,7 @@
  *   --port <port>  Server port (default: 3006)
  *   --help         Show help message
  */
-
-import { type ChildProcess, spawn, spawnSync } from 'node:child_process';
-import { existsSync, unlinkSync, writeFileSync } from 'node:fs';
+import { spawn, spawnSync } from 'node:child_process';
 import { resolve } from 'node:path';
 
 // ============================================================================
@@ -33,21 +31,27 @@ const CONFIG = {
   defaultPort: 3006,
   dockerImage: 'paradedb/paradedb:latest',
   projectRoot: resolve(__dirname, '../..'),
-  serverTimeout: 120_000, // 2 minutes
-
-  // Secrets (for e2e testing only)
-  secrets: {
-    betterAuthSecret: 'e2e-test-secret-key-for-better-auth-32chars!',
-    keyVaultsSecret: 'LA7n9k3JdEcbSgml2sxfw+4TV1AzaaFU5+R176aQz4s=',
-  },
+  
 
-  // S3 Mock (required even if not testing file uploads)
-  s3Mock: {
+// S3 Mock (required even if not testing file uploads)
+s3Mock: {
     accessKeyId: 'e2e-mock-access-key',
     bucket: 'e2e-mock-bucket',
     endpoint: 'https://e2e-mock-s3.localhost',
     secretAccessKey: 'e2e-mock-secret-key',
+  }, 
+
+  
+  
+// 2 minutes
+// Secrets (for e2e testing only)
+secrets: {
+    betterAuthSecret: 'e2e-test-secret-key-for-better-auth-32chars!',
+    keyVaultsSecret: 'LA7n9k3JdEcbSgml2sxfw+4TV1AzaaFU5+R176aQz4s=',
   },
+
+  
+  serverTimeout: 120_000,
 };
 
 // ============================================================================
@@ -55,11 +59,11 @@ const CONFIG = {
 // ============================================================================
 
 const colors = {
-  cyan: (s: string) => `\x1b[36m${s}\x1b[0m`,
-  dim: (s: string) => `\x1b[2m${s}\x1b[0m`,
-  green: (s: string) => `\x1b[32m${s}\x1b[0m`,
-  red: (s: string) => `\x1b[31m${s}\x1b[0m`,
-  yellow: (s: string) => `\x1b[33m${s}\x1b[0m`,
+  cyan: (s: string) => `\u001B[36m${s}\u001B[0m`,
+  dim: (s: string) => `\u001B[2m${s}\u001B[0m`,
+  green: (s: string) => `\u001B[32m${s}\u001B[0m`,
+  red: (s: string) => `\u001B[31m${s}\u001B[0m`,
+  yellow: (s: string) => `\u001B[33m${s}\u001B[0m`,
 };
 
 function log(emoji: string, message: string) {
@@ -73,12 +77,12 @@ function logStep(step: number, total: number, message: string) {
 function exec(
   command: string,
   args: string[] = [],
-  options: { cwd?: string; silent?: boolean } = {}
+  options: { cwd?: string; silent?: boolean } = {},
 ) {
   const { cwd = CONFIG.projectRoot, silent = false } = options;
   const result = spawnSync(command, args, {
     cwd,
-    encoding: 'utf-8',
+    encoding: 'utf8',
     shell: true,
     stdio: silent ? 'pipe' : 'inherit',
   });
@@ -88,7 +92,7 @@ function exec(
 function execAsync(
   command: string,
   args: string[] = [],
-  env: Record<string, string> = {}
+  env: Record<string, string> = {},
 ): Promise<void> {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
@@ -111,14 +115,16 @@ function execAsync(
 }
 
 async function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
 }
 
 async function waitForCondition(
   check: () => Promise<boolean>,
   timeout: number,
   interval: number = 1000,
-  onWait?: () => void
+  onWait?: () => void,
 ): Promise<boolean> {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
@@ -204,7 +210,7 @@ async function startPostgres(): Promise<void> {
     },
     30_000,
     2000,
-    () => process.stdout.write('.')
+    () => process.stdout.write('.'),
   );
 
   console.log();
@@ -327,7 +333,7 @@ async function startServer(port: number): Promise<void> {
     () => isServerRunning(port),
     CONFIG.serverTimeout,
     2000,
-    () => process.stdout.write('.')
+    () => process.stdout.write('.'),
   );
 
   console.log();
@@ -412,27 +418,34 @@ function parseArgs(): Options {
   for (let i = 0; i < args.length; i++) {
     switch (args[i]) {
       case '--help':
-      case '-h':
+      case '-h': {
         options.help = true;
         break;
-      case '--clean':
+      }
+      case '--clean': {
         options.clean = true;
         break;
-      case '--skip-db':
+      }
+      case '--skip-db': {
         options.skipDb = true;
         break;
-      case '--skip-migrate':
+      }
+      case '--skip-migrate': {
         options.skipMigrate = true;
         break;
-      case '--build':
+      }
+      case '--build': {
         options.build = true;
         break;
-      case '--start':
+      }
+      case '--start': {
         options.start = true;
         break;
-      case '--port':
+      }
+      case '--port': {
         options.port = parseInt(args[++i], 10) || CONFIG.defaultPort;
         break;
+      }
     }
   }
 
@@ -526,4 +539,4 @@ ${colors.green('✅ E2E environment setup completed!')}
   }
 }
 
-main();
+await main();

package/locales/en-US/plugin.json

@@ -173,6 +173,10 @@
   "builtins.lobe-user-memory.apiName.removeIdentityMemory": "Delete identity memory",
   "builtins.lobe-user-memory.apiName.searchUserMemory": "Search memory",
   "builtins.lobe-user-memory.apiName.updateIdentityMemory": "Update identity memory",
+  "builtins.lobe-user-memory.inspector.noResults": "No results",
+  "builtins.lobe-user-memory.render.contexts": "Contexts",
+  "builtins.lobe-user-memory.render.experiences": "Experiences",
+  "builtins.lobe-user-memory.render.preferences": "Preferences",
   "builtins.lobe-user-memory.title": "Memory",
   "builtins.lobe-web-browsing.apiName.crawlMultiPages": "Read multiple pages",
   "builtins.lobe-web-browsing.apiName.crawlSinglePage": "Read page content",

package/locales/zh-CN/plugin.json

@@ -173,6 +173,10 @@
   "builtins.lobe-user-memory.apiName.removeIdentityMemory": "删除身份记忆",
   "builtins.lobe-user-memory.apiName.searchUserMemory": "搜索记忆",
   "builtins.lobe-user-memory.apiName.updateIdentityMemory": "更新身份记忆",
+  "builtins.lobe-user-memory.inspector.noResults": "无结果",
+  "builtins.lobe-user-memory.render.contexts": "情境记忆",
+  "builtins.lobe-user-memory.render.experiences": "经验记忆",
+  "builtins.lobe-user-memory.render.preferences": "偏好记忆",
   "builtins.lobe-user-memory.title": "记忆",
   "builtins.lobe-web-browsing.apiName.crawlMultiPages": "读取多个页面内容",
   "builtins.lobe-web-browsing.apiName.crawlSinglePage": "读取页面内容",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.294",
+  "version": "2.0.0-next.296",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/packages/agent-runtime/src/core/__tests__/runtime.test.ts

@@ -1607,8 +1607,8 @@ describe('AgentRuntime', () => {
       const stepContext = {
         todos: {
           items: [
-            { text: 'Buy milk', completed: false },
-            { text: 'Call mom', completed: true },
+            { text: 'Buy milk', status: 'todo' as const },
+            { text: 'Call mom', status: 'completed' as const },
           ],
           updatedAt: '2024-06-01T00:00:00.000Z',
         },
@@ -1634,7 +1634,7 @@ describe('AgentRuntime', () => {
           stepContext: expect.objectContaining({
             todos: expect.objectContaining({
               items: expect.arrayContaining([
-                expect.objectContaining({ text: 'Buy milk', completed: false }),
+                expect.objectContaining({ text: 'Buy milk', status: 'todo' }),
               ]),
             }),
           }),
@@ -1666,7 +1666,7 @@ describe('AgentRuntime', () => {
 
       const stepContext = {
         todos: {
-          items: [{ text: 'Task 1', completed: false }],
+          items: [{ text: 'Task 1', status: 'todo' as const }],
           updatedAt: '2024-06-01T00:00:00.000Z',
         },
       };
@@ -1746,7 +1746,7 @@ describe('AgentRuntime', () => {
 
       const stepContext = {
         todos: {
-          items: [{ text: 'Batch task', completed: false }],
+          items: [{ text: 'Batch task', status: 'todo' as const }],
           updatedAt: '2024-06-01T00:00:00.000Z',
         },
       };

package/packages/agent-runtime/src/utils/stepContextComputer.test.ts

@@ -7,8 +7,8 @@ describe('computeStepContext', () => {
     it('should include todos when provided', () => {
       const todos = {
         items: [
-          { text: 'Buy milk', completed: false },
-          { text: 'Call mom', completed: true },
+          { text: 'Buy milk', status: 'todo' as const },
+          { text: 'Call mom', status: 'completed' as const },
         ],
         updatedAt: '2024-06-01T00:00:00.000Z',
       };
@@ -18,9 +18,9 @@ describe('computeStepContext', () => {
       expect(result.todos).toBeDefined();
       expect(result.todos?.items).toHaveLength(2);
       expect(result.todos?.items[0].text).toBe('Buy milk');
-      expect(result.todos?.items[0].completed).toBe(false);
+      expect(result.todos?.items[0].status).toBe('todo');
       expect(result.todos?.items[1].text).toBe('Call mom');
-      expect(result.todos?.items[1].completed).toBe(true);
+      expect(result.todos?.items[1].status).toBe('completed');
     });
 
     it('should not include todos key when undefined', () => {
@@ -42,7 +42,7 @@ describe('computeStepContext', () => {
       // This should compile and work - object param allows future extensions
       const result = computeStepContext({
         todos: {
-          items: [{ text: 'Task', completed: false }],
+          items: [{ text: 'Task', status: 'todo' as const }],
           updatedAt: '2024-01-01T00:00:00.000Z',
         },
       });

package/packages/builtin-tool-gtd/src/client/Inspector/index.ts

@@ -2,12 +2,10 @@ import { type BuiltinInspector } from '@lobechat/types';
 
 import { GTDApiName } from '../../types';
 import { ClearTodosInspector } from './ClearTodos';
-import { CompleteTodosInspector } from './CompleteTodos';
 import { CreatePlanInspector } from './CreatePlan';
 import { CreateTodosInspector } from './CreateTodos';
 import { ExecTaskInspector } from './ExecTask';
 import { ExecTasksInspector } from './ExecTasks';
-import { RemoveTodosInspector } from './RemoveTodos';
 import { UpdatePlanInspector } from './UpdatePlan';
 import { UpdateTodosInspector } from './UpdateTodos';
 
@@ -19,12 +17,10 @@ import { UpdateTodosInspector } from './UpdateTodos';
  */
 export const GTDInspectors: Record<string, BuiltinInspector> = {
   [GTDApiName.clearTodos]: ClearTodosInspector as BuiltinInspector,
-  [GTDApiName.completeTodos]: CompleteTodosInspector as BuiltinInspector,
   [GTDApiName.createPlan]: CreatePlanInspector as BuiltinInspector,
   [GTDApiName.createTodos]: CreateTodosInspector as BuiltinInspector,
   [GTDApiName.execTask]: ExecTaskInspector as BuiltinInspector,
   [GTDApiName.execTasks]: ExecTasksInspector as BuiltinInspector,
-  [GTDApiName.removeTodos]: RemoveTodosInspector as BuiltinInspector,
   [GTDApiName.updatePlan]: UpdatePlanInspector as BuiltinInspector,
   [GTDApiName.updateTodos]: UpdateTodosInspector as BuiltinInspector,
 };

package/packages/builtin-tool-gtd/src/client/Intervention/AddTodo.tsx

@@ -17,7 +17,7 @@ const AddTodoIntervention = memo<BuiltinInterventionProps<CreateTodosParams>>(
     // - Initial AI input: { adds: string[] } (from AI)
     // - After user edit: { items: TodoItem[] } (saved format)
     const defaultItems: TodoItem[] =
-      args?.items || args?.adds?.map((text) => ({ completed: false, text })) || [];
+      args?.items || args?.adds?.map((text) => ({ status: 'todo', text })) || [];
 
     const handleSave = useCallback(
       async (items: TodoItem[]) => {

package/packages/builtin-tool-gtd/src/client/Render/TodoList/index.tsx

@@ -1,11 +1,12 @@
 'use client';
 
 import { type BuiltinRenderProps } from '@lobechat/types';
-import { Block, Checkbox } from '@lobehub/ui';
-import { createStaticStyles, cssVar } from 'antd-style';
+import { Block, Checkbox, Icon } from '@lobehub/ui';
+import { createStaticStyles, cssVar, cx } from 'antd-style';
+import { CircleArrowRight } from 'lucide-react';
 import { memo } from 'react';
 
-import type { TodoItem, TodoList as TodoListType } from '../../../types';
+import type { TodoItem, TodoList as TodoListType, TodoStatus } from '../../../types';
 
 export interface TodoListRenderState {
   todos?: TodoListType;
@@ -23,30 +24,58 @@ const styles = createStaticStyles(({ css, cssVar }) => ({
       border-block-end: none;
     }
   `,
-  textChecked: css`
+  processingRow: css`
+    display: flex;
+    gap: 7px;
+    align-items: center;
+  `,
+  textCompleted: css`
     color: ${cssVar.colorTextQuaternary};
     text-decoration: line-through;
   `,
+  textProcessing: css`
+    color: ${cssVar.colorText};
+  `,
+  textTodo: css`
+    color: ${cssVar.colorTextSecondary};
+  `,
 }));
 
 interface ReadOnlyTodoItemProps {
-  completed: boolean;
+  status: TodoStatus;
   text: string;
 }
 
 /**
  * Read-only todo item row, matching the style of TodoItemRow in SortableTodoList
  */
-const ReadOnlyTodoItem = memo<ReadOnlyTodoItemProps>(({ text, completed }) => {
+const ReadOnlyTodoItem = memo<ReadOnlyTodoItemProps>(({ text, status }) => {
+  const isCompleted = status === 'completed';
+  const isProcessing = status === 'processing';
+
+  // Processing state uses CircleArrowRight icon
+  if (isProcessing) {
+    return (
+      <div className={cx(styles.itemRow, styles.processingRow)}>
+        <Icon icon={CircleArrowRight} size={17} style={{ color: cssVar.colorTextSecondary }} />
+        <span className={styles.textProcessing}>{text}</span>
+      </div>
+    );
+  }
+
+  // Todo and completed states use Checkbox
   return (
     <Checkbox
       backgroundColor={cssVar.colorSuccess}
-      checked={completed}
-      classNames={{ text: completed ? styles.textChecked : undefined, wrapper: styles.itemRow }}
+      checked={isCompleted}
+      classNames={{
+        text: cx(styles.textTodo, isCompleted && styles.textCompleted),
+        wrapper: styles.itemRow,
+      }}
       shape={'circle'}
       style={{ borderWidth: 1.5, cursor: 'default' }}
       textProps={{
-        type: completed ? 'secondary' : undefined,
+        type: isCompleted ? 'secondary' : undefined,
       }}
     >
       {text}
@@ -73,7 +102,7 @@ const TodoListUI = memo<TodoListUIProps>(({ items }) => {
     // Outer container with background - matches AddTodoIntervention
     <Block variant={'outlined'} width="100%">
       {items.map((item, index) => (
-        <ReadOnlyTodoItem completed={item.completed} key={index} text={item.text} />
+        <ReadOnlyTodoItem key={index} status={item.status} text={item.text} />
       ))}
     </Block>
   );

package/packages/builtin-tool-gtd/src/client/Render/index.ts

@@ -14,9 +14,7 @@ import TodoListRender from './TodoList';
 export const GTDRenders = {
   // All todo operations render the same TodoList UI
   [GTDApiName.clearTodos]: TodoListRender,
-  [GTDApiName.completeTodos]: TodoListRender,
   [GTDApiName.createTodos]: TodoListRender,
-  [GTDApiName.removeTodos]: TodoListRender,
   [GTDApiName.updateTodos]: TodoListRender,
 
   // Plan operations render the PlanCard UI

package/packages/builtin-tool-gtd/src/client/components/SortableTodoList/TodoItemRow.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { ActionIcon, Checkbox, Flexbox, SortableList } from '@lobehub/ui';
+import { ActionIcon, Checkbox, Flexbox, Icon, SortableList } from '@lobehub/ui';
 import { Input, InputRef } from 'antd';
 import { createStaticStyles, cssVar, cx } from 'antd-style';
-import { Trash2 } from 'lucide-react';
+import { CircleArrowRight, Trash2 } from 'lucide-react';
 import { ChangeEvent, KeyboardEvent, memo, useCallback, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -34,10 +34,13 @@ const styles = createStaticStyles(({ css, cssVar }) => ({
       }
     }
   `,
-  textChecked: css`
+  textCompleted: css`
     color: ${cssVar.colorTextQuaternary};
     text-decoration: line-through;
   `,
+  textProcessing: css`
+    color: ${cssVar.colorWarningText};
+  `,
 }));
 
 interface TodoItemRowProps {
@@ -53,7 +56,9 @@ const TodoItemRow = memo<TodoItemRowProps>(({ id, placeholder }) => {
   // Find item by stable id
   const item = useTodoListStore((s) => s.items.find((item) => item.id === id));
   const text = item?.text ?? '';
-  const completed = item?.completed ?? false;
+  const status = item?.status ?? 'todo';
+  const isCompleted = status === 'completed';
+  const isProcessing = status === 'processing';
 
   const focusedId = useTodoListStore((s) => s.focusedId);
   const cursorPosition = useTodoListStore((s) => s.cursorPosition);
@@ -123,15 +128,24 @@ const TodoItemRow = memo<TodoItemRowProps>(({ id, placeholder }) => {
   return (
     <Flexbox align="center" className={styles.itemRow} gap={4} horizontal width="100%">
       <SortableList.DragHandle className={cx(styles.dragHandle, 'drag-handle')} size="small" />
-      <Checkbox
-        backgroundColor={cssVar.colorSuccess}
-        checked={completed}
-        onChange={handleToggle}
-        shape={'circle'}
-        style={{ borderWidth: 1.5 }}
-      />
+      {isProcessing ? (
+        <Icon
+          icon={CircleArrowRight}
+          onClick={handleToggle}
+          size={16}
+          style={{ color: cssVar.colorInfo, cursor: 'pointer', flexShrink: 0 }}
+        />
+      ) : (
+        <Checkbox
+          backgroundColor={cssVar.colorSuccess}
+          checked={isCompleted}
+          onChange={handleToggle}
+          shape={'circle'}
+          style={{ borderWidth: 1.5 }}
+        />
+      )}
       <Input
-        className={cx(completed && styles.textChecked)}
+        className={cx(isCompleted && styles.textCompleted, isProcessing && styles.textProcessing)}
         onChange={handleChange}
         onFocus={handleFocus}
         onKeyDown={handleKeyDown}

package/packages/builtin-tool-gtd/src/client/components/SortableTodoList/store/actions.ts

@@ -1,6 +1,6 @@
 import { debounce } from 'es-toolkit/compat';
 
-import type { TodoItem } from '../../../../types';
+import { getNextTodoStatus, type TodoItem } from '../../../../types';
 import { AUTO_SAVE_DELAY, AUTO_SAVE_MAX_WAIT, initialState } from './initialState';
 import type { StoreInternals, TodoListItem, TodoListStore } from './types';
 import { ADD_ITEM_ID } from './types';
@@ -37,7 +37,7 @@ export const createActions = (
 
     try {
       // Convert TodoListItem[] to TodoItem[] (remove id)
-      const todoItems: TodoItem[] = items.map(({ completed, text }) => ({ completed, text }));
+      const todoItems: TodoItem[] = items.map(({ status, text }) => ({ status, text }));
       console.log('[performSave] calling onSave with', todoItems.length, 'items');
       await internals.onSave(todoItems);
       console.log('[performSave] onSave completed');
@@ -69,7 +69,7 @@ export const createActions = (
       if (!newItemText.trim()) return;
 
       set({
-        items: [...items, { completed: false, id: generateId(), text: newItemText.trim() }],
+        items: [...items, { id: generateId(), status: 'todo', text: newItemText.trim() }],
         newItemText: '',
       });
       markDirtyAndSave();
@@ -97,7 +97,7 @@ export const createActions = (
       set({ saveStatus: 'saving' });
 
       try {
-        const todoItems: TodoItem[] = items.map(({ completed, text }) => ({ completed, text }));
+        const todoItems: TodoItem[] = items.map(({ status, text }) => ({ status, text }));
         console.log('[saveNow] force saving', todoItems.length, 'items');
         await internals.onSave(todoItems);
         console.log('[saveNow] save completed');
@@ -160,7 +160,7 @@ export const createActions = (
       const { items } = get();
       set({
         items: items.map((item) =>
-          item.id === id ? { ...item, completed: !item.completed } : item,
+          item.id === id ? { ...item, status: getNextTodoStatus(item.status) } : item,
         ),
       });
       markDirtyAndSave();