@kienntpixon/dieu-phoi 0.5.2 → 0.6.0

package/lib/args.cjs

@@ -1,9 +1,10 @@
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
 const core = require('../hook.cjs');
 
-const BOOLEAN_FLAGS = new Set(['json', 'help', 'h', 'purge', 'version', 'v', 'dry-run', 'no-sync', 'approve', 'yes']);
+const BOOLEAN_FLAGS = new Set(['json', 'help', 'h', 'purge', 'version', 'v', 'dry-run', 'no-sync', 'approve', 'yes', 'force', 'follow', 'remove', 'dirty', 'no-cache', 'untagged', 'no-knowledge']);
 
 /** Minimal argv parser: positionals, --k v, --k=v, boolean flags. */
 function parseArgs(argv) {
@@ -52,4 +53,20 @@ function yesNo(v, dflt) {
   throw new Error(`Giá trị y/n không hợp lệ: ${v}`);
 }
 
-module.exports = { parseArgs, claudeDirOf, ctxOf, yesNo };
+/**
+ * Repo a command works on: `--repo <path>` (any path inside the repo or one of its worktrees), else the cwd.
+ * Throws a readable error when --repo is not an existing directory. Does not require the path to be a git repo.
+ */
+function repoOf(opts) {
+  if (opts && opts.repo !== undefined) {
+    if (typeof opts.repo !== 'string' || !opts.repo) throw new Error('--repo cần một đường dẫn');
+    const p = path.resolve(core.nativePath(opts.repo));
+    let ok = false;
+    try { ok = fs.statSync(p).isDirectory(); } catch (_) { /* missing */ }
+    if (!ok) throw new Error(`--repo: không phải thư mục: ${p}`);
+    return p;
+  }
+  return process.cwd();
+}
+
+module.exports = { parseArgs, claudeDirOf, ctxOf, yesNo, repoOf };

package/lib/commands.cjs

@@ -8,7 +8,7 @@ const core = require('../hook.cjs');
 const agg = require('./aggregate.cjs');
 const chooser = require('./choose.cjs');
 const setupLib = require('./setup.cjs');
-const { claudeDirOf, ctxOf, yesNo } = require('./args.cjs');
+const { claudeDirOf, ctxOf, yesNo, repoOf } = require('./args.cjs');
 
 const AGENT_OUTCOMES = ['pass', 'fail', 'timeout', 'aborted'];
 const USER_OUTCOMES = ['accept', 'reject'];
@@ -186,13 +186,13 @@ const TMP_STALE_MS = 3600 * 1000;
 
 /**
  * Leftovers of writeFileAtomic (tmp written, rename never happened: process killed, or rename lost a race on
- * Windows) under data/, data/orch, data/segments, data/plans. Older than 1 h → removed; newer → reported.
+ * Windows) under data/, data/orch, data/segments, data/plans, data/suggest. Older than 1 h → removed; newer → reported.
  */
 function sweepStaleTmp(ctx) {
   let removed = 0;
   const left = [];
   const now = Date.now();
-  for (const dir of [ctx.paths.data, path.join(ctx.paths.data, 'orch'), ctx.paths.segments, ctx.paths.plans]) {
+  for (const dir of [ctx.paths.data, path.join(ctx.paths.data, 'orch'), ctx.paths.segments, ctx.paths.plans, ctx.paths.suggest]) {
     let names = [];
     try { names = fs.readdirSync(dir); } catch (_) { continue; }
     for (const n of names) {
@@ -239,13 +239,17 @@ async function checkSinkLive(ctx) {
 function cmdStart(opts) {
   const ctx = ctxOf(opts);
   const reg = setupLib.registration(claudeDirOf(opts));
-  const info = core.startInfo(ctx);
+  const info = core.startInfo(ctx, repoOf(opts));
   const h = info.health;
   if (!fs.existsSync(ctx.paths.hook)) h.problems.unshift(`chưa cài hook (${ctx.paths.hook}) — chạy \`dieu-phoi setup --dept <phòng>\`, log không được ghi`);
   else if (!(reg.PostToolUse && reg.SubagentStop && reg.SessionStart)) h.problems.unshift('hook chưa đăng ký đủ trong settings.json — chạy lại `dieu-phoi setup`, log/trạng thái không được ghi');
   if (!reg.UserPromptSubmit) h.problems.push('thiếu hook UserPromptSubmit — chạy lại `dieu-phoi setup` để bỏ được lệnh này');
   if (!reg.permissions || reg.legacy_permissions) h.problems.push(`thiếu quyền ghi cho ${reg.permission_entries.dir} — chạy lại \`dieu-phoi setup\` (agent nền có thể không ghi được report)`);
   h.ok = !h.problems.length;
+  // core 0.6.0: project of --repo / cwd (file reads only; null outside a git repo)
+  let proj = null;
+  try { proj = core.resolveProject(repoOf(opts)); } catch (_) { /* no project */ }
+  info.project = proj ? { dir_name: proj.dir_name, key: proj.key, kind: proj.kind, dir: proj.dir, exists: proj.exists } : null;
   if (opts.json) return { code: 0, out: JSON.stringify(info, null, 2) };
   const out = [
     `root_task_id: ${info.id}`,
@@ -254,6 +258,7 @@ function cmdStart(opts) {
     `health: ${core.healthLine(h)}`,
     `scout_brief: ${info.scout_brief || '(không thấy — dùng references/brief-template.md mục E)'}`,
     ...core.orchLessonLines(info),
+    ...core.knowledgeLines(info),
   ];
   return { code: 0, out: out.join('\n') };
 }
@@ -415,11 +420,49 @@ function verdictRoot(opts, ctx, events) {
   const judged = new Set(events.filter((e) => e.kind === 'verdict' && agg.normalizeVerdict(e).by === 'user').map((e) => e.task_id));
   const gone = agg.discardedTaskIds(events);
   const todo = steps.filter((x) => execTasks.has(x.task_id) && !judged.has(x.task_id) && !gone.has(x.task_id));
-  if (!todo.length) throw new Error(`Không có bước nào của ${root} cần nghiệm thu (chưa giao exec, hoặc đã có verdict người dùng).`);
-  return todo.map((x) => ({
+  const list = todo.map((x) => ({
     step: String(x.id),
     ev: verdictUser(Object.assign({}, opts, { task: x.task_id, _: ['accept'], round: undefined, cause: undefined }), ctx, events),
   }));
+  // No step waiting is not an error by itself: the root's own and untagged deltas still need merging (cmdVerdict decides).
+  if (!list.length) list.emptyMsg = `Không có bước nào của ${root} cần nghiệm thu (chưa giao exec, hoặc đã có verdict người dùng).`;
+  return list;
+}
+
+/** Root task of a step: the approved plan that lists it, else the task itself (a loose task is its own run). */
+function rootOfTask(ctx, taskId) {
+  let files = [];
+  try { files = fs.readdirSync(ctx.paths.plans).filter((f) => f.endsWith('.json')); } catch (_) { return taskId; }
+  for (const f of files) {
+    const p = core.readJsonFile(path.join(ctx.paths.plans, f), null);
+    if (p && typeof p.root_task_id === 'string' && Array.isArray(p.steps) && p.steps.some((x) => x && x.task_id === taskId)) return p.root_task_id;
+  }
+  return taskId;
+}
+
+/**
+ * Gate 3 (core 0.6.0): a user accept merges the run's knowledge deltas of the accepted tasks
+ * (knowledge-delta-<task_id>[-r<n>].md; on --root also the root's own and untagged ones). Never fails the verdict:
+ * conflicts/rejections are reported with the command to retry. --no-knowledge skips it.
+ */
+function knowledgeOnAccept(opts, ctx, root, tasks, untagged) {
+  if (opts['no-knowledge']) return null;
+  const kn = require('./knowledge.cjs');
+  const runDir = path.join(core.runsDir(), root);
+  const filter = { tasks: new Set(tasks), untagged };
+  try {
+    if (!fs.statSync(runDir).isDirectory() || !kn.deltaFiles(runDir, filter).length) return null;
+  } catch (_) { return null; }
+  const taskArg = tasks.join(',');
+  const retry = `dieu-phoi knowledge merge --run ${root} --task ${taskArg}${untagged ? ' --untagged' : ''}`;
+  let r;
+  try {
+    r = kn.cmdMerge({ _: [], run: runDir, task: taskArg, untagged, repo: opts.repo });
+  } catch (e) {
+    return { code: 1, out: `knowledge: gộp lỗi (${e.message}) — chạy lại: ${retry}` };
+  }
+  const tail = r.code ? `\n→ có mục chưa gộp: get lại mục đó, chép dòng base: mới vào delta (hoặc bỏ mục), rồi ${retry}` : '';
+  return { code: r.code, out: `knowledge (tự gộp khi accept):\n${r.out}${tail}` };
 }
 
 function cmdVerdict(opts) {
@@ -428,14 +471,33 @@ function cmdVerdict(opts) {
   if (typeof opts.root === 'string' && typeof opts.task !== 'string') {
     const list = verdictRoot(opts, ctx, events);
     for (const x of list) core.appendEvent(ctx, x.ev);
-    if (opts.json) return { code: 0, out: JSON.stringify(list.map((x) => x.ev)) };
-    return { code: 0, out: `Đã ghi người dùng accept cho ${list.length} bước của ${opts.root}: ${list.map((x) => `${x.step}=${x.ev.task_id}`).join(', ')}.` };
+    const root = String(opts.root);
+    const kn = knowledgeOnAccept(opts, ctx, root, [root].concat(list.map((x) => x.ev.task_id)), true);
+    if (!list.length) {
+      // Every step was already judged (e.g. accepted one by one with --task): still merge the root + untagged deltas.
+      // Exit code follows the merge (0 merged or nothing new, 2 conflict or reject, 1 error); no delta at all keeps the old "nothing to do" error.
+      if (!kn) throw new Error(list.emptyMsg);
+      const msg = `Không còn bước nào của ${root} chờ nghiệm thu; chỉ gộp delta của root và delta không thẻ.`;
+      if (opts.json) { process.stderr.write(`${msg}\n${kn.out}\n`); return { code: kn.code, out: '[]' }; }
+      return { code: kn.code, out: `${msg}\n${kn.out}` };
+    }
+    if (opts.json) {
+      if (kn) process.stderr.write(`${kn.out}\n`);
+      return { code: 0, out: JSON.stringify(list.map((x) => x.ev)) };
+    }
+    const msg = `Đã ghi người dùng accept cho ${list.length} bước của ${opts.root}: ${list.map((x) => `${x.step}=${x.ev.task_id}`).join(', ')}.`;
+    return { code: 0, out: kn ? `${msg}\n${kn.out}` : msg };
   }
   const ev = typeof opts.task === 'string' ? verdictUser(opts, ctx, events) : verdictAgent(opts, ctx, events);
   core.appendEvent(ctx, ev);
-  if (opts.json) return { code: 0, out: JSON.stringify(ev) };
+  const kn = ev.by === 'user' && ev.outcome === 'accept' ? knowledgeOnAccept(opts, ctx, rootOfTask(ctx, ev.task_id), [ev.task_id], false) : null;
+  if (opts.json) {
+    if (kn) process.stderr.write(`${kn.out}\n`);
+    return { code: 0, out: JSON.stringify(ev) };
+  }
   if (ev.by === 'user') {
-    return { code: 0, out: `Đã ghi người dùng ${ev.outcome}${ev.cause ? ` (${ev.cause})` : ''} cho task ${ev.task_id}, vòng ${ev.round}.` };
+    const msg = `Đã ghi người dùng ${ev.outcome}${ev.cause ? ` (${ev.cause})` : ''} cho task ${ev.task_id}, vòng ${ev.round}.`;
+    return { code: 0, out: kn ? `${msg}\n${kn.out}` : msg };
   }
   return { code: 0, out: `Đã ghi ${ev.outcome} cho ${ev.agent_id}${ev.task_id ? ` (task ${ev.task_id})` : ''}.` };
 }
@@ -553,17 +615,21 @@ function ctxWarnOnce(ctx, m) {
   const file = path.join(ctx.paths.data, 'ctx-warn.json');
   const level = ctxWarnLevel(m.ctx_growth, m.soft_cap);
   try {
-    const st = core.readJsonFile(file, {}) || {};
-    const cur = st[m.session_id];
-    const comp = typeof m.compactions === 'number' ? m.compactions : null;
-    const warn = !cur || cur.compactions !== comp || level > (Number(cur.level) || 0);
-    if (warn) {
-      const now = Date.now();
-      st[m.session_id] = { level, compactions: comp, t: now };
-      for (const k of Object.keys(st)) if (!(now - Number(st[k] && st[k].t) < CTX_WARN_KEEP_MS)) delete st[k];
-      core.writeFileAtomic(file, `${JSON.stringify(st)}\n`);
-    }
-    return warn;
+    // Core 0.5.4: read-modify-write under ctx-warn.lock — two sessions warning at once no longer overwrite each
+    // other's entry (a lost entry made the warning repeat). Lock timeout => go on unlocked (state is advisory).
+    return core.withFileLock(ctx.paths.ctxWarnLock, { timeoutMs: 2000, staleMs: 15000 }, () => {
+      const st = core.readJsonFile(file, {}) || {};
+      const cur = st[m.session_id];
+      const comp = typeof m.compactions === 'number' ? m.compactions : null;
+      const warn = !cur || cur.compactions !== comp || level > (Number(cur.level) || 0);
+      if (warn) {
+        const now = Date.now();
+        st[m.session_id] = { level, compactions: comp, t: now };
+        for (const k of Object.keys(st)) if (!(now - Number(st[k] && st[k].t) < CTX_WARN_KEEP_MS)) delete st[k];
+        core.writeFileAtomic(file, `${JSON.stringify(st)}\n`);
+      }
+      return warn;
+    }).value;
   } catch (_) {
     return true;
   }
@@ -788,6 +854,13 @@ function cmdChoose(opts) {
     const tid = input.taskId;
     core.appendEvent(ctx, overrideEvent(ctx, tid, res.task_type || String(input.type).toLowerCase(), res.suggested_tier, res.tier));
   }
+  // core 0.5.3: the next dispatch of this task + role logs suggested_tier / choose_tier next to the tier it ran on
+  if (input.taskId && res.action === 'dispatch' && res.tier) {
+    core.recordSuggestion(ctx, {
+      task_id: input.taskId, role: res.role || input.role, suggested_tier: res.suggested_tier || res.tier, choose_tier: res.tier,
+      source: 'choose', keep_suggested: input.approved !== null && !res.overridden,
+    });
+  }
   if (opts.json) return { code: 0, out: JSON.stringify(res) };
   const typeWarn = res.type_warning && !String(res.reason).includes(res.type_warning) ? `\nCẢNH BÁO: ${res.type_warning}` : '';
   const warn = `${typeWarn}${res.orch_ctx_warn ? `\nCẢNH BÁO: ${orch.advice}` : ''}`;
@@ -954,6 +1027,19 @@ function planOverrideEvents(ctx, plan, events) {
   return out;
 }
 
+/** Core 0.5.3: each approved step with a task_id leaves its choose tier for the step's dispatch (data/suggest/). */
+function recordPlanSuggestions(ctx, plan) {
+  let n = 0;
+  for (const r of plan.steps) {
+    if (!r.task_id || !r.tier || r.action !== 'dispatch') continue;
+    const ok = core.recordSuggestion(ctx, {
+      task_id: r.task_id, role: r.role || 'exec', suggested_tier: r.suggested_tier || r.tier, choose_tier: r.tier, source: 'plan',
+    });
+    if (ok) n++;
+  }
+  return n;
+}
+
 function recordApprovedPlan(ctx, root, stepsFile, plan) {
   const file = path.join(ctx.paths.plans, `${root}.json`);
   const prev = core.readJsonFile(file, null);
@@ -1021,6 +1107,7 @@ function cmdPlanTable(opts) {
   const rec = opts.approve ? recordApprovedPlan(ctx, String(opts.root), path.resolve(opts.file), plan) : null;
   const ovs = rec ? planOverrideEvents(ctx, plan, base.events) : [];
   for (const ev of ovs) core.appendEvent(ctx, ev);
+  if (rec) recordPlanSuggestions(ctx, plan);
   if (opts.json) {
     const out = rec ? Object.assign({}, plan, {
       approved: { root_task_id: rec.root_task_id, approval: rec.approval, record: rec.file, overrides_logged: ovs.length },
@@ -1050,6 +1137,6 @@ function cmdPlanTable(opts) {
 }
 
 module.exports = {
-  cmdSetup, cmdUninstall, cmdDoctor, cmdStart, checkSinkLive, cmdHook, cmdSync, cmdVerdict, cmdSteer, cmdDiscard, ctxWarnOnce, ctxWarnLevel, sweepStaleTmp, planOverrideEvents, cmdStats, cmdRetro, cmdPrune: (o) => require('./prune.cjs').cmdPrune(o), cmdChoose, cmdCtx, cmdState, measureOrch,
+  skillDirOf, cmdSetup, cmdUninstall, cmdDoctor, cmdStart, checkSinkLive, cmdHook, cmdSync, cmdVerdict, cmdSteer, cmdDiscard, ctxWarnOnce, ctxWarnLevel, sweepStaleTmp, planOverrideEvents, recordPlanSuggestions, cmdStats, cmdRetro, cmdPrune: (o) => require('./prune.cjs').cmdPrune(o), cmdChoose, cmdCtx, cmdState, measureOrch,
   cmdPlanTable, cmdNewId, requireTaskId, buildPlanTable, recordApprovedPlan, planTaskIdProblems, criticalPath, resolveAgentId, AGENT_OUTCOMES, USER_OUTCOMES, VERIFY,
 };