sandtable 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandtable",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "AI 编程项目可视化指挥面板 — 双视图 dashboard，多源数据融合",
   "main": "src/cli/sandtable.js",
   "bin": {

package/server.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 const path = require('path');
 
 const ROOT = path.resolve(__dirname);
-const PORT = parseInt(process.env.PORT || process.argv[2], 10) || 3000;
+const PORT = parseInt(process.env.PORT || process.argv[2], 10) || 5199;
 
 const MIME = {
   '.html': 'text/html; charset=utf-8',

package/src/cli/sandtable.js

@@ -8,7 +8,7 @@ const { exec } = require('child_process');
 const { scan } = require('../scanner/scan');
 const { build, EVENT_TYPES, classifyEventPriority } = require('../builder/build');
 
-const VERSION = '0.3.0';
+const VERSION = '0.3.1';
 const command = process.argv[2] || 'help';
 const root = process.argv[3] || process.cwd();
 
@@ -194,33 +194,88 @@ function generateRuleContent(format, lang) {
   }
 }
 
-// ---- injectToMainDoc: 向 CLAUDE.md / AGENTS.md 追加事件日志规则 ----
-function injectToMainDoc(filePath, lang) {
+// ---- injectToMainDoc: 向 CLAUDE.md / AGENTS.md 注入事件日志规则 ----
+// 使用 <!-- sandtable:begin -->...<!-- sandtable:end --> 标记包裹，uninstall 时精确擦除
+function injectToMainDoc(filePath, lang, dryRun) {
   var isZh = lang === 'zh';
-  var marker = 'sandtable event-log';
+  var beginMark = '<!-- sandtable:begin -->';
+  var endMark = '<!-- sandtable:end -->';
   var existing = '';
   if (fs.existsSync(filePath)) {
     existing = fs.readFileSync(filePath, 'utf-8');
-    if (existing.indexOf(marker) !== -1) return false; // already injected
+    if (existing.indexOf(beginMark) !== -1) {
+      if (!dryRun) console.log('  - ' + path.basename(filePath) + ' 已有 sandtable 注入标记，跳过');
+      return false; // already injected
+    }
   }
+
   var lines = [];
+  lines.push('');
+  lines.push(beginMark);
   if (isZh) {
-    lines.push('');
     lines.push('## Sandtable 事件日志');
     lines.push('');
     lines.push('**每次完成可独立表述的代码/设计/决策动作后，立即调用 `sandtable event-log` 记录。不要等用户提醒。**');
     lines.push('');
+    lines.push('命令速查: `sandtable event-log --type code-change --title "标题" --subtype code-done --impact medium --actor @AI --tags "标签" --thread threadId`');
+    lines.push('');
     lines.push('详细规则见 `.sandtable/rules.md`。');
   } else {
-    lines.push('');
     lines.push('## Sandtable Event Logging');
     lines.push('');
     lines.push('**After every significant code/design/decision action, immediately call `sandtable event-log` to record it. Do not wait for a reminder.**');
     lines.push('');
+    lines.push('Quick ref: `sandtable event-log --type code-change --title "title" --subtype code-done --impact medium --actor @AI --tags "tags" --thread threadId`');
+    lines.push('');
     lines.push('See `.sandtable/rules.md` for details.');
   }
-  var content = existing + lines.join('\n') + '\n';
-  writeWithBackup(filePath, content);
+  lines.push(endMark);
+
+  var newContent = existing + lines.join('\n') + '\n';
+
+  if (dryRun) {
+    console.log('  [DRY-RUN] 将注入 ' + path.basename(filePath) + ':');
+    console.log('  --- diff ---');
+    console.log('  + ' + lines.slice(1, -1).join('\n  + '));
+    console.log('  --- end ---');
+    return true;
+  }
+
+  writeWithBackup(filePath, newContent);
+  return true;
+}
+
+// ---- removeFromMainDoc: uninstall 时识别标记精确擦除 ----
+function removeFromMainDoc(filePath, dryRun) {
+  var beginMark = '<!-- sandtable:begin -->';
+  var endMark = '<!-- sandtable:end -->';
+
+  if (!fs.existsSync(filePath)) return false;
+
+  var content = fs.readFileSync(filePath, 'utf-8');
+  var beginIdx = content.indexOf(beginMark);
+  var endIdx = content.indexOf(endMark);
+
+  if (beginIdx === -1 || endIdx === -1) return false;
+
+  // Find the newline before beginMark (to clean up the blank line)
+  var beforeBegin = content.lastIndexOf('\n', beginIdx);
+  if (beforeBegin === -1) beforeBegin = 0;
+
+  var afterEnd = endIdx + endMark.length;
+  // Consume trailing newline if present
+  if (content[afterEnd] === '\n') afterEnd++;
+
+  if (dryRun) {
+    console.log('  [DRY-RUN] 将从 ' + path.basename(filePath) + ' 移除注入块:');
+    console.log('  --- to remove ---');
+    console.log(content.substring(beforeBegin, afterEnd).replace(/^/gm, '  - '));
+    console.log('  --- end ---');
+    return true;
+  }
+
+  var cleaned = content.substring(0, beforeBegin) + content.substring(afterEnd);
+  writeWithBackup(filePath, cleaned);
   return true;
 }
 
@@ -238,8 +293,8 @@ function writeClaudeCodeHook(projectRoot, lang) {
     script += '【Sandtable 事件日志铁律】\n';
     script += '本次 session 中，每完成一个独立动作（代码修改/设计定稿/决策拍板/错误修复），\n';
     script += '必须立即调用 sandtable event-log 记录。禁止事后补录，禁止等用户提醒。\n';
-    script += '命令速查: sandtable event-log <typeId> "标题" <subtype> <impact> @AI "标签"\n';
-    script += 'typeId: 1=对齐拍板 2=规格演进 3=代码变更 4=测试质量 5=审批交接 6=运维基建 7=教训沉淀\n';
+    script += '命令速查: sandtable event-log --type code-change --title "标题" --subtype code-done --impact medium --actor @AI --tags "标签"\n';
+    script += 'type: alignment | spec | code-change | test | approval | ops | lesson\n';
     script += '详细规则见 .sandtable/rules.md\n';
     script += '</system-reminder>\n';
     script += 'SANDBTABLE_EOR\n';
@@ -250,7 +305,8 @@ function writeClaudeCodeHook(projectRoot, lang) {
     script += '[Sandtable Event Log Rule]\n';
     script += 'After every significant action (code change, design decision, bug fix) in this session,\n';
     script += 'immediately call sandtable event-log to record it. No backfilling, no waiting for reminders.\n';
-    script += 'Quick ref: sandtable event-log <typeId> "title" <subtype> <impact> @AI "tags"\n';
+    script += 'Quick ref: sandtable event-log --type code-change --title "title" --subtype code-done --impact medium --actor @AI --tags "tags"\n';
+    script += 'type: alignment | spec | code-change | test | approval | ops | lesson\n';
     script += 'See .sandtable/rules.md for details.\n';
     script += '</system-reminder>\n';
     script += 'SANDBTABLE_EOR\n';
@@ -285,7 +341,7 @@ function writeClaudeCodeHook(projectRoot, lang) {
 }
 
 // ---- initCommand: dry-run 报告 or --apply 写入 ----
-function initCommand(projectRoot, applyMode, lang, hooksMode) {
+function initCommand(projectRoot, applyMode, lang, hooksMode, injectAgentsMd) {
   var envs = detectEnvironment(projectRoot);
   var sandtableDir = path.join(projectRoot, '.sandtable');
   var configPath = path.join(sandtableDir, 'config.json');
@@ -325,7 +381,11 @@ function initCommand(projectRoot, applyMode, lang, hooksMode) {
   }
   if (autoHints.length > 0) {
     console.log('');
-    console.log('⚡ --apply 将自动注入:');
+    if (injectAgentsMd) {
+      console.log('⚡ --inject-agents-md 启用 → 将注入主文档:');
+    } else {
+      console.log('💡 可选: --inject-agents-md 自动注入事件日志规则到主文档');
+    }
     for (var i = 0; i < autoHints.length; i++) {
       console.log('  ' + (i + 1) + '. ' + autoHints[i]);
     }
@@ -352,9 +412,11 @@ function initCommand(projectRoot, applyMode, lang, hooksMode) {
   if (!applyMode) {
     console.log('');
     console.log('以上为 dry-run 报告。要实际写入文件，请运行:');
-    console.log('  sandtable init --apply' + (lang ? ' --lang ' + lang : '') + (hasClaudeEnv ? ' [--hooks]' : ''));
+    console.log('  sandtable init --apply' + (lang ? ' --lang ' + lang : '') + (hasClaudeEnv ? ' [--hooks]' : '') + ' [--inject-agents-md]');
     console.log('');
     console.log('已存在文件将在写入前备份为 .bak.<timestamp>');
+    console.log('');
+    console.log('💡 --inject-agents-md: 注入事件日志规则到 CLAUDE.md/AGENTS.md（使用 <!-- sandtable:begin/end --> 标记包裹，uninstall 可精确擦除）');
     return;
   }
 
@@ -370,7 +432,7 @@ function initCommand(projectRoot, applyMode, lang, hooksMode) {
 
   // 2. Write .sandtable/config.json
   var config = {
-    version: '0.3.0',
+    version: '0.3.1',
     createdAt: new Date().toISOString(),
     projectRoot: projectRoot,
     paths: {
@@ -414,25 +476,30 @@ function initCommand(projectRoot, applyMode, lang, hooksMode) {
     writeWithBackup(fullPath, content);
   }
 
-  // 6. Inject event-log rule into main doc (CLAUDE.md / AGENTS.md)
+  // 6. Inject event-log rule into main doc (only with --inject-agents-md)
   var mainDocInjected = false;
-  for (var i = 0; i < envs.length; i++) {
-    var env = envs[i];
-    var mainDocPath = null;
-    if (env.type === 'agents') {
-      mainDocPath = path.join(projectRoot, 'AGENTS.md');
-    } else if (env.type === 'claude-md') {
-      mainDocPath = path.join(projectRoot, 'CLAUDE.md');
-    } else if (env.type === 'generic') {
-      mainDocPath = path.join(projectRoot, 'AGENTS.md');
-    }
-    if (mainDocPath) {
-      var injected = injectToMainDoc(mainDocPath, lang);
-      if (injected) {
-        console.log('  ✓ 注入事件日志规则 → ' + path.basename(mainDocPath));
-        mainDocInjected = true;
-      } else if (fs.existsSync(mainDocPath)) {
-        console.log('  - ' + path.basename(mainDocPath) + ' 已有 sandtable 规则，跳过');
+  if (injectAgentsMd) {
+    console.log('');
+    console.log('注入主文档 (--inject-agents-md):');
+    for (var i = 0; i < envs.length; i++) {
+      var env = envs[i];
+      var mainDocPath = null;
+      if (env.type === 'agents') {
+        mainDocPath = path.join(projectRoot, 'AGENTS.md');
+      } else if (env.type === 'claude-md') {
+        mainDocPath = path.join(projectRoot, 'CLAUDE.md');
+      } else if (env.type === 'generic') {
+        mainDocPath = path.join(projectRoot, 'AGENTS.md');
+      }
+      if (mainDocPath) {
+        var usedDryRun = !applyMode; // In dry-run, show diff instead of writing
+        var injected = injectToMainDoc(mainDocPath, lang, usedDryRun);
+        if (injected) {
+          if (applyMode) console.log('  ✓ 注入事件日志规则 → ' + path.basename(mainDocPath));
+          mainDocInjected = true;
+        } else if (fs.existsSync(mainDocPath)) {
+          console.log('  - ' + path.basename(mainDocPath) + ' 已有 sandtable 规则，跳过');
+        }
       }
     }
   }
@@ -632,12 +699,13 @@ switch (command) {
   case 'init': {
     var applyMode = process.argv.indexOf('--apply') !== -1;
     var hooksMode = process.argv.indexOf('--hooks') !== -1;
+    var injectAgentsMd = process.argv.indexOf('--inject-agents-md') !== -1;
     var langIdx = process.argv.indexOf('--lang');
     var lang = 'zh';
     if (langIdx !== -1 && process.argv[langIdx + 1]) {
       lang = process.argv[langIdx + 1] === 'en' ? 'en' : 'zh';
     }
-    initCommand(process.cwd(), applyMode, lang, hooksMode);
+    initCommand(process.cwd(), applyMode, lang, hooksMode, injectAgentsMd);
     break;
   }
   case 'summarize': {
@@ -661,109 +729,192 @@ switch (command) {
     console.log('sandtable v' + VERSION);
     break;
   case 'serve': {
-    var port = parseInt(process.argv[3], 10) || 3000;
+    var port = parseInt(process.argv[3], 10) || 5199;
     var watchMode = process.argv.indexOf('--watch') !== -1;
     startServer(process.cwd(), port, true, watchMode);
     break;
   }
-  case 'event-log': {
-    // Record event: sandtable event-log <typeId> <title> [subtype] [impact] [actor] [tags] [refDoc] [threadId] [--tokens <in>,<out>] [--continue <threadId>]
-
-    // Extract named flags first, then build clean positional args
-    var rawArgs = process.argv.slice(3); // everything after "event-log"
-    var contThreadId = null;
-    var tokensVal = null;
-    var cleanArgs = [];
-    for (var ai = 0; ai < rawArgs.length; ai++) {
-      if (rawArgs[ai] === '--continue' && ai + 1 < rawArgs.length) {
-        contThreadId = rawArgs[ai + 1]; ai++; // skip value
-      } else if (rawArgs[ai] === '--tokens' && ai + 1 < rawArgs.length) {
-        tokensVal = rawArgs[ai + 1]; ai++; // skip value
-      } else {
-        cleanArgs.push(rawArgs[ai]);
-      }
-    }
-
-    var typeId = cleanArgs[0] || '3';
-    var title = cleanArgs[1] || '';
-    var subtype = cleanArgs[2] || 'manual';
-    var impact = cleanArgs[3] || 'medium';
-    var actor = cleanArgs[4] || 'AI';
-    var tagsRaw = cleanArgs[5] || '';
-    var refDoc = cleanArgs[6] || '';
-    var threadId = contThreadId || cleanArgs[7] || '';
-
-    if (!title) {
-      console.log('用法: sandtable event-log <typeId> <title> [subtype] [impact] [actor] [tags] [refDoc] [threadId] [--tokens <in>,<out>] [--continue <threadId>]');
-      console.log('  typeId: 1=对齐与拍板 2=规格演进 3=代码变更 4=测试与质量 5=审批与交接 6=运维与基建 7=教训沉淀');
-      process.exit(1);
-    }
-
-    if (!EVENT_TYPES[typeId]) {
-      console.log('错误：typeId 必须为 1-7');
-      console.log('  1=对齐与拍板 2=规格演进 3=代码变更 4=测试与质量 5=审批与交接 6=运维与基建 7=教训沉淀');
-      process.exit(1);
-    }
+      case 'event-log': {
+      // Named flags (v0.3.1+, recommended):
+      //   sandtable event-log --type <slug> --title <text> [--subtype <text>] [--impact <level>]
+      //                       [--actor <@AI|@user>] [--tags <tags>] [--ref <path>] [--thread <id>]
+      //                       [--tokens-in <n> --tokens-out <n>] [--project <path>]
+      //
+      // Legacy positional (deprecated):
+      //   sandtable event-log <typeId> <title> [subtype] [impact] [actor] [tags] [refDoc] [threadId]
+      //                       [--tokens <in>,<out>] [--continue <threadId>]
+
+      // Type slug → typeId mapping
+      var TYPE_SLUGS = {
+        'alignment': '1', 'spec': '2', 'code-change': '3',
+        'test': '4', 'approval': '5', 'ops': '6', 'lesson': '7',
+      };
+      var TYPE_SLUG_NAMES = {
+        '1': 'alignment', '2': 'spec', '3': 'code-change',
+        '4': 'test', '5': 'approval', '6': 'ops', '7': 'lesson',
+      };
+
+      var rawArgs = process.argv.slice(3);
+
+      // Detect mode: if first arg starts with --, use named mode
+      var isNamedMode = rawArgs.length > 0 && rawArgs[0].indexOf('--') === 0;
+
+      var typeId, title, subtype, impact, actor, tagsRaw, refDoc, threadId, projectRoot;
+      var tokensIn = 0, tokensOut = 0;
+
+      if (isNamedMode) {
+        // ---- Named flag mode ----
+        var flagMap = {};
+        for (var ai = 0; ai < rawArgs.length; ai++) {
+          var arg = rawArgs[ai];
+          if (arg.indexOf('--') === 0) {
+            var key = arg.replace(/^--/, '');
+            var val = (ai + 1 < rawArgs.length && rawArgs[ai + 1].indexOf('--') !== 0) ? rawArgs[ai + 1] : 'true';
+            flagMap[key] = val;
+            if (val !== 'true') ai++;
+          }
+        }
 
-    // Resolve project root
-    var projectRoot = cleanArgs[8] || process.cwd();
+        var typeSlug = flagMap['type'] || '';
+        typeId = TYPE_SLUGS[typeSlug] || '';
+        if (!typeId) {
+          console.log('错误：--type 必须是以下之一:');
+          console.log('  alignment | spec | code-change | test | approval | ops | lesson');
+          process.exit(1);
+        }
 
-    var sandtableDir = path.join(projectRoot, '.sandtable');
-    if (!fs.existsSync(sandtableDir)) fs.mkdirSync(sandtableDir, { recursive: true });
+        title = flagMap['title'] || '';
+        subtype = flagMap['subtype'] || 'manual';
+        impact = flagMap['impact'] || 'medium';
+        actor = flagMap['actor'] || 'AI';
+        tagsRaw = flagMap['tags'] || '';
+        refDoc = flagMap['ref'] || '';
+        threadId = flagMap['thread'] || '';
+        tokensIn = parseInt(flagMap['tokens-in'], 10) || 0;
+        tokensOut = parseInt(flagMap['tokens-out'], 10) || 0;
+        projectRoot = flagMap['project'] || process.cwd();
 
-    var tags = tagsRaw ? tagsRaw.split(',').map(function(t) { return t.trim(); }) : [];
-    var ref = refDoc ? { doc: refDoc } : {};
+      } else {
+        // ---- Legacy positional mode (deprecated) ----
+        var contThreadId = null;
+        var tokensVal = null;
+        var cleanArgs = [];
+        for (var ai = 0; ai < rawArgs.length; ai++) {
+          if (rawArgs[ai] === '--continue' && ai + 1 < rawArgs.length) {
+            contThreadId = rawArgs[ai + 1]; ai++;
+          } else if (rawArgs[ai] === '--tokens' && ai + 1 < rawArgs.length) {
+            tokensVal = rawArgs[ai + 1]; ai++;
+          } else {
+            cleanArgs.push(rawArgs[ai]);
+          }
+        }
 
-    var eventId = 'evt-' + Date.now().toString(36) + '-' + Math.random().toString(36).substring(2, 8);
+        typeId = cleanArgs[0] || '3';
+        title = cleanArgs[1] || '';
+        subtype = cleanArgs[2] || 'manual';
+        impact = cleanArgs[3] || 'medium';
+        actor = cleanArgs[4] || 'AI';
+        tagsRaw = cleanArgs[5] || '';
+        refDoc = cleanArgs[6] || '';
+        threadId = contThreadId || cleanArgs[7] || '';
+        projectRoot = cleanArgs[8] || process.cwd();
+
+        if (tokensVal) {
+          var tokensParts = tokensVal.split(',');
+          tokensIn = parseInt(tokensParts[0], 10) || 0;
+          tokensOut = parseInt(tokensParts[1], 10) || 0;
+        }
+      }
 
-    var event = {
-      id: eventId,
-      timestamp: new Date().toISOString(),
-      type: EVENT_TYPES[typeId] || '代码变更',
-      typeId: typeId,
-      subtype: subtype,
-      title: title,
-      ref: ref,
-      impact: impact,
-      actor: actor,
-      tags: tags,
-      threadId: threadId || null,
-    };
-    event.priority = classifyEventPriority(event);
+      if (!title) {
+        if (isNamedMode) {
+          console.log('用法: sandtable event-log --type <slug> --title <text> [options]');
+          console.log('');
+          console.log('必选:');
+          console.log('  --type    事件类型: alignment | spec | code-change | test | approval | ops | lesson');
+          console.log('  --title   一句话标题');
+          console.log('');
+          console.log('可选:');
+          console.log('  --subtype    子类型 (如 code-done, review-pass, alignment)');
+          console.log('  --impact     影响级别: high | medium | low (默认 medium)');
+          console.log('  --actor      执行角色: @AI | @user (默认 @AI)');
+          console.log('  --tags       逗号分隔标签');
+          console.log('  --ref        关联文档路径');
+          console.log('  --thread     线程ID (关联同一线程事件)');
+          console.log('  --tokens-in  输入 token 数');
+          console.log('  --tokens-out 输出 token 数');
+          console.log('  --project    项目根目录 (默认当前目录)');
+          console.log('');
+          console.log('示例:');
+          console.log('  sandtable event-log --type code-change --title "完成登录接口" --subtype code-done --impact medium --actor @AI --tags "登录,API" --thread login-dev');
+          console.log('  sandtable event-log --type alignment --title "确定JWT方案" --impact high --actor @user');
+        } else {
+          console.log('用法: sandtable event-log <typeId> <title> [subtype] [impact] [actor] [tags] [refDoc] [threadId]');
+          console.log('  typeId: 1=对齐与拍板 2=规格演进 3=代码变更 4=测试与质量 5=审批与交接 6=运维与基建 7=教训沉淀');
+          console.log('  (位置参数已弃用，推荐使用 --type --title 命名参数)');
+        }
+        process.exit(1);
+      }
 
-    // Write event-log.jsonl
-    var logPath = path.join(sandtableDir, 'event-log.jsonl');
-    fs.appendFileSync(logPath, JSON.stringify(event) + '\n');
+      if (!EVENT_TYPES[typeId]) {
+        console.log('错误：--type 无效。有效值: alignment | spec | code-change | test | approval | ops | lesson');
+        process.exit(1);
+      }
 
-    // Write audit log
-    var auditPath = path.join(sandtableDir, 'audit.log');
-    var auditEntry = JSON.stringify({
-      timestamp: event.timestamp,
-      command: 'event-log',
-      eventId: eventId,
-      type: event.type,
-      title: title,
-      cwd: projectRoot,
-    });
-    fs.appendFileSync(auditPath, auditEntry + '\n');
+      var sandtableDir = path.join(projectRoot, '.sandtable');
+      if (!fs.existsSync(sandtableDir)) fs.mkdirSync(sandtableDir, { recursive: true });
+
+      var tags = tagsRaw ? tagsRaw.split(',').map(function(t) { return t.trim(); }) : [];
+      var ref = refDoc ? { doc: refDoc } : {};
+
+      var eventId = 'evt-' + Date.now().toString(36) + '-' + Math.random().toString(36).substring(2, 8);
+
+      var event = {
+        id: eventId,
+        timestamp: new Date().toISOString(),
+        type: EVENT_TYPES[typeId] || '代码变更',
+        typeId: typeId,
+        subtype: subtype,
+        title: title,
+        ref: ref,
+        impact: impact,
+        actor: actor,
+        tags: tags,
+        threadId: threadId || null,
+      };
+      event.priority = classifyEventPriority(event);
+
+      // Write event-log.jsonl
+      var logPath = path.join(sandtableDir, 'event-log.jsonl');
+      fs.appendFileSync(logPath, JSON.stringify(event) + '\n');
+
+      // Write audit log
+      var auditPath = path.join(sandtableDir, 'audit.log');
+      var auditEntry = JSON.stringify({
+        timestamp: event.timestamp,
+        command: 'event-log',
+        eventId: eventId,
+        type: event.type,
+        title: title,
+        cwd: projectRoot,
+      });
+      fs.appendFileSync(auditPath, auditEntry + '\n');
 
-    console.log('event-log: [' + event.priority + '] ' + event.type + ' — ' + title + (threadId ? ' (thread: ' + threadId + ')' : ''));
+      var slugName = TYPE_SLUG_NAMES[typeId] || '';
+      console.log('event-log: [' + event.priority + '] ' + event.type + ' — ' + title + (threadId ? ' (thread: ' + threadId + ')' : ''));
+      console.log('  (提示: 位置参数已弃用，下次推荐: --type ' + slugName + ' --title "...")');
 
-    // --tokens <in>,<out> : auto-log token usage for this event
-    if (tokensVal) {
-      var tokensParts = tokensVal.split(',');
-      var tIn = parseInt(tokensParts[0], 10) || 0;
-      var tOut = parseInt(tokensParts[1], 10) || 0;
-      if (tIn > 0 || tOut > 0) {
-        var COST_PER_1K = { input: 0.003, output: 0.006 }; // DeepSeek V4 Pro ¥/1K
-        var tCost = (tIn / 1000) * COST_PER_1K.input + (tOut / 1000) * COST_PER_1K.output;
+      // --tokens-in + --tokens-out: auto-log token usage
+      if (tokensIn > 0 || tokensOut > 0) {
+        var COST_PER_1K = { input: 0.003, output: 0.006 };
+        var tCost = (tokensIn / 1000) * COST_PER_1K.input + (tokensOut / 1000) * COST_PER_1K.output;
         tCost = Math.round(tCost * 10000) / 10000;
         var tokenEntry = {
           timestamp: event.timestamp,
           skill: 'event-log',
-          tokensIn: tIn,
-          tokensOut: tOut,
-          totalTokens: tIn + tOut,
+          tokensIn: tokensIn,
+          tokensOut: tokensOut,
+          totalTokens: tokensIn + tokensOut,
           cost: tCost,
           source: 'event-log',
           eventId: eventId,
@@ -771,12 +922,11 @@ switch (command) {
         };
         var tokenLogPath = path.join(sandtableDir, 'token-log.jsonl');
         fs.appendFileSync(tokenLogPath, JSON.stringify(tokenEntry) + '\n');
-        console.log('  token-log: ' + (tIn + tOut).toLocaleString() + ' tokens (est. ¥' + tCost + ')');
+        console.log('  token-log: ' + (tokensIn + tokensOut).toLocaleString() + ' tokens (est. ¥' + tCost + ')');
       }
+      break;
     }
-    break;
-  }
-  case 'token-log': {
+case 'token-log': {
     var skill = process.argv[3] || '';
     var tokensIn = parseInt(process.argv[4], 10) || 0;
     var tokensOut = parseInt(process.argv[5], 10) || 0;
@@ -889,17 +1039,47 @@ switch (command) {
       console.log('  ' + (existing[i].isDir ? '[DIR] ' : '[   ] ') + existing[i].rel);
     }
 
+    // Check for sandtable injection markers in main docs
+    var mainDocs = ['AGENTS.md', 'CLAUDE.md'];
+    var hasInjections = false;
+    for (var i = 0; i < mainDocs.length; i++) {
+      var docPath = path.join(projectRoot, mainDocs[i]);
+      if (fs.existsSync(docPath)) {
+        var docContent = fs.readFileSync(docPath, 'utf-8');
+        if (docContent.indexOf('<!-- sandtable:begin -->') !== -1) {
+          hasInjections = true;
+          if (dryRun) {
+            console.log('');
+            removeFromMainDoc(docPath, true); // dry-run: show diff
+          }
+        }
+      }
+    }
+    if (!hasInjections) {
+      console.log('');
+      console.log('主文档中未找到 sandtable 注入标记。');
+    }
+
     if (dryRun) {
       console.log('');
       console.log('以上为 dry-run 预览。要实际删除，请运行:');
       console.log('  sandtable uninstall --apply');
       console.log('');
       console.log('注意：');
-      console.log('  - sandtable 不会删除用户主文档（AGENTS.md、CLAUDE.md 等）');
-      console.log('  - 如果你在 AGENTS.md/CLAUDE.md 中手动添加了 @.sandtable/rules.md 入口行，请自行删除');
+      console.log('  - sandtable 注入标记 (<!-- sandtable:begin/end -->) 可被 uninstall --apply 精确擦除');
+      console.log('  - 如果你在 AGENTS.md/CLAUDE.md 中手动添加了其他 sandtable 内容，请自行删除');
       break;
     }
 
+    // --apply: first clean up injected content from main docs
+    for (var i = 0; i < mainDocs.length; i++) {
+      var docPath = path.join(projectRoot, mainDocs[i]);
+      if (fs.existsSync(docPath)) {
+        var removed = removeFromMainDoc(docPath, false);
+        if (removed) console.log('  ✓ 从 ' + mainDocs[i] + ' 移除 sandtable 注入块');
+      }
+    }
+
     // --apply: delete files
     console.log('');
     console.log('正在删除...');