@dinoxx/dinox-cli 1.1.1 → 2.0.0

package/README.md

@@ -341,9 +341,11 @@ dino note get <note-id>
 #### 只拿轻量上下文（适合 AI / 脚本）
 
 ```bash
-dino note get <note-id> --context-only --format json
+dino note get <note-id> --format json
 ```
 
+`note get` 在 2.0 中始终是轻量读取；`--context-only` 仅保留为兼容参数，不会改变输出。
+
 #### 预览正文前几行
 
 ```bash
@@ -450,11 +452,14 @@ dino note bulk --days 30 --boxes "Work/Inbox" --box-replace "Archive/Review" --e
 #### `note patch`：结构化编辑正文
 
 ```bash
+dino note patch <note-id> --append-section "复盘" --content @./section.md --format json --dry-run
 dino note content-read <note-id> --format json
-dino note patch <note-id> --append-section "复盘" --content @./section.md --read-token <token> --format json
+dino note patch <note-id> --append-section "复盘" --content @./section.md --read-token @/tmp/dinox-read-token-<random> --format json
 ```
 
-`note patch` 只用于正文结构化编辑。真实写入前必须先 `content-read`，并传回 `readToken`；token 短期有效（当前为 30 分钟，以 `readTokenExpiresAt` 为准），绑定生成它时当前账号对应的本地 PowerSync 数据库作用域，不能在切换账号或本地数据库后复用。token 也是单次使用的，任何真实 patch 尝试都会先消费它，失败后重试必须重新执行 `content-read`。替换媒体、表格、未知节点等受保护 block 时，还需要显式 `--allow-protected-replace`。
+`note patch` 只用于正文结构化编辑。先 dry-run，再在真实写入前执行 `content-read` 并传回 `readToken`。默认 `content-read` 只返回 block 类型、范围、hash 和字符数，不返回 block 文本、预览或 attributes，同时返回 `readTokenScope: "structural-metadata"`。只有用户授权全文读取时才添加 `--include-content`；此时返回 `readTokenScope: "full-content"`。替换媒体、表格、容器、未知节点等受保护 block 时，必须使用已审阅全文后取得的 `full-content` token，并显式添加 `--allow-protected-replace`；默认 scope 会被拒绝。
+
+token 短期有效（当前为 30 分钟，以 `readTokenExpiresAt` 为准），绑定生成它时当前账号对应的本地 PowerSync 数据库作用域，不能在切换账号或本地数据库后复用。token 也是单次使用的，任何真实 patch 尝试都会先消费它，失败后重试必须重新执行 `content-read`。Agent 应把 token 写入唯一、仅 owner 可读写（mode `0600`）的临时文件，通过 `--read-token @<file>` 传入，并在这一次真实 patch 尝试后立即删除；不要把 token 放进命令参数、日志、笔记或可复用文件。
 
 #### 收藏状态
 
@@ -567,6 +572,19 @@ dino tag add --name "工作/项目A" --emoji "🧠"
 - 支持层级标签，如 `工作/项目A`
 - 已删除但同名的标签，CLI 会尽量做恢复而不是重复新建
 
+#### 查看、调整和合并标签层级
+
+```bash
+dino tag tree --format json
+dino tag stats --format json
+dino tag rename "工作/旧项目" "新项目" --format json --dry-run
+dino tag move "工作/新项目" --to "归档" --format json --dry-run
+dino tag merge "重复标签" "规范标签" --format json --dry-run
+dino tag merge "重复标签" "规范标签" --expected-count <affected-count> --confirm --format json
+```
+
+`tag merge` 会更新笔记引用并软删除来源子树。真实写入必须使用新鲜 dry-run 返回的 `data.changes.affected_count`，同时提供 `--expected-count` 和 `--confirm`。
+
 ### 5.8 管理卡片盒
 
 #### 查看全部卡片盒
@@ -587,6 +605,19 @@ dino box add --name "Inbox" --description "用于存放待整理的想法和资
 - `--description` 很值得写
 - 这段说明会帮助 AI 和你自己更准确地理解这个卡片盒的用途
 
+#### 查看、调整和合并卡片盒层级
+
+```bash
+dino box tree --format json
+dino box stats --format json
+dino box rename "工作/Inbox" "待整理" --format json --dry-run
+dino box move "工作/待整理" --to "归档" --format json --dry-run
+dino box merge "工作/重复" "工作/规范" --format json --dry-run
+dino box merge "工作/重复" "工作/规范" --expected-count <affected-count> --confirm --format json
+```
+
+`box merge` 会更新笔记归属并软删除来源子树，同样要求新鲜 dry-run、`--expected-count` 和 `--confirm`。
+
 ### 5.9 管理 Prompt
 
 #### 查看全部 Prompt
@@ -599,6 +630,7 @@ dino prompt list
 
 ```bash
 dino prompt add --name "周报助手" --prompt "请基于本周笔记输出一份简洁周报"
+dino prompt add --name "周报助手" --prompt @./weekly-prompt.txt
 ```
 
 ### 5.10 查看版本与配置
@@ -933,6 +965,15 @@ dino todo search --status uncompleted --format json
 
 `--format json` 会返回稳定的结构化 envelope，适合被脚本、自动化任务和 AI Agent 解析。
 
+2.0 对几个读命令统一了 freshness envelope，升级脚本时需要迁移：
+
+- `dino note get` 只返回轻量 `data.note`，不再默认暴露正文。
+- `dino note detail` 始终返回 `data.stale`、`data.count` 和 `data.notes`，即使只查询一条笔记。
+- `dino prompt list` 从 `data.prompts` 读取，`dino box list` 从 `data.boxes` 读取；两者同时返回 `data.stale` 和 `data.count`。
+- 所有 structured dry-run 都会返回 `data.stale` 和 `data.sync.gate`，用于判断预览是否建立在新鲜数据上。
+
+Agent 调用在线命令时，只要 schema 提供 `--sync-timeout`，建议传入有界预算（例如 `20000`），并把宿主工具超时设为高 5–10 秒。宿主先超时但没有收到 structured envelope 时，结果是未知，不要直接重试写入；先检查新鲜度或写入后置条件。
+
 ### 7.2 先读取命令 schema
 
 不确定某个命令支持哪些参数、输出哪些字段时，先读取 schema：

package/dist/cli.js

@@ -10,6 +10,8 @@ import { registerMetaCommands } from './commands/meta/index.js';
 import { registerNoteCommands } from './commands/notes/index.js';
 import { registerPromptCommands } from './commands/prompt/index.js';
 import { registerSchemaCommands } from './commands/schema/index.js';
+import { registerSavedViewCommands } from './commands/savedViews/index.js';
+import { registerSkillsCommands } from './commands/skills/index.js';
 import { registerSyncCommand } from './commands/sync.js';
 import { registerStorageCommands } from './commands/storage/index.js';
 import { registerUpdateCommand } from './commands/update.js';
@@ -82,7 +84,9 @@ export function createCli() {
     registerSyncCommand(program);
     registerUpdateCommand(program);
     registerPromptCommands(program);
+    registerSavedViewCommands(program);
     registerSchemaCommands(program);
+    registerSkillsCommands(program);
     registerStorageCommands(program);
     registerTagsCommand(program);
     registerTodoCommands(program);

package/dist/commands/auth/index.js

@@ -430,8 +430,7 @@ async function runAuthStatus(context) {
             endpoint: resolved.powersync.endpoint ?? null,
             tokenEndpoint: resolved.powersync.tokenEndpoint ?? null,
             uploadBaseUrl: resolved.powersync.uploadBaseUrl ?? null,
-            uploadV4Path: resolved.powersync.uploadV4Path,
-            uploadV2Path: resolved.powersync.uploadV2Path,
+            uploadPath: resolved.powersync.uploadPath,
         },
         dbPath,
     };

package/dist/commands/boxes/index.js

@@ -6,6 +6,7 @@ import { printDryRunPreview } from '../../utils/dryRun.js';
 import { DinoxError } from '../../utils/errors.js';
 import { getRequestedStructuredOutputFormat, printHumanReadableLine, printSuccess, } from '../../utils/output.js';
 import { commandStale, printStaleCacheWarning, syncBeforeCommand, waitForMutationUpload, withCommandRuntime, } from '../runtime.js';
+import { assertWriteConfirmationProvided, parseExpectedCount } from '../writeConfirmation.js';
 import { addBox, inspectAddBox, listBoxes } from './repo.js';
 import { getBoxStats, getBoxTree, inspectBoxCleanup, mergeBox, moveBox, renameBox, } from './operations.js';
 const BOX_GLOBAL_OPTIONS = [...FORMAT_OPTIONS, ...OFFLINE_OPTIONS, ...REQUIRE_SYNC_OPTIONS, ...SYNC_TIMEOUT_OPTIONS];
@@ -13,7 +14,12 @@ async function runBoxList(context) {
     await withCommandRuntime(context, async (runtime) => {
         const identity = await resolveAuthIdentity(runtime.config);
         await syncBeforeCommand(runtime, { syncTokenIndex: true });
-        printSuccess(await listBoxes(runtime.db, { userId: identity.userId }));
+        const boxes = await listBoxes(runtime.db, { userId: identity.userId });
+        printSuccess({
+            stale: commandStale(runtime),
+            count: boxes.length,
+            boxes,
+        });
     });
 }
 async function runBoxTree(context) {
@@ -62,7 +68,7 @@ async function runBoxAdd(context) {
                     description,
                     color,
                 })),
-            }));
+            }), runtime);
             return;
         }
         const result = await addBox(runtime.db, {
@@ -110,7 +116,7 @@ async function runBoxRename(context) {
                 summary: `Rename zettel box "${result.fromPath}" to "${result.toPath}".`,
                 inputs: { path, new_name: newName },
                 changes: { updated_boxes: result.updatedBoxes },
-            }));
+            }), runtime);
             return;
         }
         await waitForMutationUpload(runtime);
@@ -135,7 +141,7 @@ async function runBoxMove(context) {
                 summary: `Move zettel box "${result.fromPath}" to "${result.toPath}".`,
                 inputs: { path, to },
                 changes: { updated_boxes: result.updatedBoxes },
-            }));
+            }), runtime);
             return;
         }
         await waitForMutationUpload(runtime);
@@ -145,9 +151,17 @@ async function runBoxMove(context) {
 async function runBoxMerge(context) {
     const from = requireArg(context.args.from, 'Source box path is required');
     const to = requireArg(context.args.to, 'Target box path is required');
+    const dryRun = Boolean(context.options.dryRun);
+    const expectedCount = parseExpectedCount(context.options.expectedCount);
+    const writeOptions = {
+        dryRun,
+        confirm: Boolean(context.options.confirm),
+        expectedCount,
+    };
+    assertWriteConfirmationProvided('Box merge', writeOptions);
     await withBoxWriteRuntime(context, async ({ runtime, userId }) => {
-        const result = await mergeBox(runtime.db, { from, to, userId }, { dryRun: Boolean(context.options.dryRun) });
-        if (Boolean(context.options.dryRun)) {
+        const result = await mergeBox(runtime.db, { from, to, userId }, writeOptions);
+        if (dryRun) {
             printDryRunPreview(buildBoxMutationDryRunPreview({
                 config: runtime.config,
                 offline: runtime.offline,
@@ -155,12 +169,15 @@ async function runBoxMerge(context) {
                 action: 'merge_box',
                 risk: 'high-risk-write',
                 summary: `Merge zettel box subtree "${result.fromPath}" into "${result.toPath}".`,
-                inputs: { from, to },
+                inputs: { from, to, expected_count: expectedCount },
                 changes: {
+                    affected_count: result.affectedCount,
+                    soft_deleted_box_count: result.softDeletedBoxIds.length,
+                    updated_note_count: result.updatedNotes.length,
                     soft_deleted_box_ids: result.softDeletedBoxIds,
                     updated_notes: result.updatedNotes,
                 },
-            }));
+            }), runtime);
             return;
         }
         await waitForMutationUpload(runtime);
@@ -182,7 +199,7 @@ async function runBoxCleanup(context) {
                 summary: `Inspect zettel box cleanup candidates (${result.issues.length} issues).`,
                 inputs: {},
                 targets: result.issues,
-            }));
+            }), runtime);
             return;
         }
         printSuccess({ stale: commandStale(runtime), ...result });
@@ -203,7 +220,7 @@ export const boxCommandGroup = {
                 output: {
                     type: 'structured',
                     summary: 'Box list payload',
-                    fields: ['id', 'name', 'path', 'parentId', 'description', 'color'],
+                    fields: ['stale', 'count', 'boxes.id', 'boxes.name', 'boxes.path', 'boxes.parentId', 'boxes.description', 'boxes.color'],
                 },
                 examples: ['dino box list --format json'],
             },
@@ -318,7 +335,11 @@ export const boxCommandGroup = {
                 { syntax: '<from>', description: 'Source box path' },
                 { syntax: '<to>', description: 'Target box path' },
             ],
-            options: [{ flags: '--dry-run', description: 'Preview the write without executing it' }],
+            options: [
+                { flags: '--expected-count <n>', description: 'Required for real writes; must equal source boxes plus notes affected', type: 'number' },
+                { flags: '--confirm', description: 'Required for real writes after reviewing a dry run', type: 'boolean' },
+                { flags: '--dry-run', description: 'Preview the write without executing it', type: 'boolean' },
+            ],
             schema: {
                 path: 'box.merge',
                 risk: 'high-risk-write',
@@ -327,9 +348,12 @@ export const boxCommandGroup = {
                 output: {
                     type: 'structured',
                     summary: 'Zettel box merge result',
-                    fields: ['fromId', 'toId', 'fromPath', 'toPath', 'softDeletedBoxIds', 'updatedNotes', 'stale'],
+                    fields: ['fromId', 'toId', 'fromPath', 'toPath', 'softDeletedBoxIds', 'updatedNotes', 'affectedCount', 'stale'],
                 },
-                examples: ['dino box merge "Work/Inbox" "Work/Archive" --format json --dry-run'],
+                examples: [
+                    'dino box merge "Work/Inbox" "Work/Archive" --format json --dry-run',
+                    'dino box merge "Work/Inbox" "Work/Archive" --expected-count 6 --confirm --format json',
+                ],
             },
             action: runBoxMerge,
         },

package/dist/commands/boxes/operations.d.ts

@@ -1,4 +1,5 @@
 import type { AbstractPowerSyncDatabase } from '@powersync/common';
+import { type ConfirmedWriteOptions } from '../writeConfirmation.js';
 import type { BoxListItem } from './model.js';
 export type BoxTreeNode = BoxListItem & {
     children: BoxTreeNode[];
@@ -71,6 +72,7 @@ export type BoxMergeResult = {
         before: string[];
         after: string[];
     }>;
+    affectedCount: number;
 };
 export declare function getBoxTree(db: AbstractPowerSyncDatabase, input?: BoxReadInput): Promise<BoxTreeNode[]>;
 export declare function getBoxStats(db: AbstractPowerSyncDatabase, input?: BoxReadInput): Promise<BoxStatsResult>;
@@ -81,6 +83,4 @@ export declare function renameBox(db: AbstractPowerSyncDatabase, input: BoxRenam
 export declare function moveBox(db: AbstractPowerSyncDatabase, input: BoxMoveInput, options?: {
     dryRun?: boolean;
 }): Promise<BoxRenameMoveResult>;
-export declare function mergeBox(db: AbstractPowerSyncDatabase, input: BoxMergeInput, options?: {
-    dryRun?: boolean;
-}): Promise<BoxMergeResult>;
+export declare function mergeBox(db: AbstractPowerSyncDatabase, input: BoxMergeInput, options?: ConfirmedWriteOptions): Promise<BoxMergeResult>;

package/dist/commands/boxes/operations.js

@@ -1,6 +1,7 @@
 import { withPowerSyncWriteTransaction } from '../../powersync/runtime.js';
 import { DinoxError } from '../../utils/errors.js';
 import { nowIsoUtc } from '../../utils/time.js';
+import { assertConfirmedWrite, assertWriteConfirmationProvided, } from '../writeConfirmation.js';
 import { MAX_BOX_NAME_LENGTH, REQUIRED_NOTE_BOX_COLUMNS, assertBoxPathLimits, assertTextLimits, canonicalizeBoxPath, getLeafName, normalizeBoxLookupKey, parseStoredBoxIds, trimString, } from './model.js';
 import { activeBoxNodes, activeNodeByPath, assertCanWriteBox, assertRequiredColumns, assertWritableBoxNodes, descendantsOf, ensureNoPathConflict, getTableColumns, isActiveBoxNode, isDescendantBoxPath, loadAllBoxNodes, requireActivePath, toBoxListItem, } from './store.js';
 function buildSubtreeChanges(args) {
@@ -369,7 +370,7 @@ function sameIds(left, right) {
     }
     return left.every((value, index) => value === right[index]);
 }
-export async function mergeBox(db, input, options = {}) {
+async function buildBoxMergePlan(db, input) {
     const parsed = parseMergeInput(input);
     const boxColumns = await getTableColumns(db, 'c_zettel_box');
     const noteColumns = await getTableColumns(db, 'c_note');
@@ -393,33 +394,55 @@ export async function mergeBox(db, input, options = {}) {
     })
         .filter((row) => row.id && !sameIds(row.before, row.after));
     const softDeletedBoxIds = sourceNodes.map((node) => node.id);
-    if (!options.dryRun) {
-        await withPowerSyncWriteTransaction(db, async (tx) => {
-            const timestamp = nowIsoUtc();
-            for (const note of updatedNotes) {
-                await tx.execute(`
-          UPDATE c_note
-          SET zettel_boxes = ?, updated_at = ?, version = COALESCE(version, 0) + 1
-          WHERE id = ?
-            AND TRIM(COALESCE(user_no, '')) = ?
-          `, [JSON.stringify(note.after), timestamp, note.id, parsed.userId]);
-            }
-            for (const boxId of softDeletedBoxIds) {
-                await tx.execute(`
-          UPDATE c_zettel_box
-          SET is_del = 1, updated_at = ?
-          WHERE id = ?
-            AND TRIM(COALESCE(user_no, '')) = ?
-          `, [timestamp, boxId, parsed.userId]);
-            }
-        });
-    }
+    const affectedCount = softDeletedBoxIds.length + updatedNotes.length;
     return {
-        fromId: source.id,
-        toId: target.id,
-        fromPath: source.path,
-        toPath: target.path,
-        softDeletedBoxIds,
-        updatedNotes,
+        result: {
+            fromId: source.id,
+            toId: target.id,
+            fromPath: source.path,
+            toPath: target.path,
+            softDeletedBoxIds,
+            updatedNotes,
+            affectedCount,
+        },
+        userId: parsed.userId,
     };
 }
+function assertBoxMergeCount(plan, options) {
+    assertConfirmedWrite({
+        operation: 'Box merge',
+        schemaPath: 'box.merge',
+        actualCount: plan.result.affectedCount,
+        options,
+    });
+}
+export async function mergeBox(db, input, options = {}) {
+    if (options.dryRun) {
+        const plan = await buildBoxMergePlan(db, input);
+        assertBoxMergeCount(plan, options);
+        return plan.result;
+    }
+    assertWriteConfirmationProvided('Box merge', options);
+    return withPowerSyncWriteTransaction(db, async (tx) => {
+        const plan = await buildBoxMergePlan(tx, input);
+        assertBoxMergeCount(plan, options);
+        const timestamp = nowIsoUtc();
+        for (const note of plan.result.updatedNotes) {
+            await tx.execute(`
+        UPDATE c_note
+        SET zettel_boxes = ?, updated_at = ?, version = COALESCE(version, 0) + 1
+        WHERE id = ?
+          AND TRIM(COALESCE(user_no, '')) = ?
+        `, [JSON.stringify(note.after), timestamp, note.id, plan.userId]);
+        }
+        for (const boxId of plan.result.softDeletedBoxIds) {
+            await tx.execute(`
+        UPDATE c_zettel_box
+        SET is_del = 1, updated_at = ?
+        WHERE id = ?
+          AND TRIM(COALESCE(user_no, '')) = ?
+        `, [timestamp, boxId, plan.userId]);
+        }
+        return plan.result;
+    });
+}

package/dist/commands/info/index.js

@@ -1,12 +1,13 @@
 import { registerStandaloneCommand } from '../descriptor/register.js';
 import { FORMAT_OPTIONS } from '../schema/globalOptions.js';
-import { SKILLS_REPO_URL } from '../../constants/links.js';
+import { getSkillsReleaseMetadata } from '../../constants/links.js';
+import { RETIRED_SKILLS, RETIRED_SKILLS_CLEANUP, formatRetiredSkillsSummary, } from '../../skills/retired.js';
 import { clearPendingStructuredNoticeProvider, getRequestedStructuredOutputFormat, printHumanReadableLine, printSuccess, setPendingStructuredNoticeProvider, } from '../../utils/output.js';
 import { getUpdateNotice } from '../../utils/updateNotice.js';
 import { getPackageVersion } from '../../utils/version.js';
 export const infoCommandDescriptor = {
     name: 'info',
-    description: 'Show CLI version and bundled skills location',
+    description: 'Show CLI version and its matching standalone skills release',
     schema: {
         path: 'info',
         risk: 'read',
@@ -14,17 +15,36 @@ export const infoCommandDescriptor = {
         globalOptions: FORMAT_OPTIONS,
         output: {
             type: 'structured',
-            summary: 'CLI version metadata',
-            fields: ['name', 'version', 'skills_repo'],
+            summary: 'CLI version and matching standalone skills release metadata',
+            fields: [
+                'name',
+                'version',
+                'skills_repo',
+                'skills_version',
+                'skills_tag',
+                'skills_release',
+                'skills_installer',
+                'skills_install_command',
+                'retired_skills',
+                'retired_skills_cleanup',
+            ],
         },
         examples: ['dino info', 'dino info --format json'],
     },
     action: async (_context) => {
         const version = getPackageVersion();
+        const skills = getSkillsReleaseMetadata(version);
         const payload = {
             name: 'dino',
             version,
-            skills_repo: SKILLS_REPO_URL,
+            skills_repo: skills.repository,
+            skills_version: skills.version,
+            skills_tag: skills.tag,
+            skills_release: skills.release,
+            skills_installer: skills.installer,
+            skills_install_command: skills.installCommand,
+            retired_skills: RETIRED_SKILLS,
+            retired_skills_cleanup: RETIRED_SKILLS_CLEANUP,
         };
         if (getRequestedStructuredOutputFormat()) {
             const updateNotice = await getUpdateNotice(version);
@@ -43,6 +63,11 @@ export const infoCommandDescriptor = {
         }
         printHumanReadableLine(payload.version);
         printHumanReadableLine(`skills repo: ${payload.skills_repo}`);
+        printHumanReadableLine(`skills release: ${payload.skills_release}`);
+        printHumanReadableLine(`skills installer: ${payload.skills_installer.name}@${payload.skills_installer.version}`);
+        printHumanReadableLine(`skills install: ${payload.skills_install_command}`);
+        printHumanReadableLine(`retired skills: ${formatRetiredSkillsSummary()}`);
+        printHumanReadableLine(`retired skills cleanup: ${RETIRED_SKILLS_CLEANUP.guidance}`);
     },
 };
 export function registerInfoCommand(program) {

package/dist/commands/meta/repo.js

@@ -33,7 +33,7 @@ export function getMetaSchema() {
         version: 1,
         entities: {
             note_search_result: {
-                fields: ['id', 'title', 'summary', 'tags', 'created_at', 'boxes', 'is_starred'],
+                fields: ['id', 'title', 'summary', 'tags', 'created_at', 'starred_at', 'boxes', 'is_starred'],
                 meta_fields: [
                     'query',
                     'returned_count',
@@ -55,6 +55,7 @@ export function getMetaSchema() {
                     'created_at',
                     'updated_at',
                     'is_del',
+                    'starred_at',
                     'is_starred',
                     'boxes',
                     'links.backlinks',

package/dist/commands/notes/actions.js

@@ -6,7 +6,7 @@ import { convertMarkdownToNoteContent } from '../../utils/tiptapMarkdown.js';
 import { getRequestedStructuredOutputFormat, printHumanReadableLine, printSuccess, } from '../../utils/output.js';
 import { DinoxError } from '../../utils/errors.js';
 import { commandStale, printStaleCacheWarning, resolveWriteDurabilityForRuntime, waitForMutationUpload, } from '../runtime.js';
-import { createNote, executeNoteSearch, getNote, getNoteContext, getNoteDetails, getNotePreview, assertNotesUpdatable, resolveZettelBoxIdsForCreate, resolveZettelBoxIdsForUpdate, softDeleteNote, updateNote, validateTagsForCreate, validateTagsForUpdate, } from './repo.js';
+import { createNote, executeNoteSearch, getNoteContext, getNoteDetails, getNotePreview, assertNotesUpdatable, resolveZettelBoxIdsForCreate, resolveZettelBoxIdsForUpdate, softDeleteNote, updateNote, validateTagsForCreate, validateTagsForUpdate, } from './repo.js';
 import { routeRead } from '../../daemon/route.js';
 import { buildNoteCreateDryRunPreview, buildNoteDeleteDryRunPreview, buildNoteUpdateDryRunPreview, } from './dryRun.js';
 import { applyNoteMetadataMutation, planNoteMetadataMutation, } from './metadataMutation.js';
@@ -32,16 +32,6 @@ function toPublicNoteDetail(note) {
         boxes: zettel_boxes,
     };
 }
-function toPublicNote(note) {
-    if (!note) {
-        return null;
-    }
-    const { zettel_boxes, ...rest } = note;
-    return {
-        ...rest,
-        ...(zettel_boxes !== undefined ? { boxes: zettel_boxes } : {}),
-    };
-}
 async function executeNoteUpdateOperation(args) {
     const structuredOutput = getRequestedStructuredOutputFormat() !== null;
     await withNoteDatabase(args.command, async (runtime) => {
@@ -84,7 +74,7 @@ async function executeNoteUpdateOperation(args) {
                 commandName: args.commandName ?? 'dino note update',
                 action: args.actionName ?? 'update_note',
             });
-            printDryRunPreview(preview);
+            printDryRunPreview(preview, runtime);
             return;
         }
         const results = [];
@@ -199,7 +189,7 @@ async function executeNoteMetadataListOperation(args) {
                     [`${args.field}_to`]: item.after,
                     changed: item.changed,
                 })),
-            });
+            }, runtime);
             return;
         }
         await applyNoteMetadataMutation(db, plan);
@@ -299,40 +289,29 @@ export async function runNoteGet({ command, options, args }) {
     await withNoteDatabase(command, async (runtime) => {
         const { db } = runtime;
         await syncBeforeNoteCommand(runtime);
-        if (getOptions.contextOnly) {
-            const context = await getNoteContext(db, id);
-            if (!context) {
-                throw new DinoxError(`Note not found: ${id}`, {
-                    code: 'NOTE_NOT_FOUND',
-                    suggestion: "Run 'dino note search <keyword>' to locate the note id.",
-                    recoverable: true,
-                });
-            }
-            printSuccess({ stale: commandStale(runtime), note: toPublicNoteContext(context) });
-            return;
-        }
-        const note = await getNote(db, id);
-        if (!note) {
+        const context = await getNoteContext(db, id);
+        if (!context) {
             throw new DinoxError(`Note not found: ${id}`, {
                 code: 'NOTE_NOT_FOUND',
                 suggestion: "Run 'dino note search <keyword>' to locate the note id.",
                 recoverable: true,
             });
         }
-        if (structuredOutput) {
-            printSuccess({ stale: commandStale(runtime), note: toPublicNote(note) });
+        const note = toPublicNoteContext(context);
+        if (structuredOutput || getOptions.contextOnly) {
+            printSuccess({ stale: commandStale(runtime), note });
             return;
         }
         printStaleCacheWarning(runtime, 'warning: sync timed out; result may be stale');
-        printHumanReadableLine(`${note.id}`);
-        printHumanReadableLine(`title: ${note.title ?? ''}`);
+        printHumanReadableLine(String(note.id));
+        printHumanReadableLine(`title: ${String(note.title ?? '')}`);
         if (note.updated_at) {
-            printHumanReadableLine(`updated_at: ${note.updated_at}`);
+            printHumanReadableLine(`updated_at: ${String(note.updated_at)}`);
         }
-        if (note.is_starred) {
+        if (note.is_starred === true) {
             printHumanReadableLine('is_starred: 1');
         }
-        if (note.is_del) {
+        if (typeof note.is_del === 'number' && note.is_del !== 0) {
             printHumanReadableLine('is_del: 1');
         }
     });
@@ -370,7 +349,11 @@ export async function runNoteDetail({ command, options, args }) {
             throw new DinoxError(ids.length === 1 ? `Note not found: ${missing[0]}` : `Notes not found: ${missing.join(', ')}`);
         }
         const publicNotes = notes.map((note) => toPublicNoteDetail(note));
-        printSuccess(publicNotes.length === 1 ? publicNotes[0] : publicNotes);
+        printSuccess({
+            stale: commandStale(runtime),
+            count: publicNotes.length,
+            notes: publicNotes,
+        });
     });
 }
 export async function runNoteCreate({ command, options }) {
@@ -402,7 +385,7 @@ export async function runNoteCreate({ command, options }) {
                 contentMd,
                 tagsInput,
                 zettelBoxNames: boxNames,
-            }));
+            }), runtime);
             return;
         }
         const id = generateId();
@@ -447,7 +430,7 @@ export async function runNoteDelete({ command, options, args }) {
         await syncBeforeNoteCommand(runtime);
         const durability = resolveWriteDurabilityForRuntime(runtime, deleteOptions.durability);
         if (Boolean(deleteOptions.dryRun)) {
-            printDryRunPreview(await buildNoteDeleteDryRunPreview({ db, config, offline, id }));
+            printDryRunPreview(await buildNoteDeleteDryRunPreview({ db, config, offline, id }), runtime);
             return;
         }
         await softDeleteNote(db, id);

package/dist/commands/notes/bulk.d.ts

@@ -1,5 +1,7 @@
+import { parseExpectedCount } from '../writeConfirmation.js';
 import type { CommandExecutionContext } from '../descriptor/types.js';
 import type { NoteMetadataListField, NoteMetadataOperation } from './metadataMutation.js';
+export { parseExpectedCount };
 type NoteBulkOptions = {
     tags?: string;
     from?: string;
@@ -26,10 +28,8 @@ type NoteBulkMutationSelection = {
     optionName: '--tag-add' | '--tag-remove' | '--tag-replace' | '--box-add' | '--box-remove' | '--box-replace';
 };
 export declare function selectBulkMutation(options: NoteBulkOptions): NoteBulkMutationSelection;
-export declare function parseExpectedCount(value: unknown): number | null;
 export declare function assertBulkTargetFilter(input: {
     query: string;
     options: NoteBulkOptions;
 }): void;
 export declare function runNoteBulk({ command, options, args }: CommandExecutionContext): Promise<void>;
-export {};

package/dist/commands/notes/bulk.js

@@ -3,12 +3,14 @@ import { printDryRunPreview } from '../../utils/dryRun.js';
 import { getRequestedStructuredOutputFormat, printHumanReadableLine, printSuccess, } from '../../utils/output.js';
 import { DinoxError } from '../../utils/errors.js';
 import { commandStale, printStaleCacheWarning, resolveWriteDurabilityForRuntime, waitForMutationUpload, } from '../runtime.js';
+import { parseExpectedCount } from '../writeConfirmation.js';
 import { resolveZettelBoxIdsForBulk, resolveZettelBoxIdsForSearch, searchNotes, validateTagsForBulk, } from './repo.js';
 import { applyNoteMetadataMutation, planNoteMetadataMutation, } from './metadataMutation.js';
 import { parseCreatedAtRange } from './searchTime.js';
 import { normalizeDaysForMeta, } from './searchResponse.js';
 import { parseMutationListInput, parseSearchListInput, parseStarredOption, syncBeforeNoteCommand, withNoteDatabase, } from './runtime.js';
 import { buildBatchWriteReceiptFields, readNoteRevisionReceipts, } from './writeReceipt.js';
+export { parseExpectedCount };
 const BULK_PREVIEW_LIMIT = 100;
 export function selectBulkMutation(options) {
     const candidates = [
@@ -25,23 +27,6 @@ export function selectBulkMutation(options) {
     }
     return selected[0];
 }
-export function parseExpectedCount(value) {
-    if (value === undefined || value === null || value === '') {
-        return null;
-    }
-    if (typeof value !== 'string') {
-        throw new DinoxError('--expected-count must be a non-negative integer');
-    }
-    const trimmed = value.trim();
-    if (!/^\d+$/.test(trimmed)) {
-        throw new DinoxError('--expected-count must be a non-negative integer');
-    }
-    const parsed = Number(trimmed);
-    if (!Number.isSafeInteger(parsed) || parsed < 0) {
-        throw new DinoxError('--expected-count must be a non-negative integer');
-    }
-    return parsed;
-}
 function hasConcreteTargetFilter(input) {
     const { query, options } = input;
     const hasValue = (value) => typeof value === 'string' && value.trim().length > 0;
@@ -169,7 +154,7 @@ export async function runNoteBulk({ command, options, args }) {
                     [`${selected.field}_to`]: item.after,
                     changed: item.changed,
                 })),
-            });
+            }, runtime);
             return;
         }
         if (!bulkOptions.confirm) {