@kienntpixon/dieu-phoi 0.2.2 → 0.4.0

package/lib/commands.cjs

@@ -10,7 +10,7 @@ const chooser = require('./choose.cjs');
 const setupLib = require('./setup.cjs');
 const { claudeDirOf, ctxOf, yesNo } = require('./args.cjs');
 
-const AGENT_OUTCOMES = ['pass', 'fail', 'timeout'];
+const AGENT_OUTCOMES = ['pass', 'fail', 'timeout', 'aborted'];
 const USER_OUTCOMES = ['accept', 'reject'];
 const CAUSES = ['quality', 'scope'];
 const STEER_KINDS = ['minor', 'plan', 'redirect'];
@@ -63,7 +63,7 @@ function cmdSetup(opts) {
   const lines = [
     `Đã cài hook: ${res.hook}`,
     res.settings_changed
-      ? `Đã đăng ký PostToolUse(Agent) + SubagentStop + SessionStart(compact) trong ${res.settings}${res.backup ? ` (sao lưu: ${path.basename(res.backup)})` : ''}`
+      ? `Đã đăng ký PostToolUse(Agent) + SubagentStop + SessionStart(compact) + UserPromptSubmit trong ${res.settings}${res.backup ? ` (sao lưu: ${path.basename(res.backup)})` : ''}`
       : `settings.json đã có hook, không đổi gì (${res.settings})`,
     `Thư mục báo cáo subagent: ${res.runs_dir} (quyền: ${res.permissions.allow.join(', ')} + additionalDirectories)`,
     `Phòng ban: ${res.config.dept || '(chưa đặt, dùng --dept)'}`,
@@ -98,6 +98,9 @@ async function cmdDoctor(opts) {
   const reg = setupLib.registration(claudeDir);
   add(reg.PostToolUse && reg.SubagentStop && reg.SessionStart, 'settings',
     `PostToolUse(Agent)=${reg.PostToolUse ? 'có' : 'thiếu'}, SubagentStop=${reg.SubagentStop ? 'có' : 'thiếu'}, SessionStart(compact)=${reg.SessionStart ? 'có' : 'thiếu'} (${reg.file})`);
+  add(reg.UserPromptSubmit, 'prompt-hook', reg.UserPromptSubmit
+    ? 'UserPromptSubmit có — prompt "điều phối" được tạo sẵn task_id + run dir, lượt đầu là scout'
+    : 'thiếu hook UserPromptSubmit — mỗi lần điều phối phải chạy `dieu-phoi start` trước scout; chạy lại `dieu-phoi setup`', 'CẢNH BÁO');
   const permOk = reg.permissions && reg.runs_dir_exists && !reg.legacy_permissions;
   add(permOk, 'run-permissions', permOk
     ? `${reg.permission_entries.allow.join(', ')} + additionalDirectories ${reg.permission_entries.dir}`
@@ -142,22 +145,26 @@ async function cmdDoctor(opts) {
   add(!badIds.length, 'task-ids', badIds.length
     ? `${badIds.length} dispatch trong ${INVALID_ID_WINDOW_DAYS} ngày gần đây có task_id sai định dạng (${Array.from(new Set(badIds.map((e) => e.task_id))).slice(0, 3).map((x) => `"${x}"`).join(', ')}) — task_id phải đúng 8 ký tự a-z0-9, lấy bằng \`dieu-phoi new-id\``
     : `mọi dispatch trong ${INVALID_ID_WINDOW_DAYS} ngày gần đây có task_id đúng định dạng`, 'CẢNH BÁO');
+  const tmp = sweepStaleTmp(ctx);
+  add(!tmp.left.length, 'tmp-files', tmp.left.length
+    ? `${tmp.left.length} file tạm còn mới (đang ghi?): ${tmp.left.slice(0, 3).join(', ')}`
+    : `không còn file *.tmp-* bỏ dở${tmp.removed ? ` (đã xoá ${tmp.removed} file cũ hơn 1 giờ)` : ''}`, 'CẢNH BÁO');
+  let badPlans = [];
+  try { badPlans = fs.readdirSync(ctx.paths.plans).filter((n) => n.endsWith('.json') && !core.isValidTaskId(n.slice(0, -5))); } catch (_) { /* none */ }
+  add(!badPlans.length, 'plans', badPlans.length
+    ? `${badPlans.length} kế hoạch có root id sai định dạng (${badPlans.slice(0, 3).join(', ')}) — \`state\` vẫn đọc; loại task bằng \`dieu-phoi discard --task <id>\` hoặc xoá file trong ${ctx.paths.plans}`
+    : 'mọi kế hoạch đã duyệt có root id đúng định dạng', 'CẢNH BÁO');
   const orch = measureOrch(opts, ctx, profileOrNull(opts, ctx));
   if (orch.ctx_tokens !== null) {
     add(!orch.over, 'orch-ctx', `session ${orch.session_id}: ${orch.ctx_tokens} token, tăng ${orch.ctx_growth}/${orch.soft_cap}, ≈ ${fmtUsd(orch.cum_usd)} — ${orch.advice}`, 'CẢNH BÁO');
   }
   if (ctx.config.sink_url && ctx.config.sink_token) {
-    try {
-      const u = new URL(ctx.config.sink_url);
-      u.searchParams.set('token', ctx.config.sink_token);
-      u.searchParams.set('view', 'stats');
-      const res = await fetch(u, { redirect: 'follow', signal: AbortSignal.timeout(8000) });
-      const txt = await res.text();
-      let ok = res.ok;
-      try { const b = JSON.parse(txt); if (b && b.ok === false) ok = false; } catch (_) { ok = false; }
-      add(ok, 'sink', `${ctx.config.sink_url} → HTTP ${res.status}`);
-    } catch (e) {
-      add(false, 'sink', `${ctx.config.sink_url} → ${e.message}`);
+    const cached = opts.net ? null : core.sinkStatusCached(ctx);
+    if (cached && (cached.state === 'ok' || cached.state === 'fail')) {
+      add(cached.state === 'ok', 'sink', `${ctx.config.sink_url} → ${cached.state === 'ok' ? 'ok' : `lỗi: ${cached.detail}`} (bộ nhớ đệm: ${cached.source} lúc ${cached.ts}; \`doctor --net\` để kiểm trực tiếp)`);
+    } else {
+      const live = await checkSinkLive(ctx);
+      add(live.ok, 'sink', `${ctx.config.sink_url} → ${live.detail}`);
     }
   } else {
     add(true, 'sink', 'chưa cấu hình (chỉ lưu cục bộ)');
@@ -168,6 +175,83 @@ async function cmdDoctor(opts) {
   return { code: failed ? 1 : 0, out };
 }
 
+const TMP_RE = /\.tmp-\d+-[0-9a-f]+$/;
+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.
+ */
+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]) {
+    let names = [];
+    try { names = fs.readdirSync(dir); } catch (_) { continue; }
+    for (const n of names) {
+      if (!TMP_RE.test(n)) continue;
+      const f = path.join(dir, n);
+      try {
+        const st = fs.statSync(f);
+        if (!st.isFile()) continue; // a directory (or anything else) with a tmp-like name: not ours, leave it alone
+        if (now - st.mtimeMs > TMP_STALE_MS) { fs.unlinkSync(f); removed++; } else left.push(n);
+      } catch (_) { left.push(n); }
+    }
+  }
+  return { removed, left };
+}
+
+/** Live sink check (view=stats); result cached in data/sink-check.json for 24 h. */
+async function checkSinkLive(ctx) {
+  let ok = false;
+  let detail;
+  try {
+    const u = new URL(ctx.config.sink_url);
+    u.searchParams.set('token', ctx.config.sink_token);
+    u.searchParams.set('view', 'stats');
+    const res = await fetch(u, { redirect: 'follow', signal: AbortSignal.timeout(8000) });
+    const txt = await res.text();
+    ok = res.ok;
+    try { const b = JSON.parse(txt); if (b && b.ok === false) ok = false; } catch (_) { ok = false; }
+    detail = `HTTP ${res.status}`;
+  } catch (e) {
+    detail = e.message;
+  }
+  try {
+    core.writeFileAtomic(ctx.paths.sinkCheck, `${JSON.stringify({ ts: core.nowIso(), ok, detail, url: core.sinkUrlKey(ctx.config) })}\n`);
+  } catch (_) { /* cache is best effort */ }
+  return { ok, detail };
+}
+
+// ------------------------------------------------------------------ start
+
+/**
+ * `dieu-phoi start [--json]`: one fast, network-free call for gate 1 when the UserPromptSubmit hook
+ * did not run: local health (sink from cache), fresh root task id, run dir created, scout brief path.
+ */
+function cmdStart(opts) {
+  const ctx = ctxOf(opts);
+  const reg = setupLib.registration(claudeDirOf(opts));
+  const info = core.startInfo(ctx);
+  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;
+  if (opts.json) return { code: 0, out: JSON.stringify(info, null, 2) };
+  const out = [
+    `root_task_id: ${info.id}`,
+    `run_dir: ${info.run_dir}/ (đã tạo)`,
+    `step_ids: ${info.step_ids.join(' ')}`,
+    `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),
+  ];
+  return { code: 0, out: out.join('\n') };
+}
+
 // ------------------------------------------------------------------ hook / sync
 
 function cmdHook(opts) {
@@ -201,7 +285,10 @@ function resolveAgentId(events, ref, now) {
     const verdicted = new Set();
     events.forEach((e, i) => {
       if (!e.agent_id) return;
-      if (e.kind === 'verdict' && agg.normalizeVerdict(e).by === 'agent') verdicted.add(e.agent_id);
+      if (e.kind === 'verdict') {
+        const nv = agg.normalizeVerdict(e);
+        if (nv.by === 'agent' && nv.outcome !== agg.ABORTED) verdicted.add(e.agent_id); // aborted still needs a verdict
+      }
       if (e.kind !== 'complete') return;
       const t = Date.parse(e.ts) || 0;
       const cur = latest.get(e.agent_id);
@@ -238,8 +325,9 @@ function kebab(s) {
 function verdictAgent(opts, ctx, events) {
   const [ref, outcome] = opts._;
   if (!ref || !outcome) {
-    throw new Error('Cú pháp: dieu-phoi verdict <agent_id|last> <pass|fail|timeout> [--verify V] [--reason R]\n'
-      + '         dieu-phoi verdict --task <task_id> <accept|reject> [--cause quality|scope] [--round n]');
+    throw new Error('Cú pháp: dieu-phoi verdict <agent_id|last> <pass|fail|timeout|aborted> [--verify V] [--reason R]\n'
+      + '         dieu-phoi verdict --task <task_id> <accept|reject> [--cause quality|scope] [--round n]\n'
+      + '         dieu-phoi verdict --root <root_task_id> accept [--steps a,b]');
   }
   if (outcome === 'rework') {
     throw new Error('"rework" đã bỏ. Người dùng không nhận kết quả → dieu-phoi verdict --task <task_id> reject --cause quality');
@@ -297,9 +385,46 @@ function verdictUser(opts, ctx, events) {
   }, core.commonFields(ctx));
 }
 
+/**
+ * `verdict --root <root> accept [--steps a,b]` (core 0.4.0): the user accepts the steps of the latest approved plan
+ * in one call. Covers every step whose task has an exec dispatch and no user verdict yet (a step already rejected
+ * or accepted is left alone: reject the bad ones per task first, then accept the rest by root).
+ */
+function verdictRoot(opts, ctx, events) {
+  const root = requireTaskId(String(opts.root));
+  if (opts._[0] !== 'accept') {
+    throw new Error('verdict --root chỉ nhận accept; bước không đạt → dieu-phoi verdict --task <task_id> reject --cause quality|scope');
+  }
+  const plan = core.readJsonFile(path.join(ctx.paths.plans, `${root}.json`), null);
+  if (!plan || !Array.isArray(plan.steps)) throw new Error(`Không thấy kế hoạch đã duyệt của root ${root} (plan-table --approve --root ${root}).`);
+  let steps = plan.steps.filter((x) => x && x.task_id);
+  if (typeof opts.steps === 'string') {
+    const want = new Set(opts.steps.split(',').map((x) => x.trim()).filter(Boolean));
+    const ids = new Set(steps.map((x) => String(x.id)));
+    const missing = Array.from(want).filter((x) => !ids.has(x));
+    if (missing.length) throw new Error(`--steps: không có bước ${missing.join(', ')} trong kế hoạch ${root}`);
+    steps = steps.filter((x) => want.has(String(x.id)));
+  }
+  const execTasks = new Set(events.filter((e) => e.kind === 'dispatch' && (e.role || 'exec') === 'exec').map((e) => e.task_id));
+  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) => ({
+    step: String(x.id),
+    ev: verdictUser(Object.assign({}, opts, { task: x.task_id, _: ['accept'], round: undefined, cause: undefined }), ctx, events),
+  }));
+}
+
 function cmdVerdict(opts) {
   const ctx = ctxOf(opts);
   const events = core.readEvents(ctx);
+  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 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) };
@@ -309,6 +434,29 @@ function cmdVerdict(opts) {
   return { code: 0, out: `Đã ghi ${ev.outcome} cho ${ev.agent_id}${ev.task_id ? ` (task ${ev.task_id})` : ''}.` };
 }
 
+// ------------------------------------------------------------------ discard
+
+/**
+ * `dieu-phoi discard --task <task_id> [--reason R]` (core 0.4.0): withdraw a mistaken task. Appends one
+ * `discard` event (synced like any other); stats, choose, state and the sink then leave out every event of the
+ * task and of its agents. events.jsonl is never edited — a hand edit once lost a dispatch that the sink kept.
+ */
+function cmdDiscard(opts) {
+  if (typeof opts.task !== 'string') throw new Error('Cú pháp: dieu-phoi discard --task <task_id> [--reason R]');
+  const taskId = requireTaskId(opts.task);
+  const ctx = ctxOf(opts);
+  const events = core.readEvents(ctx);
+  if (!events.some((e) => e.task_id === taskId)) throw new Error(`Không thấy task "${taskId}" trong log.`);
+  if (agg.discardedTaskIds(events).has(taskId)) return { code: 0, out: opts.json ? JSON.stringify({ already: true, task_id: taskId }) : `Task ${taskId} đã bị loại trước đó.` };
+  const ev = Object.assign({
+    schema: core.SCHEMA, kind: 'discard', ts: core.nowIso(), agent_id: `task:${taskId}`, task_id: taskId, reason_code: kebab(opts.reason),
+  }, core.commonFields(ctx));
+  core.appendEvent(ctx, ev);
+  const n = events.filter((e) => e.task_id === taskId).length;
+  if (opts.json) return { code: 0, out: JSON.stringify(ev) };
+  return { code: 0, out: `Đã loại task ${taskId} (${n} bản ghi) khỏi thống kê, choose và state. Log không bị sửa; sink nhận bản ghi discard ở lần sync kế tiếp.` };
+}
+
 // ------------------------------------------------------------------ steer
 
 /**
@@ -336,7 +484,8 @@ function cmdSteer(opts) {
     const taskId = String(opts.task);
     const mine = agents.filter((a) => a.task_id === taskId);
     if (!mine.length && !events.some((e) => e.task_id === taskId)) throw new Error(`Không thấy task ${taskId} trong log`);
-    const inFlight = mine.filter((a) => a.dispatched && !(a.completed && a.outcome));
+    // core 0.4.0: verifiers are never marked (a steer is about the work, not its check)
+    const inFlight = mine.filter((a) => a.dispatched && a.role !== 'verify' && !(a.completed && a.outcome));
     const type = (mine.find((a) => a.role === 'exec') || mine[0] || {}).task_type || null;
     out = inFlight.length ? inFlight.map((a) => mk(a.agent_id, taskId, a.task_type)) : [mk(`task:${taskId}`, taskId, type)];
   } else {
@@ -380,6 +529,40 @@ function measureOrch(opts, ctx, prof) {
   };
 }
 
+const CTX_WARN_KEEP_MS = 14 * 24 * 3600 * 1000;
+
+/** 0 = within the cap; 1 = over the cap, 2 = over 2×, 3 = over 4×, … */
+function ctxWarnLevel(growth, cap) {
+  if (!(typeof growth === 'number' && cap > 0 && growth > cap)) return 0;
+  return 1 + Math.floor(Math.log2(growth / cap));
+}
+
+/**
+ * Core 0.4.0: the over-cap advice fires once per threshold crossing (cap, 2×, 4×, …) per session, and again after
+ * a /compact that left the session over. State: data/ctx-warn.json {session_id: {level, compactions, t}}.
+ * Never throws (no state → warn).
+ */
+function ctxWarnOnce(ctx, m) {
+  if (!m || !m.over || !m.session_id) return false;
+  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;
+  } catch (_) {
+    return true;
+  }
+}
+
 function profileOrNull(opts, ctx) {
   try { return chooser.loadProfile(skillDirOf(opts, ctx)); } catch (_) { return null; }
 }
@@ -461,9 +644,9 @@ function cmdStats(opts) {
       c.note,
     ]);
   }
-  const s = [['task_type', 'task', 'task có steer', 'lần steer', 'minor', 'plan', 'redirect', 'tỉ lệ steer']];
+  const s = [['task_type', 'task', 'task có steer', 'lần steer', 'minor', 'plan', 'redirect', 'tỉ lệ steer', 'ngoài exec (không tính)']];
   for (const r of steerRows) {
-    s.push([r.task_type, r.tasks, r.steered_tasks, r.actions, r.minor, r.plan, r.redirect, pct(r.steer_rate)]);
+    s.push([r.task_type, r.tasks, r.steered_tasks, r.actions, r.minor, r.plan, r.redirect, pct(r.steer_rate), r.plan_phase_actions || 0]);
   }
   return {
     code: 0,
@@ -487,6 +670,7 @@ function cmdRetro(opts) {
   const userOutcomes = {};
   for (const a of agents) {
     if (a.outcome) outcomes[a.outcome] = (outcomes[a.outcome] || 0) + 1;
+    if (a.aborted) outcomes.aborted = (outcomes.aborted || 0) + 1;
     if (a.reason_code) reasons[a.reason_code] = (reasons[a.reason_code] || 0) + 1;
   }
   for (const v of userVerdicts) {
@@ -518,6 +702,7 @@ function cmdRetro(opts) {
       no_verdict_agents: agents.filter((a) => a.completed && !a.outcome && a.role !== 'verify').length,
       no_user_verdict_tasks: tasks.filter((t) => !t.user_verdicts.length).length,
       multi_attempt_tasks: escalations,
+      discarded_tasks: agg.discardedTaskIds(events).size,
       overrides: overrides.length,
       cost_usd: agents.reduce((s, a) => s + (a.cost_usd || 0), 0),
     },
@@ -567,6 +752,19 @@ function chooseInput(opts, ctx, events) {
   };
 }
 
+function overrideEvent(ctx, taskId, taskType, suggested, chosen) {
+  return Object.assign({
+    schema: core.SCHEMA,
+    kind: 'override',
+    ts: core.nowIso(),
+    agent_id: taskId ? `task:${taskId}` : `override-${crypto.randomBytes(6).toString('hex')}`,
+    task_id: taskId || null,
+    task_type: taskType,
+    suggested_tier: suggested,
+    chosen_tier: chosen,
+  }, core.commonFields(ctx));
+}
+
 function cmdChoose(opts) {
   const ctx = ctxOf(opts);
   if (opts.override !== undefined && typeof opts.task !== 'string') {
@@ -579,21 +777,14 @@ function cmdChoose(opts) {
   res.orch_ctx_tokens = orch.ctx_tokens;
   res.orch_ctx_growth = orch.ctx_growth;
   res.orch_ctx_over = orch.over;
+  res.orch_ctx_warn = ctxWarnOnce(ctx, orch); // over AND a new threshold crossed since the last warning
   if (res.overridden) {
     const tid = input.taskId;
-    core.appendEvent(ctx, Object.assign({
-      schema: core.SCHEMA,
-      kind: 'override',
-      ts: core.nowIso(),
-      agent_id: tid ? `task:${tid}` : `override-${require('crypto').randomBytes(6).toString('hex')}`,
-      task_id: tid,
-      task_type: String(input.type).toLowerCase(),
-      suggested_tier: res.suggested_tier,
-      chosen_tier: res.tier,
-    }, core.commonFields(ctx)));
+    core.appendEvent(ctx, overrideEvent(ctx, tid, res.task_type || String(input.type).toLowerCase(), res.suggested_tier, res.tier));
   }
   if (opts.json) return { code: 0, out: JSON.stringify(res) };
-  const warn = orch.over ? `\nCẢNH BÁO: ${orch.advice}` : '';
+  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}` : ''}`;
   const est =`~${fmtUsd(res.est_cost_usd)} · ~${fmtNum(res.est_time_min)} phút (${res.est_source === 'data' ? 'dữ liệu' : 'ước lượng thô'})`;
   if (res.action === 'ask_user') {
     return { code: 0, out: `HỎI NGƯỜI DÙNG — ${res.reason}${warn}` };
@@ -728,9 +919,35 @@ function planTaskIdProblems(plan, root) {
     const same = plan.steps.filter((r) => r.task_id === root).map((r) => r.step);
     if (same.length) problems.push(`task_id của bước ${same.join(', ')} trùng --root "${root}" (root dành cho scout/planner)`);
   }
+  // core 0.4.0: a label outside the fixed list (and without an alias) would never pool its stats
+  for (const r of plan.steps) if (r.unknown_type) problems.push(`bước ${r.step}: ${r.type_warning}`);
   return problems;
 }
 
+/** Mapped ad-hoc labels (bug-fix → debug, …): not an error, but the tag must carry the mapped type. */
+function planTypeNotes(plan) {
+  return plan.steps.filter((r) => r.mapped_from).map((r) => `bước ${r.step}: ${r.type_warning}`);
+}
+
+/**
+ * Overrides chosen in the steps file (step `override`) become override events when the plan is approved —
+ * also on a re-approval that changes a step's tier — so the override learning sees them (core 0.4.0; before,
+ * only `choose --override` logged one). One event per (task_id, chosen tier): re-approving the same tier or a
+ * `choose --override` already logged adds nothing.
+ */
+function planOverrideEvents(ctx, plan, events) {
+  const seen = new Set(events.filter((e) => e.kind === 'override').map((e) => `${e.task_id}|${e.chosen_tier}`));
+  const out = [];
+  for (const r of plan.steps) {
+    if (!r.overridden || !r.task_id || !r.tier || !r.suggested_tier) continue;
+    const k = `${r.task_id}|${r.tier}`;
+    if (seen.has(k)) continue;
+    seen.add(k);
+    out.push(overrideEvent(ctx, r.task_id, r.task_type || r.type, r.suggested_tier, r.tier));
+  }
+  return out;
+}
+
 function recordApprovedPlan(ctx, root, stepsFile, plan) {
   const file = path.join(ctx.paths.plans, `${root}.json`);
   const prev = core.readJsonFile(file, null);
@@ -746,7 +963,7 @@ function recordApprovedPlan(ctx, root, stepsFile, plan) {
     approved_at: core.nowIso(),
     approval: prevApproval(prev) + 1,
     steps: plan.steps.map((r) => ({
-      id: r.step, task_id: r.task_id || null, title: r.title === undefined ? null : r.title, type: r.type || null,
+      id: r.step, task_id: r.task_id || null, title: r.title === undefined ? null : r.title, type: r.task_type || r.type || null,
       tier: r.action === 'refused' ? null : (r.tier || null), depends_on: r.depends_on,
     })),
     history,
@@ -793,9 +1010,15 @@ function cmdPlanTable(opts) {
     throw new Error(`plan-table --approve: không ghi kế hoạch — ${problems.join('; ')}. Mỗi bước cần task_id riêng (8 ký tự a-z0-9, lấy bằng \`dieu-phoi new-id\`), khác --root.`);
   }
   if (problems.length) process.stderr.write(`dieu-phoi plan-table: cảnh báo — ${problems.join('; ')} (cần sửa trước khi --approve)\n`);
+  const typeNotes = planTypeNotes(plan);
+  if (typeNotes.length) process.stderr.write(`dieu-phoi plan-table: cảnh báo — ${typeNotes.join('; ')}\n`);
   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 (opts.json) {
-    const out = rec ? Object.assign({}, plan, { approved: { root_task_id: rec.root_task_id, approval: rec.approval, record: rec.file } }) : plan;
+    const out = rec ? Object.assign({}, plan, {
+      approved: { root_task_id: rec.root_task_id, approval: rec.approval, record: rec.file, overrides_logged: ovs.length },
+    }) : plan;
     return { code: 0, out: JSON.stringify(out, null, 2) };
   }
   const lines = ['| Bước | Model/effort | Rubric (điểm · kiểm chứng · đảo ngược) | Lý do | Ước tính |', '|---|---|---|---|---|'];
@@ -815,11 +1038,12 @@ function cmdPlanTable(opts) {
     process.stderr.write(`dieu-phoi plan-table: cảnh báo — ${plan.refused.length} bước bị từ chối
 `);
   }
-  if (rec) lines.push('', `Đã ghi kế hoạch đã duyệt (root ${rec.root_task_id}, lần duyệt ${rec.approval})`);
+  if (typeNotes.length) lines.push('', `**Loại task:** ${typeNotes.join('; ')}`);
+  if (rec) lines.push('', `Đã ghi kế hoạch đã duyệt (root ${rec.root_task_id}, lần duyệt ${rec.approval})${ovs.length ? `; ghi ${ovs.length} override` : ''}`);
   return { code: 0, out: lines.join('\n') };
 }
 
 module.exports = {
-  cmdSetup, cmdUninstall, cmdDoctor, cmdHook, cmdSync, cmdVerdict, cmdSteer, cmdStats, cmdRetro, cmdChoose, cmdCtx, cmdState, measureOrch,
+  cmdSetup, cmdUninstall, cmdDoctor, cmdStart, checkSinkLive, cmdHook, cmdSync, cmdVerdict, cmdSteer, cmdDiscard, ctxWarnOnce, ctxWarnLevel, sweepStaleTmp, planOverrideEvents, cmdStats, cmdRetro, cmdChoose, cmdCtx, cmdState, measureOrch,
   cmdPlanTable, cmdNewId, requireTaskId, buildPlanTable, recordApprovedPlan, planTaskIdProblems, criticalPath, resolveAgentId, AGENT_OUTCOMES, USER_OUTCOMES, VERIFY,
 };

package/lib/setup.cjs

@@ -57,7 +57,7 @@ function stripOurHooks(settings) {
   return removed;
 }
 
-/** True when settings already hold exactly our two entries with this command. */
+/** True when settings already hold exactly our four entries with this command. */
 function alreadyRegistered(settings, cmd) {
   const hooks = settings && settings.hooks;
   if (!hooks || typeof hooks !== 'object') return false;
@@ -72,10 +72,11 @@ function alreadyRegistered(settings, cmd) {
         if (event === 'PostToolUse' && g.matcher === 'Agent') good++;
         else if (event === 'SubagentStop') good++;
         else if (event === 'SessionStart' && g.matcher === 'compact') good++;
+        else if (event === 'UserPromptSubmit' && !g.matcher) good++;
       }
     }
   }
-  return ours === 3 && good === 3;
+  return ours === 4 && good === 4;
 }
 
 function addOurHooks(settings, hookPath) {
@@ -89,6 +90,9 @@ function addOurHooks(settings, hookPath) {
   // after /compact or auto-compact: re-inject the orchestration state rebuilt from the log
   if (!Array.isArray(h.SessionStart)) h.SessionStart = [];
   h.SessionStart.push({ matcher: 'compact', hooks: [{ type: 'command', command: cmd, timeout: 10 }] });
+  // on a dieu-phoi prompt: pre-create the run dir + id so the first tool call can be the scout (no shell)
+  if (!Array.isArray(h.UserPromptSubmit)) h.UserPromptSubmit = [];
+  h.UserPromptSubmit.push({ hooks: [{ type: 'command', command: cmd, timeout: 5 }] });
 }
 
 // ------------------------------------------------------------------ run-dir permissions
@@ -340,7 +344,7 @@ function registration(claudeDir) {
   const perms = permissionEntries(runsDir());
   const legacy = permissionEntries(legacyRunsDirOf(claudeDir));
   const out = {
-    file, PostToolUse: false, SubagentStop: false, SessionStart: false, commands: [], permissions: false, permission_entries: perms,
+    file, PostToolUse: false, SubagentStop: false, SessionStart: false, UserPromptSubmit: false, commands: [], permissions: false, permission_entries: perms,
     runs_dir: perms.dir, runs_dir_exists: fs.existsSync(perms.dir), legacy_permissions: false,
   };
   let obj;
@@ -350,7 +354,7 @@ function registration(claudeDir) {
   out.legacy_permissions = legacy.allow.some((r) => Array.isArray(lp.allow) && lp.allow.includes(r))
     || (Array.isArray(lp.additionalDirectories) && lp.additionalDirectories.includes(legacy.dir));
   const hooks = obj.hooks || {};
-  for (const ev of ['PostToolUse', 'SubagentStop', 'SessionStart']) {
+  for (const ev of ['PostToolUse', 'SubagentStop', 'SessionStart', 'UserPromptSubmit']) {
     for (const g of Array.isArray(hooks[ev]) ? hooks[ev] : []) {
       for (const h of (g && Array.isArray(g.hooks) ? g.hooks : [])) {
         if (!isOurs(h)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kienntpixon/dieu-phoi",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "Hook + CLI ghi log subagent của Claude Code và chọn model/effort theo chi phí + thời gian tới lúc nghiệm thu.",
   "license": "MIT",
   "author": "kiennt <kiennt@pixon.games>",