kenaz 0.3.18 → 0.3.20

package/core/.collaboration/config/default.yaml

@@ -1,189 +0,0 @@
-# .collaboration 系統配置
-
-# ============================================================================
-# ID 生成器配置
-# ============================================================================
-id_generator:
-  # 前綴（向下相容）
-  prefix: "TASK_"
-
-  # 時間戳字元數（Base32 編碼）
-  # 6 chars = 48 bits = ~8900 年
-  time_chars: 6
-
-  # 隨機字元數（Base32 編碼）
-  # 4 chars = 20 bits = 1,048,576 組合/毫秒
-  random_chars: 4
-
-  # 編碼方式
-  encoding: "base32"  # Crockford Base32
-
-# ============================================================================
-# 鎖定機制配置
-# ============================================================================
-locking:
-  # 是否啟用鎖定
-  enabled: true
-
-  # 鎖定過期時間（小時）
-  timeout_hours: 1
-
-  # 是否自動釋放過期鎖定
-  auto_release: true
-
-  # 鎖定目錄
-  locks_dir: "dev/tasks/locks"
-
-# ============================================================================
-# 索引系統配置
-# ============================================================================
-indexing:
-  # 是否啟用索引
-  enabled: true
-
-  # Git merge 後是否自動重建索引
-  auto_rebuild: true
-
-  # 索引格式（JSONL）
-  format: "jsonl"
-
-  # 索引類型
-  types:
-    - by-status     # 按狀態索引
-    - by-user       # 按用戶索引
-    - by-priority   # 按優先級索引
-
-  # 索引目錄
-  index_dir: "dev/tasks/index"
-
-# ============================================================================
-# Git Hooks 配置
-# ============================================================================
-git_hooks:
-  # 是否啟用 Git Hooks
-  enabled: true
-
-  # Post-merge hook（合併後自動重建索引）
-  post_merge:
-    enabled: true
-    command: "node .collaboration/core/index-manager.js rebuild"
-
-  # Pre-commit hook（提交前檢查鎖定）
-  pre_commit:
-    enabled: true
-    command: "node .collaboration/hooks/pre-commit.js"
-
-# ============================================================================
-# 用戶配置
-# ============================================================================
-users:
-  # 預設顯示格式
-  default_display: "username"  # username | email | full_name
-
-  # 是否需要 Git user.name/user.email 配置
-  require_git_config: true
-
-  # 任務檔案存儲目錄
-  task_storage:
-    users_dir: "dev/tasks/db/users"    # 用戶專屬任務
-    shared_dir: "dev/tasks/db/shared"  # 共享任務
-
-# ============================================================================
-# 任務系統配置
-# ============================================================================
-tasks:
-  # 預設狀態
-  default_status: "pending"
-
-  # 預設優先級
-  default_priority: "P2"
-
-  # 狀態列表
-  statuses:
-    - pending
-    - in_progress
-    - completed
-    - blocked
-    - cancelled
-
-  # 優先級列表
-  priorities:
-    - P0  # 緊急
-    - P1  # 高
-    - P2  # 中
-    - P3  # 低
-
-# ============================================================================
-# API 配置
-# ============================================================================
-api:
-  # API 版本
-  version: "2.0.0"
-
-  # 資料來源優先級
-  data_sources:
-    - new_system      # dev/tasks/db/ (最高優先級)
-    - old_queue       # dev/pipeline/TASK_QUEUE.json
-    - completed_tasks # .memory/COMPLETED_TASKS.json
-
-  # 舊系統檔案路徑
-  old_system:
-    queue_file: "dev/pipeline/TASK_QUEUE.json"
-    completed_file: ".memory/COMPLETED_TASKS.json"
-
-  # 是否相容舊系統格式
-  legacy_compatibility: true
-
-# ============================================================================
-# Dashboard 整合配置
-# ============================================================================
-dashboard:
-  # 是否啟用 Dashboard 整合
-  enabled: true
-
-  # Dashboard 使用的 API 端點
-  api_endpoint: ".collaboration/core/task-api.js"
-
-  # 是否包含已完成任務
-  include_completed: true
-
-  # 輸出格式（相容 TASK_QUEUE.json）
-  output_format: "task_queue_compatible"
-
-# ============================================================================
-# 衝突解決配置
-# ============================================================================
-conflict_resolution:
-  # 策略: version（版本號）| timestamp（時間戳）| manual（手動）
-  strategy: "version"
-
-  # 是否自動解決衝突
-  auto_resolve: false
-
-  # 手動解決時的編輯器
-  editor: "code"  # code | vim | nano | notepad
-
-# ============================================================================
-# 效能配置
-# ============================================================================
-performance:
-  # 索引重建時的批次大小
-  rebuild_batch_size: 100
-
-  # 快取配置
-  cache:
-    enabled: false  # 未來功能
-    ttl_seconds: 300
-
-# ============================================================================
-# 日誌配置
-# ============================================================================
-logging:
-  # 日誌級別: debug | info | warn | error
-  level: "info"
-
-  # 是否輸出到檔案
-  to_file: false
-
-  # 日誌目錄
-  log_dir: ".collaboration/logs"

package/core/.collaboration/core/conflict-resolver.js

@@ -1,461 +0,0 @@
-#!/usr/bin/env node
-/**
- * conflict-resolver.js
- * 任務版本衝突解決工具
- *
- * 功能:
- * - 版本號衝突偵測 (_version 欄位)
- * - 時間戳比較 (last_modified_by.timestamp)
- * - 自動合併策略 (collaborators 欄位)
- * - 手動解決介面 (CLI 互動)
- * - Git 衝突標記解析
- *
- * 使用方式:
- *   const { ConflictResolver } = require('./conflict-resolver.js');
- *   const resolver = new ConflictResolver();
- *
- *   // 偵測版本衝突
- *   const conflict = resolver.detectConflict(taskA, taskB);
- *
- *   // 自動解決衝突
- *   const resolved = await resolver.autoResolve(taskA, taskB);
- *
- *   // 手動解決介面
- *   const result = await resolver.manualResolve(taskA, taskB);
- */
-
-const fs = require('fs').promises;
-const path = require('path');
-const readline = require('readline');
-
-// 配置
-const CONFIG = {
-  VERSION_FIELD: '_version',
-  TIMESTAMP_FIELD: 'last_modified_by.timestamp',
-  AUTO_MERGE_FIELDS: ['collaborators', 'keywords', 'dependencies.optional'],
-  GIT_CONFLICT_MARKERS: {
-    ours: '<<<<<<< HEAD',
-    separator: '=======',
-    theirs: '>>>>>>> ',
-  }
-};
-
-/**
- * 版本衝突類型
- */
-const ConflictType = {
-  NO_CONFLICT: 'no_conflict',
-  VERSION_MISMATCH: 'version_mismatch',
-  TIMESTAMP_CONFLICT: 'timestamp_conflict',
-  GIT_CONFLICT: 'git_conflict',
-  FIELD_CONFLICT: 'field_conflict',
-};
-
-/**
- * 解決策略
- */
-const ResolutionStrategy = {
-  KEEP_OURS: 'keep_ours',      // 保留我們的版本
-  KEEP_THEIRS: 'keep_theirs',  // 保留他們的版本
-  AUTO_MERGE: 'auto_merge',    // 自動合併
-  MANUAL: 'manual',            // 手動選擇
-};
-
-class ConflictResolver {
-  constructor(config = {}) {
-    this.config = { ...CONFIG, ...config };
-  }
-
-  /**
-   * 偵測兩個任務版本之間的衝突
-   * @param {Object} ours - 我們的版本
-   * @param {Object} theirs - 他們的版本
-   * @returns {Object} - 衝突資訊 { hasConflict, type, details }
-   */
-  detectConflict(ours, theirs) {
-    if (!ours || !theirs) {
-      throw new Error('detectConflict: 必須提供兩個版本');
-    }
-
-    if (ours.id !== theirs.id) {
-      throw new Error('detectConflict: 任務 ID 不匹配');
-    }
-
-    const result = {
-      hasConflict: false,
-      type: ConflictType.NO_CONFLICT,
-      details: {},
-    };
-
-    // 1. 檢查版本號（最高優先級）
-    const ourVersion = ours._version || 1;
-    const theirVersion = theirs._version || 1;
-
-    if (ourVersion !== theirVersion) {
-      result.hasConflict = true;
-      result.type = ConflictType.VERSION_MISMATCH;
-      result.details.versionMismatch = {
-        ours: ourVersion,
-        theirs: theirVersion,
-      };
-      return result; // 立即返回，優先級最高
-    }
-
-    // 2. 檢查欄位差異（第二優先級）
-    const fieldDiffs = this._compareFields(ours, theirs);
-    if (fieldDiffs.length > 0) {
-      result.hasConflict = true;
-      result.type = ConflictType.FIELD_CONFLICT;
-      result.details.fieldConflicts = fieldDiffs;
-
-      // 檢查是否為同時修改（時間戳非常接近）
-      const ourTimestamp = this._getTimestamp(ours);
-      const theirTimestamp = this._getTimestamp(theirs);
-
-      if (ourTimestamp && theirTimestamp) {
-        const ourTime = new Date(ourTimestamp).getTime();
-        const theirTime = new Date(theirTimestamp).getTime();
-
-        if (Math.abs(ourTime - theirTime) < 1000) {
-          // 1 秒內的修改視為同時修改，升級為時間戳衝突
-          result.type = ConflictType.TIMESTAMP_CONFLICT;
-          result.details.timestampConflict = {
-            ours: ourTimestamp,
-            theirs: theirTimestamp,
-            diff: Math.abs(ourTime - theirTime),
-          };
-        }
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * 自動解決衝突
-   * @param {Object} ours - 我們的版本
-   * @param {Object} theirs - 他們的版本
-   * @param {String} strategy - 解決策略
-   * @returns {Object} - 解決後的任務物件
-   */
-  autoResolve(ours, theirs, strategy = ResolutionStrategy.AUTO_MERGE) {
-    const conflict = this.detectConflict(ours, theirs);
-
-    if (!conflict.hasConflict) {
-      return ours; // 無衝突，保留原版本
-    }
-
-    switch (strategy) {
-      case ResolutionStrategy.KEEP_OURS:
-        return this._resolveKeepOurs(ours, theirs);
-
-      case ResolutionStrategy.KEEP_THEIRS:
-        return this._resolveKeepTheirs(ours, theirs);
-
-      case ResolutionStrategy.AUTO_MERGE:
-        return this._resolveAutoMerge(ours, theirs, conflict);
-
-      default:
-        throw new Error(`未知的解決策略: ${strategy}`);
-    }
-  }
-
-  /**
-   * 手動解決介面（CLI）
-   * @param {Object} ours - 我們的版本
-   * @param {Object} theirs - 他們的版本
-   * @returns {Promise<Object>} - 解決後的任務物件
-   */
-  async manualResolve(ours, theirs) {
-    const conflict = this.detectConflict(ours, theirs);
-
-    if (!conflict.hasConflict) {
-      console.log('✅ 無衝突，保留當前版本');
-      return ours;
-    }
-
-    console.log('\n⚠️  偵測到版本衝突:\n');
-    console.log(`任務 ID: ${ours.id}`);
-    console.log(`衝突類型: ${conflict.type}`);
-    console.log('\n衝突詳情:');
-    console.log(JSON.stringify(conflict.details, null, 2));
-
-    console.log('\n請選擇解決方式:');
-    console.log('1. 保留我們的版本 (Keep Ours)');
-    console.log('2. 保留他們的版本 (Keep Theirs)');
-    console.log('3. 自動合併 (Auto Merge)');
-    console.log('4. 取消');
-
-    const choice = await this._getUserChoice(['1', '2', '3', '4']);
-
-    switch (choice) {
-      case '1':
-        console.log('✅ 保留我們的版本');
-        return this._resolveKeepOurs(ours, theirs);
-
-      case '2':
-        console.log('✅ 保留他們的版本');
-        return this._resolveKeepTheirs(ours, theirs);
-
-      case '3':
-        console.log('✅ 自動合併');
-        return this._resolveAutoMerge(ours, theirs, conflict);
-
-      case '4':
-        console.log('❌ 已取消');
-        throw new Error('用戶取消解決衝突');
-
-      default:
-        throw new Error('無效的選擇');
-    }
-  }
-
-  /**
-   * 解析 Git 衝突標記
-   * @param {String} content - 包含 Git 衝突標記的文件內容
-   * @returns {Object} - { ours, theirs }
-   */
-  parseGitConflict(content) {
-    const markers = this.config.GIT_CONFLICT_MARKERS;
-    const oursStart = content.indexOf(markers.ours);
-    const separator = content.indexOf(markers.separator);
-    const theirsEnd = content.indexOf(markers.theirs);
-
-    if (oursStart === -1 || separator === -1 || theirsEnd === -1) {
-      throw new Error('未找到 Git 衝突標記');
-    }
-
-    const oursContent = content
-      .substring(oursStart + markers.ours.length, separator)
-      .trim();
-    const theirsContent = content
-      .substring(separator + markers.separator.length, theirsEnd)
-      .trim();
-
-    try {
-      return {
-        ours: JSON.parse(oursContent),
-        theirs: JSON.parse(theirsContent),
-      };
-    } catch (error) {
-      throw new Error(`解析 Git 衝突內容失敗: ${error.message}`);
-    }
-  }
-
-  // ============================================================================
-  // 私有方法
-  // ============================================================================
-
-  /**
-   * 取得時間戳
-   */
-  _getTimestamp(task) {
-    return task.last_modified_by?.timestamp || task.updated_at || null;
-  }
-
-  /**
-   * 比較欄位差異
-   */
-  _compareFields(ours, theirs) {
-    const diffs = [];
-    const allKeys = new Set([...Object.keys(ours), ...Object.keys(theirs)]);
-
-    for (const key of allKeys) {
-      if (key === '_version' || key === 'last_modified_by') {
-        continue; // 跳過已檢查的欄位
-      }
-
-      const ourValue = ours[key];
-      const theirValue = theirs[key];
-
-      if (JSON.stringify(ourValue) !== JSON.stringify(theirValue)) {
-        diffs.push({
-          field: key,
-          ours: ourValue,
-          theirs: theirValue,
-        });
-      }
-    }
-
-    return diffs;
-  }
-
-  /**
-   * 解決策略: 保留我們的版本
-   */
-  _resolveKeepOurs(ours, theirs) {
-    return {
-      ...ours,
-      _version: (ours._version || 1) + 1, // 版本遞增
-      last_modified_by: {
-        name: 'ConflictResolver',
-        agent_id: 'conflict_resolver',
-        role: 'system',
-        timestamp: new Date().toISOString(),
-        resolution: 'keep_ours',
-      },
-    };
-  }
-
-  /**
-   * 解決策略: 保留他們的版本
-   */
-  _resolveKeepTheirs(ours, theirs) {
-    return {
-      ...theirs,
-      _version: (theirs._version || 1) + 1, // 版本遞增
-      last_modified_by: {
-        name: 'ConflictResolver',
-        agent_id: 'conflict_resolver',
-        role: 'system',
-        timestamp: new Date().toISOString(),
-        resolution: 'keep_theirs',
-      },
-    };
-  }
-
-  /**
-   * 解決策略: 自動合併
-   */
-  _resolveAutoMerge(ours, theirs, conflict) {
-    const merged = { ...ours };
-
-    // 1. 版本號取最大值 + 1
-    merged._version = Math.max(ours._version || 1, theirs._version || 1) + 1;
-
-    // 2. 時間戳使用較新的
-    const ourTime = new Date(this._getTimestamp(ours)).getTime();
-    const theirTime = new Date(this._getTimestamp(theirs)).getTime();
-
-    if (theirTime > ourTime) {
-      merged.last_modified_by = theirs.last_modified_by;
-    }
-
-    // 3. 合併 collaborators（使用 Set 去重）
-    if (ours.collaborators || theirs.collaborators) {
-      const collaboratorsSet = new Set([
-        ...(ours.collaborators || []),
-        ...(theirs.collaborators || []),
-      ]);
-      merged.collaborators = Array.from(collaboratorsSet);
-    }
-
-    // 4. 合併 keywords
-    if (ours.keywords || theirs.keywords) {
-      const keywordsSet = new Set([
-        ...(ours.keywords || []),
-        ...(theirs.keywords || []),
-      ]);
-      merged.keywords = Array.from(keywordsSet);
-    }
-
-    // 5. 合併 dependencies.optional
-    if (ours.dependencies?.optional || theirs.dependencies?.optional) {
-      const optionalSet = new Set([
-        ...(ours.dependencies?.optional || []),
-        ...(theirs.dependencies?.optional || []),
-      ]);
-      merged.dependencies = merged.dependencies || {};
-      merged.dependencies.optional = Array.from(optionalSet);
-    }
-
-    // 6. 記錄合併資訊
-    merged.last_modified_by = {
-      name: 'ConflictResolver',
-      agent_id: 'conflict_resolver',
-      role: 'system',
-      timestamp: new Date().toISOString(),
-      resolution: 'auto_merge',
-      mergedFrom: {
-        ours: this._getTimestamp(ours),
-        theirs: this._getTimestamp(theirs),
-      },
-    };
-
-    return merged;
-  }
-
-  /**
-   * CLI 用戶輸入
-   */
-  async _getUserChoice(validChoices) {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-
-    return new Promise((resolve) => {
-      const ask = () => {
-        rl.question('\n請輸入選項 (1-4): ', (answer) => {
-          if (validChoices.includes(answer.trim())) {
-            rl.close();
-            resolve(answer.trim());
-          } else {
-            console.log('❌ 無效的選項，請重新輸入');
-            ask();
-          }
-        });
-      };
-      ask();
-    });
-  }
-}
-
-// ============================================================================
-// CLI 介面
-// ============================================================================
-
-/**
- * CLI 執行入口
- */
-async function main() {
-  const args = process.argv.slice(2);
-
-  if (args.length < 2) {
-    console.error('用法: node conflict-resolver.js <file1> <file2>');
-    console.error('範例: node conflict-resolver.js task_ours.json task_theirs.json');
-    process.exit(1);
-  }
-
-  const [file1, file2] = args;
-
-  try {
-    // 讀取兩個版本
-    const ours = JSON.parse(await fs.readFile(file1, 'utf8'));
-    const theirs = JSON.parse(await fs.readFile(file2, 'utf8'));
-
-    // 解決衝突
-    const resolver = new ConflictResolver();
-    const resolved = await resolver.manualResolve(ours, theirs);
-
-    // 輸出結果
-    console.log('\n✅ 衝突已解決:\n');
-    console.log(JSON.stringify(resolved, null, 2));
-
-    // 詢問是否寫入文件
-    const shouldSave = await resolver._getUserChoice(['y', 'n']);
-    if (shouldSave === 'y') {
-      const outputFile = file1.replace('.json', '_resolved.json');
-      await fs.writeFile(outputFile, JSON.stringify(resolved, null, 2), 'utf8');
-      console.log(`\n✅ 已寫入: ${outputFile}`);
-    }
-  } catch (error) {
-    console.error(`❌ 錯誤: ${error.message}`);
-    process.exit(1);
-  }
-}
-
-// 判斷是否直接執行（非 require）
-if (require.main === module) {
-  main();
-}
-
-// ============================================================================
-// 匯出
-// ============================================================================
-
-module.exports = {
-  ConflictResolver,
-  ConflictType,
-  ResolutionStrategy,
-};