opencode-supertask 0.1.25 → 0.1.26

package/README.md

@@ -127,6 +127,13 @@ supertask db restore --from /path/to/tasks-backup.db --confirm RESTORE [--keep-s
 
 `db backup` creates and validates a standalone SQLite snapshot. For `db clear` and `db restore`, the CLI automatically stops a PM2 Gateway whose PID matches the current database's fresh ready lock, then restores its previous running state. Both commands create a safety backup before changing data and still refuse active tasks or an unverified/foreground Gateway. Use `--keep-stopped` to leave a previously running PM2 Gateway stopped.
 
+All four `db` commands print a concise human-readable summary when stdout is an interactive terminal. Pipes, command substitution, and other non-interactive callers continue to receive JSON; pass `--json` to force JSON in a terminal:
+
+```bash
+supertask db check --json
+supertask db check | jq '.counts'
+```
+
 ### Duration Format
 
 Schedule supports friendly duration strings:
@@ -294,6 +301,13 @@ supertask db restore --from /path/to/tasks-backup.db --confirm RESTORE [--keep-s
 
 `db backup` 会生成并校验可独立恢复的 SQLite 快照。CLI 清空和恢复会先确认 PM2 PID 与当前数据库的新鲜 ready 锁一致，再自动停止并按原状态重启 Gateway；操作失败时也会尝试恢复 Gateway。它们仍会拒绝运行中任务、前台 Gateway 或无法确认归属的进程，并在修改数据前自动保留安全备份。传入 `--keep-stopped` 可让原本运行的 PM2 Gateway 保持停止。
 
+四个 `db` 命令在交互式终端默认输出简洁的人类可读摘要；管道、命令替换和其他非交互调用继续得到 JSON。终端内需要 JSON 时传入 `--json`：
+
+```bash
+supertask db check --json
+supertask db check | jq '.counts'
+```
+
 ### 数据位置
 
 - 数据库：`~/.local/share/opencode/tasks.db`

package/dist/cli/index.js

@@ -24297,11 +24297,108 @@ function parseDuration(input) {
 
 // src/cli/index.ts
 init_pm2();
-async function withDb(fn) {
+
+// src/cli/database-output.ts
+function useJson(options) {
+  const isTTY = options.isTTY ?? process.stdout.isTTY === true;
+  return options.forceJson === true || !isTTY;
+}
+function formatBytes(bytes) {
+  const units = ["B", "KiB", "MiB", "GiB"];
+  let value = bytes;
+  let unit = 0;
+  while (value >= 1024 && unit < units.length - 1) {
+    value /= 1024;
+    unit += 1;
+  }
+  const rendered = Number.isInteger(value) ? String(value) : value.toFixed(1);
+  return `${rendered} ${units[unit]}`;
+}
+function formatCounts(counts) {
+  return `\u4EFB\u52A1 ${counts.tasks} \xB7 \u6267\u884C\u8BB0\u5F55 ${counts.taskRuns} \xB7 \u8C03\u5EA6\u6A21\u677F ${counts.taskTemplates}`;
+}
+function formatGateway(gateway) {
+  if (gateway.restarted) return "\u5DF2\u81EA\u52A8\u505C\u6B62\u3001\u91CD\u542F\u5E76\u6062\u590D\u5C31\u7EEA";
+  if (gateway.keptStopped) return "\u5DF2\u81EA\u52A8\u505C\u6B62\uFF0C\u6309\u8981\u6C42\u4FDD\u6301\u505C\u6B62";
+  if (!gateway.wasRunning) return "\u65E0\u9700\u81EA\u52A8\u505C\u542F\uFF08\u672A\u53D1\u73B0\u5339\u914D\u5F53\u524D\u6570\u636E\u5E93\u7684 PM2 Gateway\uFF09";
+  return "\u539F Gateway \u672A\u6062\u590D\u8FD0\u884C";
+}
+function formatCheck(result) {
+  const lines = [
+    result.ok ? "\u2713 \u6570\u636E\u5E93\u68C0\u67E5\u901A\u8FC7" : "\u2717 \u6570\u636E\u5E93\u68C0\u67E5\u672A\u901A\u8FC7",
+    "",
+    `\u6570\u636E\u5E93\uFF1A${result.path}`,
+    `\u5927\u5C0F\uFF1A${formatBytes(result.sizeBytes)}`,
+    `\u65E5\u5FD7\u6A21\u5F0F\uFF1A${result.journalMode}`,
+    `\u6570\u636E\u7EDF\u8BA1\uFF1A${formatCounts(result.counts)}`,
+    `\u8FD0\u884C\u4E2D\uFF1A\u4EFB\u52A1 ${result.runningTasks} \xB7 \u6267\u884C\u8BB0\u5F55 ${result.runningRuns}`
+  ];
+  if (!result.ok) {
+    lines.push(
+      `\u5B8C\u6574\u6027\uFF1A${result.integrityMessages.join("\uFF1B") || "\u65E0\u7ED3\u679C"}`,
+      `\u5916\u952E\u8FDD\u89C4\uFF1A${result.foreignKeyViolations}`,
+      `\u7F3A\u5931\u8868\uFF1A${result.missingTables.join("\u3001") || "\u65E0"}`
+    );
+  }
+  return lines.join("\n");
+}
+function formatHuman(operation, result) {
+  switch (operation) {
+    case "check":
+      return formatCheck(result);
+    case "backup": {
+      const backup = result;
+      return [
+        "\u2713 \u6570\u636E\u5E93\u5907\u4EFD\u5B8C\u6210",
+        "",
+        `\u5907\u4EFD\u6587\u4EF6\uFF1A${backup.path}`,
+        `\u5927\u5C0F\uFF1A${formatBytes(backup.sizeBytes)}`,
+        `\u6570\u636E\u7EDF\u8BA1\uFF1A${formatCounts(backup.check.counts)}`,
+        `\u6570\u636E\u5E93\u5B8C\u6574\u6027\uFF1A${backup.check.ok ? "\u901A\u8FC7" : "\u672A\u901A\u8FC7"}`
+      ].join("\n");
+    }
+    case "clear": {
+      const cleared = result;
+      return [
+        "\u2713 \u6570\u636E\u5E93\u5DF2\u5B89\u5168\u6E05\u7A7A",
+        "",
+        `\u5DF2\u5220\u9664\uFF1A${formatCounts(cleared.deleted)}`,
+        `\u5B89\u5168\u5907\u4EFD\uFF1A${cleared.backupPath}`,
+        `Gateway\uFF1A${formatGateway(cleared.gateway)}`,
+        `\u6570\u636E\u5E93\u5B8C\u6574\u6027\uFF1A${cleared.check.ok ? "\u901A\u8FC7" : "\u672A\u901A\u8FC7"}`
+      ].join("\n");
+    }
+    case "restore": {
+      const restored = result;
+      return [
+        "\u2713 \u6570\u636E\u5E93\u6062\u590D\u5B8C\u6210",
+        "",
+        `\u6062\u590D\u6765\u6E90\uFF1A${restored.sourcePath}`,
+        `\u6062\u590D\u524D\u5B89\u5168\u5907\u4EFD\uFF1A${restored.safetyBackupPath}`,
+        `\u8FD0\u884C\u6001\u6536\u655B\uFF1A\u4EFB\u52A1 ${restored.recoveredRunningTasks} \xB7 \u6267\u884C\u8BB0\u5F55 ${restored.closedRunningRuns}`,
+        `\u6570\u636E\u7EDF\u8BA1\uFF1A${formatCounts(restored.check.counts)}`,
+        `Gateway\uFF1A${formatGateway(restored.gateway)}`,
+        `\u6570\u636E\u5E93\u5B8C\u6574\u6027\uFF1A${restored.check.ok ? "\u901A\u8FC7" : "\u672A\u901A\u8FC7"}`
+      ].join("\n");
+    }
+  }
+}
+function renderDatabaseResult(operation, result, options = {}) {
+  return useJson(options) ? JSON.stringify(result, null, 2) : formatHuman(operation, result);
+}
+function renderDatabaseError(error, options = {}) {
+  const message = error instanceof Error ? error.message : String(error);
+  return useJson(options) ? JSON.stringify({ error: message }) : `\u2717 ${message}`;
+}
+
+// src/cli/index.ts
+async function withDb(fn, formatError = (error) => JSON.stringify({
+  error: error instanceof Error ? error.message : String(error)
+})) {
   try {
     return await fn();
   } catch (error) {
-    console.error(JSON.stringify({ error: error instanceof Error ? error.message : String(error) }));
+    console.error(formatError(error));
     closeDb();
     process.exit(1);
   } finally {
@@ -24550,13 +24647,15 @@ program2.command("template").description("\u7BA1\u7406\u4EFB\u52A1\u8C03\u5EA6\u
   }))
 );
 var databaseCommand = new Command("db").description("\u6570\u636E\u5E93\u68C0\u67E5\u3001\u5907\u4EFD\u3001\u6E05\u7A7A\u4E0E\u6062\u590D");
-databaseCommand.command("check").description("\u68C0\u67E5\u6570\u636E\u5E93\u5B8C\u6574\u6027\u3001\u5916\u952E\u548C\u4E1A\u52A1\u8868\u7EDF\u8BA1").action(async () => withDb(async () => {
-  console.log(JSON.stringify(DatabaseMaintenanceService.check(), null, 2));
-}));
-databaseCommand.command("backup").description("\u521B\u5EFA\u7ECF\u8FC7\u5B8C\u6574\u6027\u6821\u9A8C\u7684\u4E00\u81F4\u6027\u5907\u4EFD").option("-o, --output <path>", "\u5907\u4EFD\u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4\u5199\u5165\u6570\u636E\u5E93\u76EE\u5F55\uFF09").action(async (options) => withDb(async () => {
-  console.log(JSON.stringify(DatabaseMaintenanceService.backup(options.output), null, 2));
-}));
-databaseCommand.command("clear").description("\u5907\u4EFD\u540E\u4E8B\u52A1\u6027\u6E05\u7A7A\u4EFB\u52A1\u3001\u6267\u884C\u8BB0\u5F55\u548C\u8C03\u5EA6\u6A21\u677F").option("--confirm <word>", "\u5371\u9669\u64CD\u4F5C\u786E\u8BA4\uFF0C\u5FC5\u987B\u586B\u5199 CLEAR").option("--keep-stopped", "\u7EF4\u62A4\u7ED3\u675F\u540E\u4E0D\u91CD\u542F\u539F\u672C\u7531 PM2 \u7BA1\u7406\u7684 Gateway").action(async (options) => withDb(async () => {
+databaseCommand.command("check").description("\u68C0\u67E5\u6570\u636E\u5E93\u5B8C\u6574\u6027\u3001\u5916\u952E\u548C\u4E1A\u52A1\u8868\u7EDF\u8BA1").option("--json", "\u5F3A\u5236\u8F93\u51FA JSON\uFF08\u975E\u4EA4\u4E92\u8C03\u7528\u9ED8\u8BA4\u5DF2\u8F93\u51FA JSON\uFF09").action(async (options) => withDb(async () => {
+  const result = DatabaseMaintenanceService.check();
+  console.log(renderDatabaseResult("check", result, { forceJson: options.json }));
+}, (error) => renderDatabaseError(error, { forceJson: options.json })));
+databaseCommand.command("backup").description("\u521B\u5EFA\u7ECF\u8FC7\u5B8C\u6574\u6027\u6821\u9A8C\u7684\u4E00\u81F4\u6027\u5907\u4EFD").option("-o, --output <path>", "\u5907\u4EFD\u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4\u5199\u5165\u6570\u636E\u5E93\u76EE\u5F55\uFF09").option("--json", "\u5F3A\u5236\u8F93\u51FA JSON\uFF08\u975E\u4EA4\u4E92\u8C03\u7528\u9ED8\u8BA4\u5DF2\u8F93\u51FA JSON\uFF09").action(async (options) => withDb(async () => {
+  const result = DatabaseMaintenanceService.backup(options.output);
+  console.log(renderDatabaseResult("backup", result, { forceJson: options.json }));
+}, (error) => renderDatabaseError(error, { forceJson: options.json })));
+databaseCommand.command("clear").description("\u5907\u4EFD\u540E\u4E8B\u52A1\u6027\u6E05\u7A7A\u4EFB\u52A1\u3001\u6267\u884C\u8BB0\u5F55\u548C\u8C03\u5EA6\u6A21\u677F").option("--confirm <word>", "\u5371\u9669\u64CD\u4F5C\u786E\u8BA4\uFF0C\u5FC5\u987B\u586B\u5199 CLEAR").option("--keep-stopped", "\u7EF4\u62A4\u7ED3\u675F\u540E\u4E0D\u91CD\u542F\u539F\u672C\u7531 PM2 \u7BA1\u7406\u7684 Gateway").option("--json", "\u5F3A\u5236\u8F93\u51FA JSON\uFF08\u975E\u4EA4\u4E92\u8C03\u7528\u9ED8\u8BA4\u5DF2\u8F93\u51FA JSON\uFF09").action(async (options) => withDb(async () => {
   if (options.confirm !== "CLEAR") {
     throw new Error("\u6E05\u7A7A\u6570\u636E\u5E93\u5FC5\u987B\u663E\u5F0F\u4F20\u5165 --confirm CLEAR");
   }
@@ -24564,9 +24663,9 @@ databaseCommand.command("clear").description("\u5907\u4EFD\u540E\u4E8B\u52A1\u60
     options.keepStopped ?? false,
     () => DatabaseMaintenanceService.clear()
   );
-  console.log(JSON.stringify(result, null, 2));
-}));
-databaseCommand.command("restore").description("\u81EA\u52A8\u5907\u4EFD\u5F53\u524D\u5E93\u540E\uFF0C\u4ECE\u6307\u5B9A\u5907\u4EFD\u6062\u590D\u6570\u636E\u5E93").requiredOption("--from <path>", "\u8981\u6062\u590D\u7684 SQLite \u5907\u4EFD\u6587\u4EF6").option("--confirm <word>", "\u5371\u9669\u64CD\u4F5C\u786E\u8BA4\uFF0C\u5FC5\u987B\u586B\u5199 RESTORE").option("--keep-stopped", "\u7EF4\u62A4\u7ED3\u675F\u540E\u4E0D\u91CD\u542F\u539F\u672C\u7531 PM2 \u7BA1\u7406\u7684 Gateway").action(async (options) => withDb(async () => {
+  console.log(renderDatabaseResult("clear", result, { forceJson: options.json }));
+}, (error) => renderDatabaseError(error, { forceJson: options.json })));
+databaseCommand.command("restore").description("\u81EA\u52A8\u5907\u4EFD\u5F53\u524D\u5E93\u540E\uFF0C\u4ECE\u6307\u5B9A\u5907\u4EFD\u6062\u590D\u6570\u636E\u5E93").requiredOption("--from <path>", "\u8981\u6062\u590D\u7684 SQLite \u5907\u4EFD\u6587\u4EF6").option("--confirm <word>", "\u5371\u9669\u64CD\u4F5C\u786E\u8BA4\uFF0C\u5FC5\u987B\u586B\u5199 RESTORE").option("--keep-stopped", "\u7EF4\u62A4\u7ED3\u675F\u540E\u4E0D\u91CD\u542F\u539F\u672C\u7531 PM2 \u7BA1\u7406\u7684 Gateway").option("--json", "\u5F3A\u5236\u8F93\u51FA JSON\uFF08\u975E\u4EA4\u4E92\u8C03\u7528\u9ED8\u8BA4\u5DF2\u8F93\u51FA JSON\uFF09").action(async (options) => withDb(async () => {
   if (options.confirm !== "RESTORE") {
     throw new Error("\u6062\u590D\u6570\u636E\u5E93\u5FC5\u987B\u663E\u5F0F\u4F20\u5165 --confirm RESTORE");
   }
@@ -24574,8 +24673,8 @@ databaseCommand.command("restore").description("\u81EA\u52A8\u5907\u4EFD\u5F53\u
     options.keepStopped ?? false,
     () => DatabaseMaintenanceService.restore(options.from)
   );
-  console.log(JSON.stringify(result, null, 2));
-}));
+  console.log(renderDatabaseResult("restore", result, { forceJson: options.json }));
+}, (error) => renderDatabaseError(error, { forceJson: options.json })));
 program2.addCommand(databaseCommand);
 program2.command("init").description("Initialize SuperTask (create config + run migrations)").action(async () => withDb(async () => {
   const { existsSync: existsSync7, mkdirSync: mkdirSync5, writeFileSync: writeFileSync4 } = await import("fs");