chainlesschain 0.161.8 → 0.161.10

package/src/commands/project.js

@@ -0,0 +1,258 @@
+/**
+ * v1.3+ #21 P1 — `cc project` CLI surface.
+ *
+ * 子命令:
+ *   cc project init <name>           Create a new project in desktop DB
+ *     --description <text>           Optional description
+ *     --type <type>                  web|document|data|app|presentation|
+ *                                    spreadsheet|design|code|workflow|knowledge
+ *                                    (default: document)
+ *     --user <userId>                User ID (default: "default")
+ *     --root <path>                  Optional root_path on filesystem
+ *     --json                         JSON output
+ *
+ *   cc project list [--user <id>] [--status <s>] [--limit <n>] [--json]
+ *   cc project show <id> [--json]
+ *   cc project delete <id> [--hard] [--json]
+ *
+ * 设计 (per #21 v1.2 GA 反馈 "目标在手机端做ai项目的交互要像在电脑端那样丝滑"):
+ *   CLI 直接读写 desktop chainlesschain.db, 立刻在 desktop UI 出现,
+ *   Phase 3d sync 同步到手机端 — 桌面/CLI/手机 三端零延迟一致。
+ */
+
+import chalk from "chalk";
+import {
+  openProjectsDb,
+  defaultProjectDbPath,
+  newProjectId,
+  VALID_PROJECT_TYPES,
+  VALID_PROJECT_STATUSES,
+} from "../lib/project-runtime.js";
+
+const DEFAULT_USER = "default";
+
+function _now() {
+  return Date.now();
+}
+
+function _formatProjectTable(p) {
+  return [
+    `${chalk.bold("ID")}        ${p.id}`,
+    `${chalk.bold("Name")}      ${p.name}`,
+    `${chalk.bold("Type")}      ${p.project_type}`,
+    `${chalk.bold("Status")}    ${_colorStatus(p.status)}`,
+    `${chalk.bold("User")}      ${p.user_id}`,
+    `${chalk.bold("Root")}      ${p.root_path || "(none)"}`,
+    `${chalk.bold("Files")}     ${p.file_count || 0}`,
+    `${chalk.bold("Created")}   ${new Date(p.created_at).toISOString()}`,
+    `${chalk.bold("Updated")}   ${new Date(p.updated_at).toISOString()}`,
+    p.description ? `${chalk.bold("Desc")}      ${p.description}` : null,
+  ]
+    .filter(Boolean)
+    .join("\n");
+}
+
+function _colorStatus(s) {
+  switch (s) {
+    case "draft":
+      return chalk.gray(s);
+    case "active":
+      return chalk.cyan(s);
+    case "completed":
+      return chalk.green(s);
+    case "archived":
+      return chalk.yellow(s);
+    default:
+      return s;
+  }
+}
+
+export function registerProjectCommand(program) {
+  const cmd = program
+    .command("project")
+    .description(
+      "Manage desktop projects (shared SQLite, syncs to mobile via Phase 3d)",
+    );
+
+  // ===== init =====
+  cmd
+    .command("init <name>")
+    .description("Create a new project in desktop DB")
+    .option("--description <text>", "Project description")
+    .option(
+      "--type <type>",
+      `Project type (${VALID_PROJECT_TYPES.join("|")})`,
+      "document",
+    )
+    .option("--user <userId>", "Owner user ID", DEFAULT_USER)
+    .option("--root <path>", "Root filesystem path")
+    .option("--db <path>", "DB path override", defaultProjectDbPath())
+    .option("--json", "Output JSON")
+    .action(async (name, options) => {
+      if (!VALID_PROJECT_TYPES.includes(options.type)) {
+        console.error(
+          chalk.red(
+            `Invalid type "${options.type}". Must be one of: ${VALID_PROJECT_TYPES.join(", ")}`,
+          ),
+        );
+        process.exit(2);
+      }
+      const { db, close } = await openProjectsDb(options.db);
+      try {
+        const id = newProjectId();
+        const now = _now();
+        db.prepare(
+          `INSERT INTO projects (
+            id, user_id, name, description, project_type, status,
+            root_path, created_at, updated_at, sync_status, deleted
+          ) VALUES (?, ?, ?, ?, ?, 'active', ?, ?, ?, 'pending', 0)`,
+        ).run(
+          id,
+          options.user,
+          name,
+          options.description || null,
+          options.type,
+          options.root || null,
+          now,
+          now,
+        );
+        const p = db.prepare("SELECT * FROM projects WHERE id = ?").get(id);
+        if (options.json) {
+          console.log(JSON.stringify(p, null, 2));
+        } else {
+          console.log(chalk.green("✓ Project created"));
+          console.log(_formatProjectTable(p));
+          console.log(
+            chalk.gray(
+              `\n  桌面 UI 会立刻看到此项目。Phase 3d sync 自动同步到手机端。`,
+            ),
+          );
+        }
+      } finally {
+        close();
+      }
+    });
+
+  // ===== list =====
+  cmd
+    .command("list")
+    .description("List projects")
+    .option("--user <userId>", "Filter by user ID", DEFAULT_USER)
+    .option(
+      "--status <s>",
+      `Filter by status (${VALID_PROJECT_STATUSES.join("|")})`,
+    )
+    .option("--limit <n>", "Max rows", (v) => parseInt(v, 10), 50)
+    .option("--db <path>", "DB path override", defaultProjectDbPath())
+    .option("--json", "Output JSON")
+    .action(async (options) => {
+      const { db, close } = await openProjectsDb(options.db);
+      try {
+        let sql = `SELECT id, user_id, name, description, project_type, status,
+          root_path, file_count, created_at, updated_at, sync_status
+          FROM projects WHERE user_id = ? AND deleted = 0`;
+        const params = [options.user];
+        if (options.status) {
+          if (!VALID_PROJECT_STATUSES.includes(options.status)) {
+            console.error(
+              chalk.red(
+                `Invalid status "${options.status}". Must be: ${VALID_PROJECT_STATUSES.join(", ")}`,
+              ),
+            );
+            process.exit(2);
+          }
+          sql += " AND status = ?";
+          params.push(options.status);
+        }
+        sql += " ORDER BY updated_at DESC LIMIT ?";
+        params.push(options.limit);
+        const rows = db.prepare(sql).all(...params);
+        if (options.json) {
+          console.log(JSON.stringify(rows, null, 2));
+        } else {
+          if (rows.length === 0) {
+            console.log(chalk.gray("(no projects)"));
+            return;
+          }
+          for (const p of rows) {
+            console.log(
+              `${chalk.gray(p.id.slice(0, 8))}…  ${_colorStatus(p.status.padEnd(10))} ${chalk.bold(
+                p.name.padEnd(28),
+              )} ${chalk.gray(p.project_type.padEnd(12))} ${new Date(p.updated_at).toISOString()}`,
+            );
+          }
+        }
+      } finally {
+        close();
+      }
+    });
+
+  // ===== show =====
+  cmd
+    .command("show <id>")
+    .description("Show project details")
+    .option("--db <path>", "DB path override", defaultProjectDbPath())
+    .option("--json", "Output JSON")
+    .action(async (id, options) => {
+      const { db, close } = await openProjectsDb(options.db);
+      try {
+        const p = db.prepare("SELECT * FROM projects WHERE id = ?").get(id);
+        if (!p) {
+          console.error(chalk.red(`Project not found: ${id}`));
+          process.exit(2);
+        }
+        if (options.json) {
+          console.log(JSON.stringify(p, null, 2));
+        } else {
+          console.log(_formatProjectTable(p));
+        }
+      } finally {
+        close();
+      }
+    });
+
+  // ===== delete =====
+  cmd
+    .command("delete <id>")
+    .description("Delete a project (soft by default; --hard to truly remove)")
+    .option("--hard", "Hard delete (also removes project_files cascade)", false)
+    .option("--db <path>", "DB path override", defaultProjectDbPath())
+    .option("--json", "Output JSON")
+    .action(async (id, options) => {
+      const { db, close } = await openProjectsDb(options.db);
+      try {
+        const existing = db
+          .prepare("SELECT id FROM projects WHERE id = ?")
+          .get(id);
+        if (!existing) {
+          console.error(chalk.red(`Project not found: ${id}`));
+          process.exit(2);
+        }
+        if (options.hard) {
+          db.prepare("DELETE FROM projects WHERE id = ?").run(id);
+        } else {
+          db.prepare(
+            "UPDATE projects SET deleted = 1, sync_status = 'pending', updated_at = ? WHERE id = ?",
+          ).run(_now(), id);
+        }
+        if (options.json) {
+          console.log(
+            JSON.stringify({ ok: true, id, hard: !!options.hard }, null, 2),
+          );
+        } else {
+          console.log(
+            chalk.green(
+              `✓ Project ${options.hard ? "hard-deleted" : "deleted"}: ${id}`,
+            ),
+          );
+        }
+      } finally {
+        close();
+      }
+    });
+}
+
+// 暴露给单测
+export const _projectInternals = {
+  defaultProjectDbPath,
+};

package/src/index.js

@@ -195,6 +195,9 @@ import { registerRuntimeCommand } from "./commands/runtime.js";
 import { registerIpfsCommand } from "./commands/ipfs.js";
 // MTC: Merkle Tree Certificates (Phase 1 Week 3)
 import { registerMtcCommand } from "./commands/mtc.js";
+import { registerMultisigCommand } from "./commands/multisig.js";
+// #21 P1: cc project — shared desktop SQLite, Phase 3d sync to mobile
+import { registerProjectCommand } from "./commands/project.js";
 // Phase 27: Multimodal Collaboration
 import { registerMultimodalCommand } from "./commands/multimodal.js";
 // Phase 22: Performance auto-tuning
@@ -579,6 +582,8 @@ export function createProgram(opts = {}) {
   registerRuntimeCommand(program);
   registerIpfsCommand(program);
   registerMtcCommand(program);
+  registerMultisigCommand(program);
+  registerProjectCommand(program);
   registerMultimodalCommand(program);
   registerPerfCommand(program);
   registerAgentNetworkCommand(program);

package/src/lib/audit-mtc.js

@@ -20,7 +20,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
-import { ed25519 as nobleEd25519 } from "@noble/curves/ed25519";
+import { ed25519 as nobleEd25519 } from "@noble/curves/ed25519.js";
 import mtcLib from "@chainlesschain/core-mtc";
 
 const { sha256, jcs, encodeHashStr, ed25519, assembleBatch } = mtcLib;

package/src/lib/multisig-runtime.js

@@ -0,0 +1,160 @@
+/**
+ * v1.2 m-of-n Phase 2 — shared multisig DB + manager loader.
+ *
+ * Phase 1 inlined this in commands/multisig.js. Phase 2 marketplace mediator
+ * also needs it (cc marketplace purchase / consume), so factor out here.
+ *
+ * SQLite driver cascade: better-sqlite3-multiple-ciphers → better-sqlite3 →
+ * sql.js (WASM) per feedback_sqlite_wasm_fallback memo. sql.js gets a
+ * better-sqlite3-style adapter for the subset core-multisig/store.js needs.
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+import multisig from "@chainlesschain/core-multisig";
+import { getHomeDir } from "./paths.js";
+
+const requireCjs = createRequire(import.meta.url);
+
+const {
+  applySchema,
+  createStore,
+  createProposalsManager,
+  appendGovernanceEvent,
+} = multisig;
+
+export function defaultMultisigDbPath() {
+  return path.join(getHomeDir(), "multisig.db");
+}
+
+export function defaultMultisigLogPath() {
+  return path.join(getHomeDir(), "multisig.governance.log");
+}
+
+async function _openDatabase(dbPath) {
+  for (const pkg of ["better-sqlite3-multiple-ciphers", "better-sqlite3"]) {
+    try {
+      const Database = requireCjs(pkg);
+      const db = new Database(dbPath);
+      db.pragma("journal_mode = WAL");
+      db.pragma("foreign_keys = ON");
+      return { kind: "native", db, close: () => db.close() };
+    } catch (_e) {
+      /* try next */
+    }
+  }
+  const initSqlJs = requireCjs("sql.js");
+  const SQL = await initSqlJs();
+  const buf = fs.existsSync(dbPath) ? fs.readFileSync(dbPath) : undefined;
+  const sqlDb = new SQL.Database(buf);
+  return {
+    kind: "wasm",
+    db: _adaptSqlJs(sqlDb),
+    close: () => {
+      const out = sqlDb.export();
+      fs.writeFileSync(dbPath, Buffer.from(out));
+      sqlDb.close();
+    },
+  };
+}
+
+function _adaptSqlJs(sqlDb) {
+  const norm = (params) =>
+    params.map((p) => (Buffer.isBuffer(p) ? new Uint8Array(p) : p));
+  return {
+    prepare(sql) {
+      return {
+        run(...params) {
+          const stmt = sqlDb.prepare(sql);
+          try {
+            stmt.bind(norm(params));
+            stmt.step();
+            return { changes: sqlDb.getRowsModified(), lastInsertRowid: 0 };
+          } finally {
+            stmt.free();
+          }
+        },
+        get(...params) {
+          const stmt = sqlDb.prepare(sql);
+          try {
+            stmt.bind(norm(params));
+            return stmt.step() ? stmt.getAsObject() : undefined;
+          } finally {
+            stmt.free();
+          }
+        },
+        all(...params) {
+          const stmt = sqlDb.prepare(sql);
+          try {
+            stmt.bind(norm(params));
+            const rows = [];
+            while (stmt.step()) rows.push(stmt.getAsObject());
+            return rows;
+          } finally {
+            stmt.free();
+          }
+        },
+      };
+    },
+    exec(sql) {
+      sqlDb.exec(sql);
+    },
+  };
+}
+
+/**
+ * Open a multisig manager backed by SQLite + governance log.
+ *
+ * @param {string} [dbPath]
+ * @param {string} [logPath]
+ * @returns {Promise<{ db, store, mgr, close }>}
+ */
+export async function openMultisigManager(
+  dbPath = defaultMultisigDbPath(),
+  logPath = defaultMultisigLogPath(),
+) {
+  fs.mkdirSync(path.dirname(dbPath), { recursive: true });
+  const handle = await _openDatabase(dbPath);
+  applySchema(handle.db);
+  const store = createStore(handle.db);
+  const mgr = createProposalsManager(store, {
+    logEvent: (event) => appendGovernanceEvent(logPath, event),
+  });
+  return {
+    db: handle.db,
+    store,
+    mgr,
+    close: handle.close,
+  };
+}
+
+/**
+ * Read a secret key from hex string or hex file path.
+ *
+ * @param {string} arg
+ * @returns {Buffer}
+ */
+export function readSecretKey(arg) {
+  if (!arg) {
+    throw new Error("--key required (hex string or path to hex file)");
+  }
+  if (/^[0-9a-fA-F]+$/.test(arg)) {
+    return Buffer.from(arg, "hex");
+  }
+  if (fs.existsSync(arg)) {
+    const raw = fs.readFileSync(arg, "utf-8").trim();
+    return Buffer.from(raw, "hex");
+  }
+  throw new Error(`--key: not hex and not an existing file path: ${arg}`);
+}
+
+/**
+ * Read JSON from inline string or file path.
+ */
+export function readJsonArg(arg) {
+  if (fs.existsSync(arg)) {
+    return JSON.parse(fs.readFileSync(arg, "utf-8"));
+  }
+  return JSON.parse(arg);
+}

package/src/lib/p2p-manager.js

@@ -223,6 +223,90 @@ export function pairDevice(db, deviceName, deviceType) {
   return { deviceId, deviceName, deviceType, pairingCode, status: "pending" };
 }
 
+/**
+ * v1.1 W3.5 (issue #19): Pair a device from a scanned QR payload.
+ *
+ * payload 字段对齐 desktop `device-pairing-handler.js::validatePairingCode`
+ * + Android `DesktopPairingViewModel::PairingQrPayload`：
+ *   {type:"device-pairing", code, did, deviceInfo:{deviceId,name,platform}, timestamp}
+ *
+ * 与 [pairDevice] 区别：deviceId 来自 QR（移动端的稳定 ID）不是 host 生成，
+ * 这样 desktop unpair → 重扫 QR 能复用同 deviceId 而非每次生新条。INSERT OR
+ * REPLACE upsert，重复扫同一 QR 是 idempotent。
+ *
+ * Validate 项与 desktop validatePairingCode 对齐：
+ *   - payload.type === "device-pairing"
+ *   - payload.code 匹配 /^\d{6}$/
+ *   - payload.did 非空
+ *   - payload.deviceInfo.deviceId 非空
+ *   - payload.timestamp 不超 5min（与 desktop pairingTimeout 对齐）
+ *
+ * 返回 {success: true, deviceId, deviceName, did, status:'active'}
+ *      或 {success: false, error}
+ */
+export function pairDeviceFromQr(db, payload, opts = {}) {
+  ensureP2PTables(db);
+  const { now = Date.now(), maxAgeMs = 5 * 60 * 1000 } = opts;
+
+  if (!payload || typeof payload !== "object") {
+    return { success: false, error: "payload 不是对象" };
+  }
+  if (payload.type !== "device-pairing") {
+    return { success: false, error: "无效的 QR 类型，期望 device-pairing" };
+  }
+  if (!/^\d{6}$/.test(String(payload.code || ""))) {
+    return { success: false, error: "code 必须是 6 位数字" };
+  }
+  if (!payload.did || typeof payload.did !== "string") {
+    return { success: false, error: "did 必填" };
+  }
+  const info = payload.deviceInfo || {};
+  if (!info.deviceId || typeof info.deviceId !== "string") {
+    return { success: false, error: "deviceInfo.deviceId 必填" };
+  }
+  const ts = Number(payload.timestamp);
+  if (!Number.isFinite(ts)) {
+    return { success: false, error: "timestamp 必填且为数字" };
+  }
+  const age = now - ts;
+  if (age > maxAgeMs) {
+    return {
+      success: false,
+      error: `QR 已过期（${Math.round(age / 1000)}s > ${maxAgeMs / 1000}s）`,
+    };
+  }
+
+  const deviceName = info.name || "(unnamed)";
+  const platform = (info.platform || "mobile").toLowerCase();
+  // desktop validatePairingCode 接受 platform 为 string 不限值；这里 normalize
+  // 进 p2p_paired_devices.device_type 的 desktop/mobile/tablet 三档：
+  //   - "android"/"ios" → "mobile"
+  //   - 其它已知值保留
+  //   - 缺省 "mobile"
+  const deviceType = ["mobile", "tablet", "desktop"].includes(platform)
+    ? platform
+    : ["android", "ios"].includes(platform)
+      ? "mobile"
+      : "mobile";
+
+  // INSERT OR REPLACE 让重复扫同 deviceId 是 idempotent；status="active" 因
+  // QR 流程的 6 位 code 视作 desktop 已确认，无需 pending 中间态。
+  db.prepare(
+    `INSERT OR REPLACE INTO p2p_paired_devices
+     (device_id, device_name, device_type, pairing_code, paired_at, status)
+     VALUES (?, ?, ?, ?, datetime('now'), 'active')`,
+  ).run(info.deviceId, deviceName, deviceType, payload.code);
+
+  return {
+    success: true,
+    deviceId: info.deviceId,
+    deviceName,
+    deviceType,
+    did: payload.did,
+    status: "active",
+  };
+}
+
 /**
  * Confirm device pairing with code.
  */
@@ -242,10 +326,20 @@ export function confirmPairing(db, deviceId, code) {
 }
 
 /**
- * Get all paired devices.
+ * Get all paired devices, optionally filtered by device_type.
+ *
+ * v1.1 W3.4a (issue #19)：`type` filter 让 web-panel MobileBridge.vue
+ * 只拉 mobile 子集。`type` 必须 ∈ {'desktop','mobile','tablet'} 或不传。
  */
-export function getPairedDevices(db) {
+export function getPairedDevices(db, type = null) {
   ensureP2PTables(db);
+  if (type) {
+    return db
+      .prepare(
+        "SELECT * FROM p2p_paired_devices WHERE device_type = ? ORDER BY paired_at DESC",
+      )
+      .all(type);
+  }
   return db
     .prepare("SELECT * FROM p2p_paired_devices ORDER BY paired_at DESC")
     .all();