@eeymoo/hum 0.1.14 → 0.1.16

package/bin/index.js

@@ -8,6 +8,7 @@ import timeline from '../src/commands/timeline.js'
 import weight from '../src/commands/weight.js'
 import exercise from '../src/commands/exercise.js'
 import diet from '../src/commands/diet.js'
+import food from '../src/commands/food.js'
 import sleep from '../src/commands/sleep.js'
 import { checkVersion, getCliVersion } from '../src/lib/version-check.js'
 
@@ -32,6 +33,7 @@ program.addCommand(timeline)
 program.addCommand(weight)
 program.addCommand(exercise)
 program.addCommand(diet)
+program.addCommand(food)
 program.addCommand(sleep)
 
 program.parse()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeymoo/hum",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Hum CLI - A command line tool for Hum API",
   "repository": {
     "type": "git",
@@ -16,8 +16,11 @@
   },
   "type": "module",
   "dependencies": {
+    "cli-table3": "^0.6.5",
+    "@toon-format/toon": "^2.3.0",
     "commander": "^12.1.0",
     "conf": "^13.0.1",
+    "dayjs": "^1.11.13",
     "node-fetch": "^3.3.2"
   },
   "scripts": {

package/src/commands/config.js

@@ -5,19 +5,31 @@ const configCmd = new Command('config')
 
 configCmd
   .command('set')
-  .argument('<key>', 'Config key (api-url)')
+  .argument('<key>', 'Config key (api-url, timezone, dateFormat)')
   .argument('<value>', 'Config value')
   .action((key, value) => {
-    const configKey = key === 'api-url' ? 'apiUrl' : key
+    const keyMap = {
+      'api-url': 'apiUrl',
+      'timezone': 'timezone',
+      'date-format': 'dateFormat',
+      'dateFormat': 'dateFormat'
+    }
+    const configKey = keyMap[key] || key
     config.set(configKey, value)
     console.log(`Set ${key} to ${value}`)
   })
 
 configCmd
   .command('get')
-  .argument('<key>', 'Config key (api-url)')
+  .argument('<key>', 'Config key (api-url, timezone, dateFormat)')
   .action((key) => {
-    const configKey = key === 'api-url' ? 'apiUrl' : key
+    const keyMap = {
+      'api-url': 'apiUrl',
+      'timezone': 'timezone',
+      'date-format': 'dateFormat',
+      'dateFormat': 'dateFormat'
+    }
+    const configKey = keyMap[key] || key
     const value = config.get(configKey)
     if (value !== undefined) {
       console.log(value)
@@ -32,7 +44,7 @@ configCmd
     const allConfig = config.store
     console.log('Configuration:')
     for (const [key, value] of Object.entries(allConfig)) {
-      const displayKey = key === 'apiUrl' ? 'api-url' : key
+      const displayKey = key === 'apiUrl' ? 'api-url' : key === 'dateFormat' ? 'date-format' : key
       console.log(`  ${displayKey}: ${value}`)
     }
   })

package/src/commands/diet.js

@@ -1,5 +1,7 @@
 import { Command } from 'commander'
 import { request, createFormData } from '../lib/api.js'
+import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const diet = new Command('diet')
 
@@ -14,8 +16,9 @@ diet
   .option('--sodium <value>', 'Sodium (mg)')
   .option('--foods <string>', 'Foods in format: "name:amount,name2:amount2"')
   .option('--water <value>', 'Water (ml)')
+  .option('--extra-data <json>', 'Extra data (JSON string)')
   .option('--note <note>', 'Note')
-  .option('--date <date>', 'Date (YYYY-MM-DD)')
+  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .action(async (options) => {
     try {
@@ -29,8 +32,9 @@ diet
         sodium: options.sodium,
         foods: options.foods,
         water: options.water,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date
+        date: appendTimezoneOffset(options.date)
       }, options.file || [])
 
       const result = await request('/diets', {
@@ -51,19 +55,15 @@ diet
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'meal' ? 'mealType' : key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/diets?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'diet-list', page })
     } catch (error) {
       console.error('Failed to list diet records:', error.message)
     }
@@ -74,17 +74,12 @@ diet
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          params.append(key, value)
-        }
-      })
-
+      const { params } = buildQueryParams(options)
       const result = await request(`/diets/stats?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'diet-stats' })
     } catch (error) {
       console.error('Failed to get diet stats:', error.message)
     }
@@ -93,10 +88,11 @@ diet
 diet
   .command('get')
   .requiredOption('--id <id>', 'Diet record ID')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
       const result = await request(`/diets/${options.id}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'diet-get' })
     } catch (error) {
       console.error('Failed to get diet record:', error.message)
     }
@@ -114,8 +110,9 @@ diet
   .option('--sodium <value>', 'Updated sodium')
   .option('--foods <string>', 'Updated foods')
   .option('--water <value>', 'Updated water')
+  .option('--extra-data <json>', 'Updated extra data (JSON string)')
   .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD)')
+  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .option('--replace-attachments', 'Replace existing attachments instead of adding')
   .action(async (options) => {
@@ -130,8 +127,9 @@ diet
         sodium: options.sodium,
         foods: options.foods,
         water: options.water,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date,
+        date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined
       }, options.file || [])
 

package/src/commands/exercise.js

@@ -1,5 +1,7 @@
 import { Command } from 'commander'
 import { request, createFormData } from '../lib/api.js'
+import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const exercise = new Command('exercise')
 
@@ -12,9 +14,10 @@ exercise
   .option('--heart-rate-avg <value>', 'Average heart rate')
   .option('--heart-rate-max <value>', 'Max heart rate')
   .option('--feeling <value>', 'Feeling 1-10')
+  .option('--extra-data <json>', 'Extra data (JSON string)')
   .option('--location <location>', 'Location')
   .option('--note <note>', 'Note')
-  .option('--date <date>', 'Date (YYYY-MM-DD)')
+  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .action(async (options) => {
     try {
@@ -26,9 +29,10 @@ exercise
         heartRateAvg: options.heartRateAvg,
         heartRateMax: options.heartRateMax,
         feeling: options.feeling,
+        extraData: options.extraData,
         location: options.location,
         note: options.note,
-        date: options.date
+        date: appendTimezoneOffset(options.date)
       }, options.file || [])
 
       const result = await request('/exercises', {
@@ -49,19 +53,15 @@ exercise
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/exercises?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'exercise-list', page })
     } catch (error) {
       console.error('Failed to list exercise records:', error.message)
     }
@@ -72,17 +72,12 @@ exercise
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          params.append(key, value)
-        }
-      })
-
+      const { params } = buildQueryParams(options)
       const result = await request(`/exercises/stats?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'exercise-stats' })
     } catch (error) {
       console.error('Failed to get exercise stats:', error.message)
     }
@@ -91,10 +86,11 @@ exercise
 exercise
   .command('get')
   .requiredOption('--id <id>', 'Exercise record ID')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
       const result = await request(`/exercises/${options.id}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'exercise-get' })
     } catch (error) {
       console.error('Failed to get exercise record:', error.message)
     }
@@ -110,9 +106,10 @@ exercise
   .option('--heart-rate-avg <value>', 'Updated average heart rate')
   .option('--heart-rate-max <value>', 'Updated max heart rate')
   .option('--feeling <value>', 'Updated feeling')
+  .option('--extra-data <json>', 'Updated extra data (JSON string)')
   .option('--location <location>', 'Updated location')
   .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD)')
+  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .option('--replace-attachments', 'Replace existing attachments instead of adding')
   .action(async (options) => {
@@ -125,9 +122,10 @@ exercise
         heartRateAvg: options.heartRateAvg,
         heartRateMax: options.heartRateMax,
         feeling: options.feeling,
+        extraData: options.extraData,
         location: options.location,
         note: options.note,
-        date: options.date,
+        date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined
       }, options.file || [])
 

package/src/commands/food.js

@@ -0,0 +1,29 @@
+import { Command } from 'commander'
+import { searchFood } from '../lib/foodSearch.js'
+import { outputData } from '../lib/output.js'
+
+const food = new Command('food')
+
+food
+  .description('查询食物营养信息')
+  .requiredOption('-n, --name <name>', '食物名称（支持模糊匹配）')
+  .option('-l, --limit <number>', '返回结果数量上限', '5')
+  .option('--no-cache', '跳过本地缓存，重新请求远端')
+  .option('--format <format>', '输出格式: json, table, toon', 'json')
+  .action(async (options) => {
+    try {
+      const limit = parseInt(options.limit, 10) || 5
+      const { items, degraded } = await searchFood(options.name, {
+        limit,
+        noCache: options.cache === false
+      })
+
+      const cleaned = items.map(({ rawItem, ...rest }) => rest)
+      outputData({ foods: cleaned, totalPages: 1, total: cleaned.length }, { format: options.format, type: 'food-list' })
+    } catch (error) {
+      console.error(error.message)
+      process.exitCode = 1
+    }
+  })
+
+export default food

package/src/commands/record.js

@@ -1,5 +1,7 @@
 import { Command } from 'commander'
 import { request } from '../lib/api.js'
+import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const record = new Command('record')
 
@@ -10,7 +12,7 @@ record
   .option('--tags <tags>', 'Comma-separated tags')
   .option('--note <note>', 'Note for the record')
   .option('--attachments <urls>', 'Comma-separated attachment URLs')
-  .option('--date <date>', 'Date for the record (YYYY-MM-DD)')
+  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
   .action(async (options) => {
     try {
       const recordData = {
@@ -19,7 +21,7 @@ record
         tags: options.tags ? options.tags.split(',') : undefined,
         note: options.note,
         attachments: options.attachments ? options.attachments.split(',') : undefined,
-        date: options.date
+        date: appendTimezoneOffset(options.date)
       }
 
       const result = await request('/records', {
@@ -41,19 +43,15 @@ record
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
   .option('--date <date>', 'Specific date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/records?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'record-list', page })
     } catch (error) {
       console.error('Failed to list records:', error.message)
     }
@@ -63,6 +61,7 @@ record
   .command('get')
   .requiredOption('--id <id>', 'Record ID')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
       const params = new URLSearchParams()
@@ -71,7 +70,7 @@ record
       }
       const queryString = params.toString()
       const result = await request(`/records/${options.id}${queryString ? '?' + queryString : ''}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'record-get' })
     } catch (error) {
       console.error('Failed to get record:', error.message)
     }
@@ -84,7 +83,7 @@ record
   .option('--tags <tags>', 'Updated comma-separated tags')
   .option('--note <note>', 'Updated note')
   .option('--attachments <urls>', 'Updated comma-separated attachment URLs')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD)')
+  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
   .action(async (options) => {
     try {
       const updateData = {}
@@ -92,7 +91,7 @@ record
       if (options.tags) updateData.tags = options.tags.split(',')
       if (options.note) updateData.note = options.note
       if (options.attachments) updateData.attachments = options.attachments.split(',')
-      if (options.date) updateData.date = options.date
+      if (options.date) updateData.date = appendTimezoneOffset(options.date)
 
       const result = await request(`/records/${options.id}`, {
         method: 'PATCH',
@@ -125,17 +124,16 @@ record
   .requiredOption('--query <text>', 'Search query')
   .option('--type <type>', 'Filter by type')
   .option('--last <period>', 'Last N days/weeks/months/years')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      params.append('q', options.query)
-      if (options.type) params.append('type', options.type)
-      if (options.last) params.append('last', options.last)
-      if (options.includeDeleted) params.append('includeDeleted', 'true')
-
+      const { params, page } = buildQueryParams(options)
+      params.set('q', options.query)
       const result = await request(`/records/search?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'record-list', page })
     } catch (error) {
       console.error('Failed to search records:', error.message)
     }

package/src/commands/sleep.js

@@ -1,11 +1,13 @@
 import { Command } from 'commander'
 import { request, createFormData } from '../lib/api.js'
+import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const sleep = new Command('sleep')
 
 sleep
   .command('add')
-  .requiredOption('--duration <value>', 'Sleep duration in hours')
+  .option('--duration <value>', 'Sleep duration in hours')
   .requiredOption('--bedtime <time>', 'Bedtime (HH:mm)')
   .requiredOption('--waketime <time>', 'Wake time (HH:mm)')
   .requiredOption('--quality <value>', 'Sleep quality 1-10')
@@ -13,13 +15,27 @@ sleep
   .option('--rem-sleep <value>', 'REM sleep duration in hours')
   .option('--awakenings <value>', 'Number of awakenings')
   .option('--feeling <value>', 'Feeling 1-10')
+  .option('--extra-data <json>', 'Extra data (JSON string)')
   .option('--note <note>', 'Note')
-  .option('--date <date>', 'Date (YYYY-MM-DD)')
+  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .action(async (options) => {
     try {
+      let duration = options.duration
+      if (!duration && options.bedtime && options.waketime) {
+        const [bh, bm] = options.bedtime.split(':').map(Number)
+        const [wh, wm] = options.waketime.split(':').map(Number)
+        let diff = (wh * 60 + wm) - (bh * 60 + bm)
+        if (diff < 0) diff += 24 * 60
+        duration = (diff / 60).toFixed(1)
+      }
+      if (!duration) {
+        console.error('需要 --duration 或同时提供 --bedtime 和 --waketime')
+        process.exit(1)
+      }
+
       const formData = createFormData({
-        duration: options.duration,
+        duration,
         bedTime: options.bedtime,
         wakeTime: options.waketime,
         quality: options.quality,
@@ -27,8 +43,9 @@ sleep
         remSleep: options.remSleep,
         awakenings: options.awakenings,
         feeling: options.feeling,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date
+        date: appendTimezoneOffset(options.date)
       }, options.file || [])
 
       const result = await request('/sleeps', {
@@ -48,19 +65,15 @@ sleep
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/sleeps?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'sleep-list', page })
     } catch (error) {
       console.error('Failed to list sleep records:', error.message)
     }
@@ -71,17 +84,12 @@ sleep
   .option('--last <period>', 'Last N days/weeks/months/years')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          params.append(key, value)
-        }
-      })
-
+      const { params } = buildQueryParams(options)
       const result = await request(`/sleeps/stats?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'sleep-stats' })
     } catch (error) {
       console.error('Failed to get sleep stats:', error.message)
     }
@@ -90,10 +98,11 @@ sleep
 sleep
   .command('get')
   .requiredOption('--id <id>', 'Sleep record ID')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
       const result = await request(`/sleeps/${options.id}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'sleep-get' })
     } catch (error) {
       console.error('Failed to get sleep record:', error.message)
     }
@@ -110,8 +119,9 @@ sleep
   .option('--rem-sleep <value>', 'Updated REM sleep')
   .option('--awakenings <value>', 'Updated number of awakenings')
   .option('--feeling <value>', 'Updated feeling')
+  .option('--extra-data <json>', 'Updated extra data (JSON string)')
   .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD)')
+  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .option('--replace-attachments', 'Replace existing attachments instead of adding')
   .action(async (options) => {
@@ -125,8 +135,9 @@ sleep
         remSleep: options.remSleep,
         awakenings: options.awakenings,
         feeling: options.feeling,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date,
+        date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined
       }, options.file || [])
 

package/src/commands/timeline.js

@@ -1,5 +1,7 @@
 import { Command } from 'commander'
 import { request } from '../lib/api.js'
+import { buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const timeline = new Command('timeline')
 
@@ -7,19 +9,15 @@ timeline
   .option('--last <period>', 'Last N days/weeks/months/years (e.g., 7d, 2w, 1m)')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/timeline?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'timeline', page })
     } catch (error) {
       console.error('Failed to get timeline:', error.message)
     }

package/src/commands/weight.js

@@ -1,5 +1,7 @@
 import { Command } from 'commander'
 import { request, createFormData } from '../lib/api.js'
+import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
+import { outputData } from '../lib/output.js'
 
 const weight = new Command('weight')
 
@@ -12,8 +14,9 @@ weight
   .option('--water <value>', 'Water percentage')
   .option('--bone-mass <value>', 'Bone mass (kg)')
   .option('--visceral-fat <value>', 'Visceral fat level')
+  .option('--extra-data <json>', 'Extra data (JSON string)')
   .option('--note <note>', 'Note for the record')
-  .option('--date <date>', 'Date for the record (YYYY-MM-DD)')
+  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .action(async (options) => {
     try {
@@ -25,8 +28,9 @@ weight
         water: options.water,
         boneMass: options.boneMass,
         visceralFat: options.visceralFat,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date
+        date: appendTimezoneOffset(options.date)
       }, options.file || [])
 
       const result = await request('/weights', {
@@ -46,19 +50,15 @@ weight
   .option('--last <period>', 'Last N days/weeks/months/years (e.g., 10, 7d, 2w, 6m, 1y)')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--page <number>', 'Page number', '1')
+  .option('--limit <number>', 'Items per page', '20')
   .option('--include-deleted', 'Include deleted records')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          const paramKey = key === 'includeDeleted' ? 'includeDeleted' : key
-          params.append(paramKey, value === true ? 'true' : value)
-        }
-      })
-
+      const { params, page } = buildQueryParams(options)
       const result = await request(`/weights?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'weight-list', page })
     } catch (error) {
       console.error('Failed to list weight records:', error.message)
     }
@@ -69,17 +69,12 @@ weight
   .option('--last <period>', 'Last N days/weeks/months/years (e.g., 10, 7d, 2w, 6m, 1y)')
   .option('--start <date>', 'Start date (YYYY-MM-DD)')
   .option('--end <date>', 'End date (YYYY-MM-DD)')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
-      const params = new URLSearchParams()
-      Object.entries(options).forEach(([key, value]) => {
-        if (value) {
-          params.append(key, value)
-        }
-      })
-
+      const { params } = buildQueryParams(options)
       const result = await request(`/weights/stats?${params.toString()}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'weight-stats' })
     } catch (error) {
       console.error('Failed to get weight stats:', error.message)
     }
@@ -88,10 +83,11 @@ weight
 weight
   .command('get')
   .requiredOption('--id <id>', 'Weight record ID')
+  .option('--format <format>', 'Output format: json, table, toon', 'json')
   .action(async (options) => {
     try {
       const result = await request(`/weights/${options.id}`)
-      console.log(JSON.stringify(result, null, 2))
+      outputData(result, { format: options.format, type: 'weight-get' })
     } catch (error) {
       console.error('Failed to get weight record:', error.message)
     }
@@ -107,8 +103,9 @@ weight
   .option('--water <value>', 'Updated water percentage')
   .option('--bone-mass <value>', 'Updated bone mass (kg)')
   .option('--visceral-fat <value>', 'Updated visceral fat level')
+  .option('--extra-data <json>', 'Updated extra data (JSON string)')
   .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD)')
+  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
   .option('--file <paths...>', 'File paths to attach')
   .option('--replace-attachments', 'Replace existing attachments instead of adding')
   .action(async (options) => {
@@ -121,8 +118,9 @@ weight
         water: options.water,
         boneMass: options.boneMass,
         visceralFat: options.visceralFat,
+        extraData: options.extraData,
         note: options.note,
-        date: options.date,
+        date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined
       }, options.file || [])
 

package/src/lib/api.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch'
-import { FormData, File } from 'node-fetch'
 import { readFileSync } from 'fs'
 import config from './config.js'
 
@@ -42,10 +40,27 @@ export function createFormData(fields, files = []) {
     }
   })
 
+  const mimeMap = {
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.webp': 'image/webp',
+    '.bmp': 'image/bmp',
+    '.heic': 'image/heic',
+    '.heif': 'image/heif',
+    '.pdf': 'application/pdf',
+    '.txt': 'text/plain',
+    '.gpx': 'application/gpx+xml',
+    '.fit': 'application/fit'
+  }
+
   files.forEach(filePath => {
     const buffer = readFileSync(filePath)
     const fileName = filePath.split('/').pop()
-    const file = new File([buffer], fileName)
+    const ext = '.' + fileName.split('.').pop().toLowerCase()
+    const type = mimeMap[ext] || 'application/octet-stream'
+    const file = new File([buffer], fileName, { type })
     formData.append('file', file)
   })
 

package/src/lib/foodSearch.js

@@ -0,0 +1,174 @@
+import config from './config.js'
+
+const CACHE_KEY = 'foodCache'
+
+function getCache() {
+  return config.get(CACHE_KEY) || []
+}
+
+function setCache(cache) {
+  config.set(CACHE_KEY, cache)
+}
+
+function parseNumber(str) {
+  if (!str || str === '—' || str === '') return null
+  const num = parseFloat(String(str).replace(/[^\d.]/g, ''))
+  return isNaN(num) ? null : num
+}
+
+function parseKjToKcal(str) {
+  const kj = parseNumber(str)
+  if (kj === null) return null
+  return Math.round(kj / 4.184 * 10) / 10
+}
+
+/**
+ * Parse a single food item from the API response array into a structured object.
+ * Field mapping (based on actual API response):
+ *   [0]  foodCode       → sourceId
+ *   [2]  foodName       → name
+ *   [5]  water %
+ *   [6]  edible portion
+ *   [7]  energy (kJ)    → energyKcal (converted)
+ *   [8]  protein (g)
+ *   [9]  fat (g)
+ *   [11] dietary fiber (g)
+ *   [12] carbohydrate (g)
+ */
+function parseFoodItem(item) {
+  return {
+    source: 'chinanutri',
+    sourceId: String(item[0]),
+    name: item[2] || '',
+    energyKcal: parseKjToKcal(item[7]),
+    protein: parseNumber(item[8]),
+    fat: parseNumber(item[9]),
+    carbs: parseNumber(item[12]),
+    rawItem: item
+  }
+}
+
+/**
+ * Search foods from the remote API.
+ * Returns an array of parsed food objects.
+ */
+export async function searchRemote(name, limit = 20) {
+  const body = new URLSearchParams({
+    categoryOne: '0',
+    categoryTwo: '0',
+    foodName: name,
+    pageNum: '1',
+    field: '0',
+    flag: '0'
+  })
+
+  const controller = new AbortController()
+  const timeout = setTimeout(() => controller.abort(), 5000)
+
+  try {
+    const response = await fetch(
+      'https://nlc.chinanutri.cn/fq/FoodInfoQueryAction!queryFoodInfoList.do',
+      {
+        method: 'POST',
+        headers: {
+          'Referer': 'https://nlc.chinanutri.cn/fq/foodlist.htm',
+          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        },
+        body: body.toString(),
+        signal: controller.signal
+      }
+    )
+
+    clearTimeout(timeout)
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}`)
+    }
+
+    const data = await response.json()
+    const items = data.list || []
+
+    return items.slice(0, limit).map(parseFoodItem)
+  } catch (error) {
+    clearTimeout(timeout)
+    if (error.name === 'AbortError') {
+      throw new Error('TIMEOUT')
+    }
+    throw error
+  }
+}
+
+/**
+ * Search cached foods by name (fuzzy match).
+ */
+export function searchCache(name, limit = 5) {
+  const cache = getCache()
+  const keyword = name.toLowerCase()
+  return cache
+    .filter(item => item.name.toLowerCase().includes(keyword))
+    .slice(0, limit)
+}
+
+/**
+ * Upsert food items into local cache.
+ */
+export function upsertCache(items) {
+  const cache = getCache()
+  for (const item of items) {
+    const idx = cache.findIndex(c => c.sourceId === item.sourceId)
+    const entry = {
+      source: item.source,
+      sourceId: item.sourceId,
+      name: item.name,
+      energyKcal: item.energyKcal,
+      protein: item.protein,
+      carbs: item.carbs,
+      fat: item.fat,
+      updatedAt: new Date().toISOString()
+    }
+    if (idx >= 0) {
+      cache[idx] = entry
+    } else {
+      cache.push(entry)
+    }
+  }
+  setCache(cache)
+}
+
+/**
+ * Main search function: cache-first with remote fallback.
+ */
+export async function searchFood(name, { limit = 5, noCache = false } = {}) {
+  // 1. If cache is allowed, try cache first
+  if (!noCache) {
+    const cached = searchCache(name, limit)
+    if (cached.length > 0) {
+      return { items: cached, fromCache: true }
+    }
+  }
+
+  // 2. Query remote
+  try {
+    const remoteItems = await searchRemote(name, limit)
+    if (remoteItems.length > 0) {
+      upsertCache(remoteItems)
+      return { items: remoteItems.slice(0, limit), fromCache: false }
+    }
+    return { items: [], fromCache: false }
+  } catch (error) {
+    // 3. On remote failure, try cache as fallback
+    if (error.message === 'TIMEOUT') {
+      const cached = searchCache(name, limit)
+      if (cached.length > 0) {
+        return { items: cached, fromCache: true, degraded: true }
+      }
+      throw new Error('查询超时，请稍后重试')
+    }
+    // Other remote errors: degrade to cache
+    const cached = searchCache(name, limit)
+    if (cached.length > 0) {
+      return { items: cached, fromCache: true, degraded: true }
+    }
+    throw error
+  }
+}

package/src/lib/output.js

@@ -0,0 +1,257 @@
+import Table from 'cli-table3'
+import { encode } from '@toon-format/toon'
+import { formatDate, getConfigDateFormat } from './timezone.js'
+
+function outputJson(data) {
+  console.log(JSON.stringify(data, null, 2))
+}
+
+function outputTable(headers, rows) {
+  const table = new Table({
+    head: headers,
+    style: { head: ['cyan'], border: ['gray'] }
+  })
+  for (const row of rows) {
+    table.push(row)
+  }
+  console.log(table.toString())
+}
+
+function outputToon(data) {
+  if (!data || (typeof data === 'object' && Object.keys(data).length === 0)) {
+    console.log('(无数据)')
+    return
+  }
+  console.log(encode(data))
+}
+
+function formatPaginationHint(page, totalPages, total, format) {
+  if (format !== 'table') return null
+  if (totalPages <= 1) return null
+  const nextPage = page + 1
+  return `第 ${page} 页，共 ${totalPages} 页（共 ${total} 条）— 使用 --page ${nextPage} 查看下一页`
+}
+
+function extractItems(data, type) {
+  const keyMap = {
+    'weight-list': 'weights',
+    'exercise-list': 'exercises',
+    'diet-list': 'diets',
+    'sleep-list': 'sleeps',
+    'record-list': 'records',
+    'food-list': 'foods',
+    'timeline': 'items'
+  }
+  const key = keyMap[type]
+  if (key && Array.isArray(data[key])) return data[key]
+  if (Array.isArray(data)) return data
+  return []
+}
+
+function buildRows(items, type) {
+  const df = getConfigDateFormat()
+  switch (type) {
+    case 'weight-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.id,
+        item.weight,
+        item.bodyFat ?? '-',
+        item.bmi ?? '-',
+        item.date ? formatDate(item.date, df) : '-',
+        item.note || '-'
+      ])
+    case 'exercise-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.id,
+        item.type,
+        item.duration,
+        item.caloriesBurned ?? '-',
+        item.heartRateAvg ?? '-',
+        item.date ? formatDate(item.date, df) : '-'
+      ])
+    case 'diet-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.id,
+        item.mealType,
+        item.calories ?? '-',
+        item.protein ?? '-',
+        item.carbs ?? '-',
+        item.fat ?? '-',
+        item.date ? formatDate(item.date, df) : '-'
+      ])
+    case 'sleep-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.id,
+        item.duration,
+        item.quality,
+        item.bedTime ?? '-',
+        item.wakeTime ?? '-',
+        item.deepSleep ?? '-',
+        item.date ? formatDate(item.date, df) : '-'
+      ])
+    case 'record-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.id,
+        item.type,
+        (item.tags || []).join(', ') || '-',
+        item.date ? formatDate(item.date, df) : '-',
+        item.note || '-'
+      ])
+    case 'food-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.name,
+        item.energyKcal ?? '-',
+        item.protein ?? '-',
+        item.carbs ?? '-',
+        item.fat ?? '-'
+      ])
+    case 'timeline':
+      return items.map((item, idx) => {
+        let summary = ''
+        if (item.type === 'weight') summary = `${item.data?.weight} kg`
+        else if (item.type === 'exercise') summary = `${item.data?.duration} min ${item.data?.type || ''}`
+        else if (item.type === 'diet') summary = `${item.data?.calories || 0} kcal (${item.data?.mealType || ''})`
+        else if (item.type === 'sleep') summary = `${item.data?.duration}h, 质量: ${item.data?.quality}/10`
+        else if (item.type === 'record') summary = item.data?.type || ''
+        return [
+          idx + 1,
+          item.date ? formatDate(item.date, df) : '-',
+          item.type,
+          summary
+        ]
+      })
+    default:
+      return []
+  }
+}
+
+function getHeaders(type) {
+  switch (type) {
+    case 'weight-list': return ['#', 'ID', '体重(kg)', '体脂(%)', 'BMI', '日期', '备注']
+    case 'exercise-list': return ['#', 'ID', '类型', '时长(分)', '热量', '心率', '日期']
+    case 'diet-list': return ['#', 'ID', '餐别', '热量', '蛋白质', '碳水', '脂肪', '日期']
+    case 'sleep-list': return ['#', 'ID', '时长(h)', '质量', '入睡', '醒来', '深睡(h)', '日期']
+    case 'record-list': return ['#', 'ID', '类型', '标签', '日期', '备注']
+    case 'food-list': return ['#', '名称', '热量(kcal)', '蛋白质(g)', '碳水(g)', '脂肪(g)']
+    case 'timeline': return ['#', '时间', '类型', '摘要']
+    default: return []
+  }
+}
+
+function outputStats(data, type, format) {
+  if (format === 'json') {
+    outputJson(data)
+    return
+  }
+  if (format === 'toon') {
+    outputToon(data)
+    return
+  }
+
+  const rows = []
+  switch (type) {
+    case 'weight-stats':
+      if (data.avgWeight !== undefined) rows.push(['平均体重', `${data.avgWeight} kg`])
+      if (data.minWeight !== undefined) rows.push(['最低体重', `${data.minWeight} kg`])
+      if (data.maxWeight !== undefined) rows.push(['最高体重', `${data.maxWeight} kg`])
+      if (data.change !== undefined && data.change !== null) rows.push(['变化量', `${data.change > 0 ? '+' : ''}${data.change} kg`])
+      break
+    case 'exercise-stats':
+      if (data.count !== undefined) rows.push(['总次数', data.count])
+      if (data.totalDuration !== undefined) rows.push(['总时长', `${data.totalDuration} min`])
+      if (data.avgDuration !== null) rows.push(['平均时长', `${data.avgDuration.toFixed(1)} min`])
+      if (data.totalCalories !== undefined) rows.push(['总热量', `${data.totalCalories} kcal`])
+      if (data.avgCalories !== null) rows.push(['平均热量', `${data.avgCalories.toFixed(0)} kcal`])
+      if (data.frequencyByType) {
+        for (const [t, c] of Object.entries(data.frequencyByType)) {
+          rows.push([`频率 (${t})`, c])
+        }
+      }
+      break
+    case 'diet-stats':
+      if (data.avgCalories !== undefined) rows.push(['平均热量', `${data.avgCalories?.toFixed?.(0) || data.avgCalories} kcal`])
+      if (data.avgProtein !== undefined) rows.push(['平均蛋白质', `${data.avgProtein?.toFixed?.(1) || data.avgProtein}g`])
+      if (data.avgCarbs !== undefined) rows.push(['平均碳水', `${data.avgCarbs?.toFixed?.(1) || data.avgCarbs}g`])
+      if (data.avgFat !== undefined) rows.push(['平均脂肪', `${data.avgFat?.toFixed?.(1) || data.avgFat}g`])
+      if (data.totalWater !== undefined && data.totalWater !== null) rows.push(['总饮水量', `${data.totalWater}ml`])
+      if (data.count !== undefined) rows.push(['记录数', data.count])
+      break
+    case 'sleep-stats':
+      if (data.avgDuration !== undefined) rows.push(['平均时长', `${data.avgDuration?.toFixed?.(1) || data.avgDuration}h`])
+      if (data.avgQuality !== undefined) rows.push(['平均质量', `${data.avgQuality?.toFixed?.(1) || data.avgQuality}/10`])
+      if (data.avgDeepSleep !== undefined) rows.push(['平均深睡', `${data.avgDeepSleep?.toFixed?.(1) || data.avgDeepSleep}h`])
+      if (data.count !== undefined) rows.push(['记录数', data.count])
+      break
+    default:
+      rows.push(...Object.entries(data).map(([k, v]) => [k, typeof v === 'object' ? JSON.stringify(v) : v]))
+  }
+  outputTable(['指标', '数值'], rows)
+}
+
+function outputGet(data, type, format) {
+  if (format === 'json') {
+    outputJson(data)
+    return
+  }
+  if (format === 'toon') {
+    outputToon(data)
+    return
+  }
+
+  const df = getConfigDateFormat()
+  const rows = Object.entries(data).map(([k, v]) => {
+    let val = v
+    if (k === 'date' && v) val = formatDate(v, df)
+    else if (typeof v === 'object' && v !== null) val = JSON.stringify(v)
+    return [k, val]
+  })
+  outputTable(['字段', '值'], rows)
+}
+
+export function outputData(data, options = {}) {
+  const { format = 'json', type, page = 1 } = options
+
+  if (type && type.endsWith('-stats')) {
+    outputStats(data, type, format)
+    return
+  }
+
+  if (type && type.endsWith('-get')) {
+    outputGet(data, type, format)
+    return
+  }
+
+  if (format === 'toon') {
+    outputToon(data)
+    return
+  }
+
+  const items = extractItems(data, type)
+  const headers = getHeaders(type)
+  const rows = buildRows(items, type)
+
+  if (format === 'json') {
+    outputJson(data)
+    return
+  }
+
+  if (format === 'table') {
+    if (rows.length > 0) {
+      outputTable(headers, rows)
+    } else {
+      console.log('(无数据)')
+    }
+    const hint = formatPaginationHint(page, data.totalPages, data.total, 'table')
+    if (hint) console.log('\n' + hint)
+    return
+  }
+
+  // fallback
+  outputJson(data)
+}

package/src/lib/timezone.js

@@ -0,0 +1,78 @@
+import dayjs from 'dayjs'
+import utc from 'dayjs/plugin/utc.js'
+import timezone from 'dayjs/plugin/timezone.js'
+import config from './config.js'
+
+dayjs.extend(utc)
+dayjs.extend(timezone)
+
+export function getConfigTimezone() {
+  return config.get('timezone') || dayjs.tz.guess() || 'UTC'
+}
+
+export function getConfigDateFormat() {
+  return config.get('dateFormat') || 'YYYY-MM-DD HH:mm'
+}
+
+export function formatDate(date, format) {
+  const tz = getConfigTimezone()
+  const fmt = format || getConfigDateFormat()
+  return dayjs(date).tz(tz).format(fmt)
+}
+
+export function appendTimezoneOffset(dateStr) {
+  if (!dateStr) return dateStr
+  // Pure date like "2026-05-28" - no offset needed
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
+    return dateStr
+  }
+  // Already has timezone offset
+  if (/[+-]\d{2}:\d{2}$/.test(dateStr) || /Z$/.test(dateStr)) {
+    return dateStr
+  }
+  // Datetime without offset - append user's timezone
+  const tz = getConfigTimezone()
+  const offset = dayjs().tz(tz).format('Z')
+  return `${dateStr}${offset}`
+}
+
+export function getDefaultLast() {
+  return '7d'
+}
+
+export function getDefaultLimit() {
+  return 20
+}
+
+export function buildQueryParams(options, defaults = {}) {
+  const params = new URLSearchParams()
+
+  const hasTimeFilter = options.last || options.start || options.end
+  if (!hasTimeFilter && defaults.last !== false) {
+    params.append('last', getDefaultLast())
+  }
+
+  if (options.last) params.append('last', options.last)
+  if (options.start) params.append('start', options.start)
+  if (options.end) params.append('end', options.end)
+
+  const page = options.page || defaults.page || 1
+  const limit = options.limit || defaults.limit || getDefaultLimit()
+  params.append('page', String(page))
+  params.append('limit', String(limit))
+
+  if (options.includeDeleted) {
+    params.append('includeDeleted', 'true')
+  }
+
+  // Pass through other known filter options
+  const filterKeys = ['type', 'tag', 'meal', 'query']
+  for (const key of filterKeys) {
+    if (options[key]) {
+      const paramKey = key === 'meal' ? 'mealType' : key === 'query' ? 'q' : key
+      params.append(paramKey, options[key])
+    }
+  }
+
+  return { params, page: parseInt(String(page), 10), limit: parseInt(String(limit), 10) }
+}