shawnxixi-cli 0.3.1 → 1.1.0

package/src/commands/sys/health.ts

@@ -4,20 +4,40 @@
  */
 
 import { apiService } from '../../services/api';
+import { output, outputError, createLoading, isDryRun, dryRunLog } from '../../utils/output';
 
 export const syncHealth = async (dataType?: string, options: { startDate?: string; endDate?: string } = {}) => {
+  const loading = createLoading('处理健康数据...');
+  
   try {
     if (dataType || options.startDate || options.endDate) {
       // 查询模式
+      if (isDryRun()) {
+        loading.stop();
+        dryRunLog('查询健康数据', { dataType, ...options });
+        return;
+      }
+      
+      loading.start();
       const result = await apiService.queryHealthData(dataType, options.startDate, options.endDate);
-      console.log(JSON.stringify(result, null, 2));
+      loading.succeed('健康数据加载成功');
+      output(result);
     } else {
       // 同步模式
+      if (isDryRun()) {
+        loading.stop();
+        dryRunLog('同步健康数据', {});
+        return;
+      }
+      
+      loading.start();
       const result = await apiService.syncHealthData();
-      console.log(JSON.stringify(result, null, 2));
+      loading.succeed('健康数据同步成功');
+      output(result);
     }
   } catch (error: any) {
-    console.error('健康数据操作失败:', error.message);
+    loading.fail('健康数据操作失败');
+    outputError(error.message);
     process.exit(1);
   }
 };

package/src/index.ts

@@ -4,6 +4,11 @@
  * shawnxixi-cli
  * 肖嘻 CLI 工具入口
  * 命令命名空间：biz:*（日常业务）、sys:*（系统操作）
+ *
+ * 全局参数：
+ *   --json    输出 JSON 格式
+ *   --quiet   静默模式（只输出关键信息）
+ *   --dry-run 预览模式（不实际调用 API）
  */
 
 import { Command } from 'commander';
@@ -13,37 +18,96 @@ import { recordCommands } from './commands/biz/record';
 import { financeCommands } from './commands/biz/finance';
 import { itemCommands } from './commands/biz/item';
 import { calendarCommands } from './commands/biz/calendar';
-import { syncHealth } from './commands/sys/health';
+import { taskCommands } from './commands/biz/task';
+import { healthCommands } from './commands/biz/health';
+import { setGlobalFlags, output } from './utils/output';
+
+// 预解析全局参数（在 Commander 解析之前）
+const rawArgs = process.argv.slice(2);
+const globalFlags = {
+  json: rawArgs.includes('--json'),
+  quiet: rawArgs.includes('--quiet'),
+  dryRun: rawArgs.includes('--dry-run'),
+};
+
+// 设置全局标志
+setGlobalFlags(globalFlags);
+
+// 过滤掉全局参数，避免干扰 commander 解析
+const filteredArgs = rawArgs.filter(arg => !['--json', '--quiet', '--dry-run'].includes(arg));
 
 const program = new Command();
 
 program
   .name('shawnxixi')
-  .description('肖嘻 CLI 工具')
+  .description('肖嘻 CLI 工具 - 日常业务与系统管理')
   .version(version);
 
 // ============ biz ============
 
 const biz = program.command('biz').description('日常业务命令');
 
-// biz todo
-const todo = biz.command('todo').description('待办管理');
+// -------- biz todo --------
+// biz todo create      创建待办
+// biz todo list        列出待办
+// biz todo edit        编辑待办
+// biz todo done        标记完成
+// biz todo delete      删除待办
+// biz todo repeat      完成并生成下次 occurrence
+// biz todo subtask     创建子待办
+// biz todo subtasks    列出子待办
+const todo = biz.command('todo').description('待办管理（对标滴答清单）');
 
 todo
   .command('create <title>')
   .description('创建待办')
   .option('--due <date>', '截止日期 YYYY-MM-DD')
   .option('--priority <level>', '优先级 low|medium|high', 'medium')
-  .action(async (title: string, options: { due?: string; priority?: string }) => {
-    await todoCommands.create(title, options);
+  .option('--tags <tags>', '标签，逗号分隔')
+  .option('--repeat <rule>', '重复规则 daily|weekly|monthly')
+  .option('--end-date <date>', '重复结束日期 YYYY-MM-DD')
+  .option('--parent-id <id>', '父待办 ID（创建子待办）')
+  .action(async (title: string, options: Record<string, string>) => {
+    await todoCommands.create(title, {
+      due: options.due,
+      priority: options.priority,
+      tags: options.tags,
+      repeat: options.repeat,
+      endDate: options.endDate,
+      parentId: options.parentId,
+    });
   });
 
 todo
   .command('list')
   .description('列出待办')
-  .option('--status <status>', '状态过滤')
-  .action(async (options: { status?: string }) => {
-    await todoCommands.list(options);
+  .option('--status <status>', '状态过滤 pending|done')
+  .option('--priority <level>', '优先级过滤 low|medium|high')
+  .option('--tags <tags>', '标签过滤，逗号分隔')
+  .action(async (options: Record<string, string>) => {
+    await todoCommands.list({
+      status: options.status,
+      priority: options.priority,
+      tags: options.tags,
+    });
+  });
+
+todo
+  .command('edit <id>')
+  .description('编辑待办')
+  .option('--title <title>', '新标题')
+  .option('--status <status>', '新状态 pending|done')
+  .option('--priority <level>', '新优先级 low|medium|high')
+  .option('--due <date>', '新截止日期 YYYY-MM-DD')
+  .option('--tags <tags>', '新标签，逗号分隔')
+  .action(async (id: string, options: Record<string, string>) => {
+    await todoCommands.update(parseInt(id, 10), {
+      title: options.title,
+      status: options.status,
+      priority: options.priority,
+      due: options.due,
+      tags: options.tags,
+    });
   });
 
 todo
@@ -60,8 +124,81 @@ todo
     await todoCommands.delete(parseInt(id, 10));
   });
 
-// biz record
-const record = biz.command('record').description('记录管理');
+todo
+  .command('repeat <id>')
+  .description('完成待办并生成下次 occurrence（适用于重复待办）')
+  .action(async (id: string) => {
+    await todoCommands.repeat(parseInt(id, 10));
+  });
+
+todo
+  .command('subtask <parent-id>')
+  .description('创建子待办')
+  .requiredOption('--title <title>', '子待办标题（必需）')
+  .action(async (parentId: string, options: Record<string, string>) => {
+    await todoCommands.subtask(parseInt(parentId, 10), { title: options.title });
+  });
+
+todo
+  .command('subtasks <parent-id>')
+  .description('列出子待办')
+  .action(async (parentId: string) => {
+    await todoCommands.subtasks(parseInt(parentId, 10));
+  });
+
+// -------- biz task --------
+// biz task create      创建任务
+// biz task list        列出任务
+// biz task update      更新任务
+// biz task delete      删除任务
+const task = biz.command('task').description('任务管理（对标系统任务）');
+
+task
+  .command('list')
+  .description('列出任务')
+  .option('--status <status>', '状态过滤 pending|running|done')
+  .option('--source <source>', '来源过滤 openclaw|cli')
+  .action(async (options: Record<string, string>) => {
+    await taskCommands.list({ status: options.status, source: options.source });
+  });
+
+task
+  .command('create <title>')
+  .description('创建任务')
+  .option('--source <source>', '来源 openclaw|cli', 'cli')
+  .option('--openclaw-id <id>', 'OpenClaw ID')
+  .option('--priority <level>', '优先级 low|medium|high', 'medium')
+  .action(async (title: string, options: Record<string, string>) => {
+    await taskCommands.create(title, {
+      source: options.source,
+      openclawId: options.openclawId,
+      priority: options.priority,
+    });
+  });
+
+task
+  .command('update <id>')
+  .description('更新任务')
+  .option('--status <status>', '新状态 pending|running|done')
+  .option('--priority <level>', '新优先级 low|medium|high')
+  .action(async (id: string, options: Record<string, string>) => {
+    await taskCommands.update(parseInt(id, 10), {
+      status: options.status,
+      priority: options.priority,
+    });
+  });
+
+task
+  .command('delete <id>')
+  .description('删除任务')
+  .action(async (id: string) => {
+    await taskCommands.delete(parseInt(id, 10));
+  });
+
+// -------- biz record --------
+// biz record create    创建记录
+// biz record list      列出记录
+const record = biz.command('record').description('记录管理（日记/宠物/笔记/想法）');
 
 record
   .command('create <title>')
@@ -69,29 +206,47 @@ record
   .option('--content <text>', '内容')
   .option('--type <type>', '类型 diary|pet|note|idea', 'diary')
   .option('--tags <tags>', '标签，逗号分隔')
-  .action(async (title: string, options: { content?: string; type?: string; tags?: string }) => {
-    await recordCommands.create(title, options.content || '', options);
+  .action(async (title: string, options: Record<string, string>) => {
+    await recordCommands.create(title, options.content || '', {
+      type: options.type,
+      tags: options.tags,
+    });
   });
 
 record
   .command('list')
   .description('列出记录')
-  .option('--type <type>', '类型过滤')
-  .action(async (options: { type?: string }) => {
-    await recordCommands.list(options);
+  .option('--type <type>', '类型过滤 diary|pet|note|idea')
+  .option('--tags <tags>', '标签过滤，逗号分隔')
+  .action(async (options: Record<string, string>) => {
+    await recordCommands.list({ type: options.type, tags: options.tags });
   });
 
-// biz finance
-const finance = biz.command('finance').description('财务管理');
+// -------- biz finance --------
+// biz finance create   新增账单
+// biz finance list      列出账单
+// biz finance stats     账单统计
+// biz finance report    月度报表
+const finance = biz.command('finance').description('财务管理（对标记账类 App）');
 
 finance
   .command('create <amount>')
   .description('记一笔账')
   .option('--type <type>', '类型 income|expense', 'expense')
-  .option('--category <cat>', '分类', 'other')
-  .option('--desc <text>', '备注')
-  .action(async (amount: string, options: { type?: string; category?: string; desc?: string }) => {
-    await financeCommands.create(amount, options);
+  .option('--category <cat>', '分类')
+  .option('--note <text>', '备注')
+  .option('--account <account>', '账户 cash|card|alipay|wechat', 'cash')
+  .option('--date <date>', '日期 YYYY-MM-DD')
+  .option('--tags <tags>', '标签，逗号分隔')
+  .action(async (amount: string, options: Record<string, string>) => {
+    await financeCommands.create(amount, {
+      type: options.type,
+      category: options.category,
+      note: options.note,
+      account: options.account,
+      date: options.date,
+      tags: options.tags,
+    });
   });
 
 finance
@@ -99,12 +254,37 @@ finance
   .description('列出账单')
   .option('--type <type>', '类型过滤 income|expense')
   .option('--category <cat>', '分类过滤')
-  .action(async (options: { type?: string; category?: string }) => {
-    await financeCommands.list(options);
+  .option('--month <month>', '月份过滤 YYYY-MM')
+  .action(async (options: Record<string, string>) => {
+    await financeCommands.list({
+      type: options.type,
+      category: options.category,
+      month: options.month,
+    });
   });
 
-// biz item
-const item = biz.command('item').description('物品管理');
+finance
+  .command('stats')
+  .description('账单统计')
+  .option('--month <month>', '月份 YYYY-MM', new Date().toISOString().slice(0, 7))
+  .action(async (options: Record<string, string>) => {
+    await financeCommands.stats({ month: options.month });
+  });
+
+finance
+  .command('report')
+  .description('月度报表')
+  .option('--month <month>', '月份 YYYY-MM', new Date().toISOString().slice(0, 7))
+  .action(async (options: Record<string, string>) => {
+    await financeCommands.report({ month: options.month });
+  });
+
+// -------- biz item --------
+// biz item create      添加物品
+// biz item list        列出物品
+// biz item expiring    即将过期物品
+// biz item stats       库存统计
+const item = biz.command('item').description('物品管理（对标物品清单 App）');
 
 item
   .command('create <name>')
@@ -112,63 +292,139 @@ item
   .option('--location <loc>', '存放位置')
   .option('--expire <date>', '过期日期 YYYY-MM-DD')
   .option('--category <cat>', '分类')
-  .action(async (name: string, options: { location?: string; expire?: string; category?: string }) => {
-    await itemCommands.create(name, options);
+  .option('--quantity <n>', '数量', parseInt)
+  .option('--unit <unit>', '单位 个|瓶|盒|kg|g|ml|l')
+  .option('--brand <brand>', '品牌')
+  .option('--barcode <code>', '条码')
+  .option('--price <price>', '价格')
+  .option('--supplier <supplier>', '供应商')
+  .option('--purchase-date <date>', '购买日期 YYYY-MM-DD')
+  .action(async (name: string, options: Record<string, string>) => {
+    await itemCommands.create(name, {
+      location: options.location,
+      expire: options.expire,
+      category: options.category,
+      quantity: options.quantity ? parseInt(options.quantity) : undefined,
+      unit: options.unit,
+      brand: options.brand,
+      barcode: options.barcode,
+      price: options.price ? parseFloat(options.price) : undefined,
+      supplier: options.supplier,
+      purchaseDate: options.purchaseDate,
+    });
   });
 
 item
   .command('list')
   .description('列出物品')
   .option('--category <cat>', '分类过滤')
-  .action(async (options: { category?: string }) => {
-    await itemCommands.list(options);
+  .action(async (options: Record<string, string>) => {
+    await itemCommands.list({ category: options.category });
+  });
+
+item
+  .command('expiring')
+  .description('即将过期的物品')
+  .option('--days <n>', '提前多少天提醒', '7')
+  .action(async (options: Record<string, string>) => {
+    await itemCommands.expiring({ days: options.days ? parseInt(options.days) : 7 });
+  });
+
+item
+  .command('stats')
+  .description('物品库存统计')
+  .action(async () => {
+    await itemCommands.stats();
   });
 
-// biz calendar
-const calendar = biz.command('calendar').description('日程管理');
+// -------- biz calendar --------
+// biz calendar create  创建日程
+// biz calendar list    列出日程
+const calendar = biz.command('calendar').description('日程管理（对标日历 App）');
 
 calendar
   .command('create <title>')
   .description('创建日程')
-  .requiredOption('--start <datetime>', '开始时间')
-  .requiredOption('--end <datetime>', '结束时间')
+  .requiredOption('--from <datetime>', '开始时间 YYYY-MM-DD 或 YYYY-MM-DD HH:MM')
+  .requiredOption('--to <datetime>', '结束时间 YYYY-MM-DD 或 YYYY-MM-DD HH:MM')
+  .option('--location <loc>', '地点')
+  .option('--color <color>', '颜色 HEX 如 #ff0000')
   .option('--desc <text>', '描述')
-  .action(async (title: string, options: { start: string; end: string; desc?: string }) => {
-    await calendarCommands.create(title, options);
+  .action(async (title: string, options: Record<string, string>) => {
+    await calendarCommands.create(title, {
+      from: options.from,
+      to: options.to,
+      location: options.location,
+      color: options.color,
+      desc: options.desc,
+    });
   });
 
 calendar
   .command('list')
   .description('列出日程')
-  .option('--from <datetime>', '开始时间')
-  .option('--to <datetime>', '结束时间')
-  .action(async (options: { from?: string; to?: string }) => {
-    await calendarCommands.list(options);
+  .option('--from <datetime>', '开始时间 YYYY-MM-DD')
+  .option('--to <datetime>', '结束时间 YYYY-MM-DD')
+  .action(async (options: Record<string, string>) => {
+    await calendarCommands.list({ from: options.from, to: options.to });
   });
 
-// ============ sys ============
-
-const sys = program.command('sys').description('系统命令');
-
-const health = sys.command('health').description('健康数据');
+// -------- biz health --------
+// biz health log       记录健康数据
+// biz health list      查询健康数据
+// biz health sync      同步健康数据
+const health = biz.command('health').description('健康数据管理（对标 Apple Health）');
 
 health
-  .command('sync')
-  .description('同步健康数据')
-  .action(async () => {
-    await syncHealth();
+  .command('log')
+  .description('记录健康数据')
+  .requiredOption('--type <type>', '数据类型 heart_rate|steps|weight|sleep|blood_pressure|oxygen|body_temp')
+  .requiredOption('--value <value>', '数值')
+  .option('--unit <unit>', '单位 bpm|kg|steps|hours|mmHg|%|°C')
+  .option('--date <date>', '日期 YYYY-MM-DD', new Date().toISOString().slice(0, 10))
+  .action(async (options: Record<string, string>) => {
+    await healthCommands.log({
+      type: options.type,
+      value: options.value,
+      unit: options.unit,
+      date: options.date,
+    });
   });
 
 health
-  .command('query [dataType]')
+  .command('list')
   .description('查询健康数据')
+  .option('--type <type>', '数据类型过滤')
   .option('--from <date>', '开始日期 YYYY-MM-DD')
   .option('--to <date>', '结束日期 YYYY-MM-DD')
-  .action(async (dataType: string | undefined, options: { from?: string; to?: string }) => {
-    await syncHealth(dataType, { startDate: options.from, endDate: options.to });
+  .action(async (options: Record<string, string>) => {
+    await healthCommands.list({
+      type: options.type,
+      from: options.from,
+      to: options.to,
+    });
+  });
+
+health
+  .command('sync')
+  .description('同步健康数据（保留兼容）')
+  .action(async () => {
+    await healthCommands.sync();
+  });
+
+// ============ sys ============
+
+const sys = program.command('sys').description('系统命令');
+
+sys
+  .command('health')
+  .description('健康检查')
+  .action(async () => {
+    output({ status: 'ok', timestamp: new Date().toISOString() });
   });
 
-program.parseAsync(process.argv).catch((error) => {
+// 解析过滤后的参数
+program.parseAsync(['node', 'shawnxixi', ...filteredArgs]).catch((error) => {
   console.error('Command failed:', error);
   process.exit(1);
 });