ygl-trees 0.66.0 → 0.68.0

package/dist/packages/core/database/src/plugin.js

@@ -17,9 +17,11 @@ class DatabaseService extends cordis_1.Service {
         // GPT-6.1 SOL fix: the DB lock was only applied in the profile-boot
         // fallback path, but the base bundle always instantiates this Service —
         // the primary path never locked. Lock here (the actual entry point for
-        // every CLI invocation), preserving the YGL_TEST=1 bypass for parallel
-        // test execution.
-        this.db = new db_1.DB(dbFile, { lock: process.env.YGL_TEST !== "1" });
+        // every CLI invocation), preserving bypasses:
+        //   YGL_TEST=1  — parallel test execution
+        //   YGL_SERVE=1 — webui serve (long-lived; WAL permits concurrent access)
+        const lock = process.env.YGL_TEST !== "1" && process.env.YGL_SERVE !== "1";
+        this.db = new db_1.DB(dbFile, { lock });
     }
 }
 exports.DatabaseService = DatabaseService;

package/dist/packages/core/database/src/types.js

@@ -14,8 +14,14 @@ function parse(argv) {
     const flags = {};
     let rest = false;
     const takesValue = (name) => !BOOLEAN_FLAGS.has(name);
-    /** `-1` looks like a flag but is a negative number — accept it as a value. */
-    const isValue = (s) => !s.startsWith("-") || /^-\d+(\.\d+)?$/.test(s);
+    /** A token is a flag boundary only if this parser could itself consume it as
+     *  a flag: `--`, a long `--name`, or a single-letter `-x`. Any other token
+     *  starting with `-` (e.g. `- 双平台…`, `-1`, `-abc`) can never be parsed as
+     *  a flag, so a value-taking flag safely claims it — `--quote "- text"`
+     *  keeps its value instead of collapsing to `true` and leaking the text
+     *  into positionals. */
+    const looksLikeFlag = (s) => s === "--" || s.startsWith("--") || /^-[A-Za-z]$/.test(s);
+    const isValue = (s) => !looksLikeFlag(s);
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i];
         if (rest) {

package/dist/packages/ops/tools/src/doctor.js

@@ -137,9 +137,16 @@ function run(env, action, rest, args) {
         });
     }
     // ── 7. Stale lock check ──
+    // The CLI process running doctor holds its own .ygllock while checking —
+    // exclude our own live lock; warn only on foreign/stale holders.
     const dbPath = db.path;
-    const lockPath = `${dbPath}.lock`;
-    const hasLock = require("node:fs").existsSync(lockPath);
+    const lockPath = `${dbPath}.ygllock`;
+    let lockHolder = "";
+    try {
+        lockHolder = require("node:fs").readFileSync(`${lockPath}/pid`, "utf8").trim();
+    }
+    catch { /* absent/unreadable */ }
+    const hasLock = require("node:fs").existsSync(lockPath) && lockHolder !== String(process.pid);
     checks.push({
         name: "stale_lock",
         status: hasLock ? "warn" : "pass",
@@ -151,8 +158,8 @@ function run(env, action, rest, args) {
     // A malformed envelope silently degrades: evalChoice/evalScore fall back to
     // empty options/levels → the gate can never resolve (always pending).
     {
-        const evalConds = db.all(`SELECT c.id, c.name, c.op, c.value, n.key AS node
-         FROM node_conditions c JOIN nodes n ON n.id=c.node_id
+        const evalConds = db.all(`SELECT c.id, c.name, c.op, c.value, n.key AS node
+         FROM node_conditions c JOIN nodes n ON n.id=c.node_id
         WHERE c.op IN ('eval','eval-choice','eval-score')`);
         const bad = [];
         for (const c of evalConds) {
@@ -240,9 +247,14 @@ function run(env, action, rest, args) {
             db.run("UPDATE meta SET value='0' WHERE key='index_dirty'");
             fixes.push("index dirty flag cleared (run: ygl-trees node index)");
         }
-        // stale lock → remove
-        const lockDir = `${env.db.path}.lock`;
-        if (fs.existsSync(lockDir)) {
+        // stale lock → remove (never our own live lock)
+        const lockDir = `${env.db.path}.ygllock`;
+        let holder = "";
+        try {
+            holder = fs.readFileSync(`${lockDir}/pid`, "utf8").trim();
+        }
+        catch { /* */ }
+        if (fs.existsSync(lockDir) && holder !== String(process.pid)) {
             try {
                 fs.rmSync(lockDir, { recursive: true, force: true });
                 fixes.push("stale lock removed");

package/dist/packages/ops/tools/src/plugins.js

@@ -152,14 +152,22 @@ function pnpm(home, args) {
     // embedded/offline carriers without touching this module. PATH may carry
     // broken .bin shims (observed: a parent node_modules shim pointing at a
     // missing pnpm.cjs under vitest) — resolve by probing, not first-hit.
+    //
+    // --ignore-workspace: pnpm walks UP from --dir to the nearest
+    // pnpm-workspace.yaml. When the profile lives inside a workspace (the unit
+    // tests' tmp/ profiles — or any repo-embedded home), the profile registered
+    // as a workspace importer and leaked tmp/plugins-unit-* blocks into the
+    // repo lockfile (committed that way through 0.66.0). Standalone profiles
+    // (the real $YGL_HOME) are outside any workspace, so this flag is a no-op
+    // there. Requires pnpm >= 9.4.
     const pm = process.env.YGL_PACKAGE_MANAGER || "pnpm";
     if (process.platform === "win32") {
         const q = (s) => `"${String(s).replace(/["&|<>^]/g, "")}"`;
         const exe = resolvePm(pm);
-        (0, node_child_process_1.execFileSync)([q(exe), ...args.map(q), "--dir", q(profileDir(home))].join(" "), { stdio: "pipe", shell: true });
+        (0, node_child_process_1.execFileSync)([q(exe), ...args.map(q), "--dir", q(profileDir(home)), "--ignore-workspace"].join(" "), { stdio: "pipe", shell: true });
         return;
     }
-    (0, node_child_process_1.execFileSync)(pm, [...args, "--dir", profileDir(home)], { stdio: "pipe" });
+    (0, node_child_process_1.execFileSync)(pm, [...args, "--dir", profileDir(home), "--ignore-workspace"], { stdio: "pipe" });
 }
 let cachedPm;
 function resolvePm(pm) {

package/dist/packages/research/pipeline/src/entities.js

@@ -338,6 +338,11 @@ let Claim = class Claim {
     contentHash;
     created;
     updated;
+    // The @ManyToOne here was missing (likely lost in an early edit): Claim.project
+    // was an undecorated property, so Project.claims' inverseSide never resolved
+    // and every ORM find loading the claims relation threw
+    // "Cannot read properties of undefined (reading 'joinColumns')" —
+    // `project show` / demo have been broken on this since the TypeORM pilot.
     project;
     claimEvidence;
 };
@@ -375,6 +380,7 @@ __decorate([
     __metadata("design:type", String)
 ], Claim.prototype, "updated", void 0);
 __decorate([
+    (0, typeorm_1.ManyToOne)(() => Project, (p) => p.claims, { createForeignKeyConstraints: false }),
     (0, typeorm_1.JoinColumn)({ name: "project_id" }),
     __metadata("design:type", Project)
 ], Claim.prototype, "project", void 0);

package/dist/packages/research/pipeline/src/writes.js

@@ -344,7 +344,7 @@ async function taskSetStatus(ds, taskId, status) {
         }
         catch { /* malformed → reset */ }
         const from = meta.status || "todo";
-        await mgr.query(`UPDATE artifacts SET meta=? WHERE id=?`, [JSON.stringify({ ...meta, status }), taskId]);
+        await mgr.query(`UPDATE artifacts SET meta=?, updated=? WHERE id=?`, [JSON.stringify({ ...meta, status }), (0, text_1.nowIso)(), taskId]);
         await logEvent(mgr, "task.status", "task", taskId, `${from} → ${status}`, status === "done" ? "info" : "info");
         return { id: taskId, title: rows[0].title, from, to: status };
     });

package/dist/packages/techtree/model/src/writes.js

@@ -134,8 +134,8 @@ async function buildIndex(mgr, treeId) {
         inDegree[n.key] = (requiredParents.get(n.id) || []).length;
     for (const n of nodes)
         await mgr.query(`UPDATE nodes SET tier=? WHERE id=? AND tier<>?`, [tierOf.get(n.id) ?? 0, n.id, tierOf.get(n.id) ?? 0]);
-    await mgr.query(`INSERT INTO node_index(tree_id,topo_order,tiers,in_degree,built_at,dirty) VALUES(?,?,?,?,?,0)
-     ON CONFLICT(tree_id) DO UPDATE SET topo_order=excluded.topo_order, tiers=excluded.tiers,
+    await mgr.query(`INSERT INTO node_index(tree_id,topo_order,tiers,in_degree,built_at,dirty) VALUES(?,?,?,?,?,0)
+     ON CONFLICT(tree_id) DO UPDATE SET topo_order=excluded.topo_order, tiers=excluded.tiers,
        in_degree=excluded.in_degree, built_at=excluded.built_at, dirty=0`, [treeId, JSON.stringify(topo), JSON.stringify(tiers), JSON.stringify(inDegree), (0, text_1.nowIso)()]);
     return { topo, tiers, inDegree };
 }
@@ -222,10 +222,10 @@ async function link(ds, treeId, parentKey, childKey, o = {}) {
         const before = (await mgr.query(`SELECT id FROM node_edges WHERE parent_id=? AND child_id=? AND rel=?`, [p[0].id, c[0].id, rel]));
         const duplicate = before.length > 0;
         const id = duplicate ? before[0].id : (0, text_1.shortId)(["edge", p[0].id, c[0].id, rel], 12);
-        await mgr.query(`INSERT INTO node_edges(id,tree_id,parent_id,child_id,rel,mode,required,min_level,weight,note,created)
-       VALUES(?,?,?,?,?,?,?,?,?,?,?)
-       ON CONFLICT(parent_id,child_id,rel) DO UPDATE SET
-         mode=excluded.mode, required=excluded.required, min_level=excluded.min_level,
+        await mgr.query(`INSERT INTO node_edges(id,tree_id,parent_id,child_id,rel,mode,required,min_level,weight,note,created)
+       VALUES(?,?,?,?,?,?,?,?,?,?,?)
+       ON CONFLICT(parent_id,child_id,rel) DO UPDATE SET
+         mode=excluded.mode, required=excluded.required, min_level=excluded.min_level,
          weight=excluded.weight, note=excluded.note`, [id, treeId, p[0].id, c[0].id, rel, mode, o.required === false ? 0 : 1, o.min_level ?? 1, o.weight ?? 1, o.note || "", (0, text_1.nowIso)()]);
         await rebuildClosure(mgr, treeId);
         await logEvent(mgr, "node.link", id, { tree: treeId, parent: parentKey, child: childKey, rel, mode, required: o.required !== false, duplicate });
@@ -256,7 +256,7 @@ async function condAdd(ds, treeId, keyOrId, o) {
         if (!db_1.COND_KINDS.includes(kind))
             throw new Error(`kind must be one of ${db_1.COND_KINDS.join("|")}`);
         const id = (0, text_1.shortId)(["cond", n[0].id, o.name], 12);
-        await mgr.query(`INSERT INTO node_conditions(id,node_id,name,kind,expr,op,value,required,effect,weight,note)
+        await mgr.query(`INSERT INTO node_conditions(id,node_id,name,kind,expr,op,value,required,effect,weight,note)
        VALUES(?,?,?,?,?,?,?,?,?,?,?)`, [id, n[0].id, o.name, kind, o.expr || o.name, o.op || ">=", o.value || "", o.required === false ? 0 : 1, o.effect || "gate", o.weight ?? 1, o.note || ""]);
         await markDirty(mgr, treeId);
         await logEvent(mgr, "node.cond", id, { tree: treeId, node: keyOrId, name: o.name, kind, op: o.op || ">=", required: o.required !== false });
@@ -269,7 +269,7 @@ async function stateSet(ds, treeId, keyOrId, status, context = "default", level
         const n = (await mgr.query(`SELECT id FROM nodes WHERE tree_id=? AND (key=? OR id=?)`, [treeId, keyOrId, keyOrId]));
         if (!n.length)
             throw new Error(`node not found: ${keyOrId}`);
-        await mgr.query(`INSERT INTO node_state(tree_id,context,node_id,status,level,progress,updated) VALUES(?,?,?,?,?,?,?)
+        await mgr.query(`INSERT INTO node_state(tree_id,context,node_id,status,level,progress,updated) VALUES(?,?,?,?,?,?,?)
        ON CONFLICT(tree_id,context,node_id) DO UPDATE SET status=excluded.status, level=excluded.level, updated=excluded.updated`, [treeId, context, n[0].id, status, level, status === "unlocked" ? 1 : 0, (0, text_1.nowIso)()]);
         // R10.1: unlock/lock are the timeline anchors for R11's time axis
         await logEvent(mgr, status === "unlocked" ? "node.unlock" : "node.lock", n[0].id, {
@@ -414,20 +414,20 @@ async function importTree(ds, spec, opts = {}) {
         for (const e of edges) {
             const pid = nodeId.get(String(e.parent));
             const cid = nodeId.get(String(e.child));
-            await mgr.query(`INSERT INTO node_edges(id,tree_id,parent_id,child_id,rel,mode,required,min_level,weight,note,created)
-         VALUES(?,?,?,?,?,?,?,?,?,?)
-         ON CONFLICT(parent_id,child_id,rel) DO UPDATE SET
-           mode=excluded.mode, required=excluded.required, min_level=excluded.min_level,
+            await mgr.query(`INSERT INTO node_edges(id,tree_id,parent_id,child_id,rel,mode,required,min_level,weight,note,created)
+         VALUES(?,?,?,?,?,?,?,?,?,?,?)
+         ON CONFLICT(parent_id,child_id,rel) DO UPDATE SET
+           mode=excluded.mode, required=excluded.required, min_level=excluded.min_level,
            weight=excluded.weight, note=excluded.note`, [
                 (0, text_1.shortId)(["edge", tid, pid, cid, String(e.rel)], 12), tid, pid, cid,
                 String(e.rel), String(e.mode || "AND"), e.required === false ? 0 : 1,
-                Number(e.min_level ?? 1), Number(e.weight ?? 1), String(e.note || ""),
+                Number(e.min_level ?? 1), Number(e.weight ?? 1), String(e.note || ""), (0, text_1.nowIso)(),
             ]);
         }
         for (const c of conds) {
             const nid = nodeId.get(String(c.node));
             await mgr.query(`DELETE FROM node_conditions WHERE node_id=? AND name=?`, [nid, String(c.name)]);
-            await mgr.query(`INSERT INTO node_conditions(id,node_id,name,kind,expr,op,value,required,effect,weight,note)
+            await mgr.query(`INSERT INTO node_conditions(id,node_id,name,kind,expr,op,value,required,effect,weight,note)
          VALUES(?,?,?,?,?,?,?,?,?,?,?)`, [
                 (0, text_1.shortId)(["cond", tid, nid, String(c.name)], 10), nid, String(c.name),
                 String(c.kind || "flag"), String(c.expr || ""), String(c.op || ">="), String(c.value ?? ""),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ygl-trees",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "description": "猿光 · 科技树 — database-centric CLI for research → production → knowledge reuse, built for AI agents.",
   "type": "commonjs",
   "main": "dist/apps/cli/index.js",