@kienntpixon/dieu-phoi 0.1.2 → 0.2.1

package/lib/setup.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const core = require('../hook.cjs');
 
@@ -70,10 +71,11 @@ function alreadyRegistered(settings, cmd) {
         if (h.command !== cmd) continue;
         if (event === 'PostToolUse' && g.matcher === 'Agent') good++;
         else if (event === 'SubagentStop') good++;
+        else if (event === 'SessionStart' && g.matcher === 'compact') good++;
       }
     }
   }
-  return ours === 2 && good === 2;
+  return ours === 3 && good === 3;
 }
 
 function addOurHooks(settings, hookPath) {
@@ -84,6 +86,84 @@ function addOurHooks(settings, hookPath) {
   h.PostToolUse.push({ matcher: 'Agent', hooks: [{ type: 'command', command: cmd, timeout: 10 }] });
   if (!Array.isArray(h.SubagentStop)) h.SubagentStop = [];
   h.SubagentStop.push({ hooks: [{ type: 'command', command: cmd, timeout: 10 }] });
+  // 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 }] });
+}
+
+// ------------------------------------------------------------------ run-dir permissions
+
+/**
+ * Run directory for subagent reports: ~/.dieu-phoi/runs (override: DIEU_PHOI_RUNS_DIR, absolute).
+ * Deliberately OUTSIDE ~/.claude: `.claude` is a Claude Code protected path, where allow rules never
+ * pre-approve writes, so background agents could not write their reports there.
+ */
+function runsDir() {
+  return core.runsDir();
+}
+
+/** Run dir used by 0.2.0 dev builds (<claudeDir>/dieu-phoi/runs); its rules are removed by setup/uninstall. */
+function legacyRunsDirOf(claudeDir) {
+  return path.join(path.resolve(claudeDir), 'dieu-phoi', 'runs');
+}
+
+/**
+ * Permission entries that let background subagents (default permission mode) read and write reports in
+ * `runs`: Read(<p>/**) + Edit(<p>/**) allow rules (Edit rules cover every file-writing tool; Claude
+ * Code ignores path rules on Write and warns about them, so no Write(...) rule) and the dir itself in
+ * permissions.additionalDirectories. <p> = ~/<rel> under the home dir, else //<abs> (Windows: //c/...).
+ */
+function permissionEntries(runs, homeDir) {
+  const home = path.resolve(homeDir || os.homedir());
+  const rel = path.relative(home, runs);
+  let pat;
+  if (rel && !rel.startsWith('..') && !path.isAbsolute(rel)) {
+    pat = `~/${toSlash(rel)}/**`;
+  } else {
+    const abs = toSlash(runs);
+    const m = /^([A-Za-z]):\/(.*)$/.exec(abs);
+    pat = m ? `//${m[1].toLowerCase()}/${m[2]}/**` : `/${abs}/**`;
+  }
+  return { allow: [`Read(${pat})`, `Edit(${pat})`], dir: toSlash(runs) };
+}
+
+/** Add our permission entries (idempotent). Returns true when settings changed. */
+function addOurPermissions(settings, entries) {
+  let changed = false;
+  if (!settings.permissions || typeof settings.permissions !== 'object' || Array.isArray(settings.permissions)) {
+    settings.permissions = {};
+    changed = true;
+  }
+  const p = settings.permissions;
+  if (!Array.isArray(p.allow)) { p.allow = []; changed = true; }
+  for (const r of entries.allow) if (!p.allow.includes(r)) { p.allow.push(r); changed = true; }
+  if (!Array.isArray(p.additionalDirectories)) { p.additionalDirectories = []; changed = true; }
+  if (!p.additionalDirectories.includes(entries.dir)) { p.additionalDirectories.push(entries.dir); changed = true; }
+  return changed;
+}
+
+/** Remove exactly our permission entries; a list we emptied is deleted. Returns number removed. */
+function stripOurPermissions(settings, entries) {
+  const p = settings.permissions;
+  if (!p || typeof p !== 'object' || Array.isArray(p)) return 0;
+  let removed = 0;
+  const strip = (key, items) => {
+    if (!Array.isArray(p[key])) return;
+    const kept = p[key].filter((x) => !items.includes(x));
+    if (kept.length === p[key].length) return;
+    removed += p[key].length - kept.length;
+    if (kept.length) p[key] = kept; else delete p[key];
+  };
+  strip('allow', entries.allow);
+  strip('additionalDirectories', [entries.dir]);
+  return removed;
+}
+
+function hasOurPermissions(settings, entries) {
+  const p = settings && settings.permissions;
+  if (!p || typeof p !== 'object') return false;
+  return entries.allow.every((r) => Array.isArray(p.allow) && p.allow.includes(r))
+    && Array.isArray(p.additionalDirectories) && p.additionalDirectories.includes(entries.dir);
 }
 
 function readSettings(file) {
@@ -204,11 +284,20 @@ function setup(opts) {
   const cmd = hookCommand(paths.hook);
   let removed = 0;
   let res = { changed: false, backup: null };
+  let dirty = false;
   if (!(before.exists && alreadyRegistered(obj, cmd))) {
     removed = stripOurHooks(obj);
     addOurHooks(obj, paths.hook);
-    res = writeSettings(settingsFile, before, obj);
+    dirty = true;
   }
+  // 4. run dir + permissions so background subagents can write their reports there
+  const perms = permissionEntries(runsDir());
+  fs.mkdirSync(perms.dir, { recursive: true });
+  // rules a 0.2.0 dev build added for <claudeDir>/dieu-phoi/runs (protected path, never worked) go away
+  const legacyRemoved = stripOurPermissions(obj, permissionEntries(legacyRunsDirOf(claudeDir)));
+  if (legacyRemoved) dirty = true;
+  if (addOurPermissions(obj, perms)) dirty = true;
+  if (dirty) res = writeSettings(settingsFile, before, obj);
 
   return {
     home,
@@ -218,6 +307,9 @@ function setup(opts) {
     settings_changed: res.changed,
     backup: res.backup,
     replaced_entries: removed,
+    runs_dir: perms.dir,
+    permissions: perms,
+    legacy_permissions_removed: legacyRemoved,
     config: cfg,
   };
 }
@@ -229,29 +321,41 @@ function uninstall(opts) {
   const before = readSettings(settingsFile);
   const obj = JSON.parse(JSON.stringify(before.obj));
   const removed = stripOurHooks(obj);
+  const permsRemoved = stripOurPermissions(obj, permissionEntries(runsDir()))
+    + stripOurPermissions(obj, permissionEntries(legacyRunsDirOf(claudeDir)));
   let res = { changed: false, backup: null };
-  if (removed) res = writeSettings(settingsFile, before, obj);
+  if (removed || permsRemoved) res = writeSettings(settingsFile, before, obj);
   const hookFile = core.pathsFor(home).hook;
   let hookRemoved = false;
   if (opts.purge && fs.existsSync(hookFile)) {
     fs.unlinkSync(hookFile);
     hookRemoved = true;
   }
-  return { removed, settings: settingsFile, backup: res.backup, hook_removed: hookRemoved, data_kept: core.pathsFor(home).data };
+  return { removed, permissions_removed: permsRemoved, settings: settingsFile, backup: res.backup, hook_removed: hookRemoved, data_kept: core.pathsFor(home).data };
 }
 
 /** Inspect settings for our registration. */
 function registration(claudeDir) {
   const file = path.join(path.resolve(claudeDir), 'settings.json');
-  const out = { file, PostToolUse: false, SubagentStop: false, commands: [] };
+  const perms = permissionEntries(runsDir());
+  const legacy = permissionEntries(legacyRunsDirOf(claudeDir));
+  const out = {
+    file, PostToolUse: false, SubagentStop: false, SessionStart: false, commands: [], permissions: false, permission_entries: perms,
+    runs_dir: perms.dir, runs_dir_exists: fs.existsSync(perms.dir), legacy_permissions: false,
+  };
   let obj;
   try { obj = readSettings(file).obj; } catch (_) { return out; }
+  out.permissions = hasOurPermissions(obj, perms);
+  const lp = obj.permissions || {};
+  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']) {
+  for (const ev of ['PostToolUse', 'SubagentStop', 'SessionStart']) {
     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;
         if (ev === 'PostToolUse' && g.matcher && !/\bAgent\b/.test(g.matcher)) continue;
+        if (ev === 'SessionStart' && g.matcher !== 'compact') continue;
         out[ev] = true;
         out.commands.push(h.command);
       }
@@ -262,5 +366,5 @@ function registration(claudeDir) {
 
 module.exports = {
   MARKER, setup, uninstall, registration, stripOurHooks, addOurHooks, alreadyRegistered, hookCommand,
-  skillVersionOf, findSkillDir, tsStamp,
+  skillVersionOf, findSkillDir, tsStamp, runsDir, legacyRunsDirOf, permissionEntries, addOurPermissions, stripOurPermissions, hasOurPermissions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kienntpixon/dieu-phoi",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "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>",