devlyn-cli 4.3.32 → 4.3.33

package/README.md

@@ -255,7 +255,7 @@ On native Windows, use native Node/npm and Python plus Git for Windows Bash for
 
 Drain worktrees default to `<repo parent>/.devlyn-worktrees/<repo name>/<loop-id>/<task-id>`. On Windows, a newly created shared container is marked hidden, and each worktree disables content indexing for new children; names stay indexed and Microsoft Defender scanning is unaffected. For Defender performance, use a Dev Drive via `--worktree-root` or an administrator's exclusion for the root; see [loop options](config/skills/devlyn-ideate/references/loop.md).
 
-Windows completion preserves the workspace, owned refs and recovery receipt when writer cessation cannot be proved, even after merge; resume guidance and delivery status remain separate from product verification. The portability workflow checks out the repository on native Windows and tests the POSIX-packed npm artifact there. A POSIX pass alone does not establish Windows support: acceptance requires the passing Windows job for the exact source SHA/artifact hashes.
+Windows completion keeps a merged task's workspace, with its owned refs and recovery receipt, while a program has a file open in it or runs in it, and removes it once that program lets go; a workspace a program only watches may be removed. A managed workspace is kept the same way and removed by hand as the reason says; scratch that holds files is kept too. Resume guidance and delivery status remain separate from product verification. The portability workflow checks out the repository on native Windows and tests the POSIX-packed npm artifact there. A POSIX pass alone does not establish Windows support: acceptance requires the passing Windows job for the exact source SHA/artifact hashes.
 
 ## Contributing
 

package/bin/devlyn.js

@@ -1463,19 +1463,78 @@ function cleanupRealParents(base, file) {
   return true;
 }
 
-let cleanupProcesses;
-// Whether a running process names `dir` on its command line (a drain started from a global copy runs
-// its queue.py and acceptance.py by absolute path). Read once per command; unreadable means unknown.
-function cleanupInUse(dir) {
-  if (cleanupProcesses === undefined) {
-    const listing = process.platform === 'win32'
-      ? spawnSync('powershell', ['-NoProfile', '-NonInteractive', '-Command',
-        'Get-CimInstance Win32_Process | ForEach-Object { $_.CommandLine }'], { encoding: 'utf8', timeout: 20000 })
-      : spawnSync('ps', ['-axww', '-o', 'command='], { encoding: 'utf8', timeout: 20000 });
-    cleanupProcesses = listing.status === 0 ? listing.stdout.split(/\r?\n/).filter((line) => line && !line.includes(' cleanup --')) : null;
+// The process list that decides whether a copy is in use (a drain started from a copy runs its queue.py and
+// acceptance.py by absolute path). A path is compared only with text the lister itself printed for that very
+// path, in a list whose rows are all rendered the same way. A list that cannot be read clears nothing.
+// POSIX: under the C locale `ps` renders each byte by itself, alike in every row, and the shell it runs from
+// holds each path between random tokens in its own row, the witness. Each shell's arguments fit one page,
+// which every kernel accepts and prints whole.
+const CLEANUP_LIST_BYTES = 4096;
+// Windows: each command line travels as its UTF-16 code units in decimal, which no code page changes, and this
+// marker in PowerShell's own command line must come back intact.
+const CLEANUP_LIST_MARKER = '✓한';
+const CLEANUP_LIST_COMMAND = `Get-CimInstance Win32_Process | ForEach-Object { ([int[]][char[]]"$($_.CommandLine)") -join ',' } # ${CLEANUP_LIST_MARKER}`;
+
+// A Windows list, one command line per row; null when a row is malformed or the marker did not come back in
+// PowerShell's own row beside the command text before it (Node writes each `"` of the command there as `\"`).
+function cleanupWindowsRows(text) {
+  const rows = [];
+  for (const line of text.split(/\r?\n/)) {
+    const units = line ? line.split(',') : [];
+    if (!units.every((unit) => /^\d{1,5}$/.test(unit) && Number(unit) <= 0xffff)) return null;
+    rows.push(String.fromCharCode(...units.map(Number)));
+  }
+  const own = CLEANUP_LIST_COMMAND.slice(CLEANUP_LIST_COMMAND.lastIndexOf('"') + 1);
+  return rows.some((row) => row.includes(own)) ? rows : null;
+}
+
+// A drain started from Git Bash may name a copy C:/… or /c/…: compared lower-cased, with slashes.
+function cleanupWindowsNames(row, dir) {
+  const text = row.toLowerCase().replaceAll('\\', '/');
+  const name = `${dir}\\`.toLowerCase().replaceAll('\\', '/');
+  return text.includes(name) || (/^[a-z]:\//.test(name) && text.includes(`/${name[0]}${name.slice(2)}`));
+}
+
+// Which of `dirs` a running process names on its command line.
+function cleanupInUse(dirs) {
+  const options = { timeout: 20000, maxBuffer: 64 * 1024 * 1024 };
+  const others = (rows) => rows.filter((row) => !row.includes(' cleanup --'));
+  if (process.platform === 'win32') {
+    const listing = spawnSync('powershell', ['-NoProfile', '-NonInteractive', '-Command', CLEANUP_LIST_COMMAND], options);
+    const rows = !listing.error && listing.status === 0 ? cleanupWindowsRows(listing.stdout.toString('latin1')) : null;
+    return new Set(dirs.filter((dir) => !rows || others(rows).some((row) => cleanupWindowsNames(row, dir))));
+  }
+  const script = 'ps -axww -o command=; exit $?';
+  // The shell's arguments with 16-letter tokens around the paths, each argument with its NUL.
+  const size = (batch) => Buffer.byteLength(['sh', '-c', script, ...batch].join('\0')) + 1 + 17 * (batch.length + 1);
+  const used = new Set();
+  const batches = [];
+  for (const name of new Set(dirs.map((dir) => dir + path.sep))) {
+    if (batches.length && size([...batches.at(-1), name]) <= CLEANUP_LIST_BYTES) batches.at(-1).push(name);
+    else if (size([name]) <= CLEANUP_LIST_BYTES) batches.push([name]);
+    else used.add(name);
+  }
+  for (const batch of batches) {
+    let tokens;
+    do {
+      tokens = [...batch, ''].map(() => crypto.randomBytes(8).toString('hex'));
+    } while (new Set(tokens).size < tokens.length || tokens.some((token) => batch.some((name) => name.includes(token))));
+    const listing = spawnSync('sh', ['-c', script, ...batch.flatMap((name, i) => [tokens[i], name]), tokens.at(-1)],
+      { ...options, env: { ...process.env, LC_ALL: 'C' } });
+    const rows = !listing.error && listing.status === 0 ? listing.stdout.toString('latin1').split('\n') : [];
+    // The witness holds every token once, in order; `ps` joins arguments with one space, dropped on each side.
+    const marks = (row) => tokens.map((token) => (row.split(token).length === 2 ? row.indexOf(token) : -1));
+    const witnesses = rows.filter((row) => marks(row).every((mark, i, all) => mark >= 0 && (i === 0 || all[i - 1] < mark)));
+    const [witness] = witnesses, at = witnesses.length === 1 && marks(witness);
+    const between = at ? batch.map((_, i) => witness.slice(at[i] + tokens[i].length, at[i + 1])) : [];
+    const framed = between.length && between.every((text) => text.length > 2 && text.startsWith(' ') && text.endsWith(' '));
+    // The witness alone is no user: any other row naming a path is one, another cleanup's lister shell included.
+    const listed = others(rows.filter((row) => row !== witness));
+    batch.forEach((name, i) => {
+      if (!framed || listed.some((row) => row.includes(between[i].slice(1, -1)))) used.add(name);
+    });
   }
-  // A list that cannot be read cannot clear anything: the roots stay until it can.
-  return cleanupProcesses === null || cleanupProcesses.some((line) => line.includes(dir + path.sep));
+  return new Set(dirs.filter((dir) => used.has(dir + path.sep)));
 }
 
 // Markers are generated, not bundled: require the exact writer format, a shipped version and
@@ -1501,7 +1560,7 @@ function cleanupMarkerOwned(file, current) {
 function cleanupSkillRoots(roots, current, callerBase = null) {
   const resolved = new Map();
   const linked = new Set();
-  const active = new Set();
+  const spellings = [];
   for (const [base, root] of roots) {
     let target = root;
     const stat = fs.lstatSync(root, { throwIfNoEntry: false });
@@ -1521,8 +1580,11 @@ function cleanupSkillRoots(roots, current, callerBase = null) {
     } else if (parents && stat?.isDirectory()) target = fs.realpathSync.native(root);
     if (!resolved.has(target)) resolved.set(target, base);
     const callerPath = (file) => callerBase ? path.join(callerBase, path.relative(base, file)) : file;
-    if (cleanupInUse(callerPath(root)) || cleanupInUse(callerPath(target))) active.add(target);
+    spellings.push([target, callerPath(root), callerPath(target)]);
   }
+  // Every path is known before the list is taken: the lister prints each of them beside the rows it is sought in.
+  const used = cleanupInUse(spellings.flatMap(([, ...names]) => names));
+  const active = new Set(spellings.filter(([, ...names]) => names.some((name) => used.has(name))).map(([target]) => target));
   return [...resolved].flatMap(([root, base]) => {
     const items = cleanupSkillRoot(base, root, current);
     const callerRoot = callerBase ? path.join(callerBase, path.relative(base, root)) : root;

package/bin/skill-history.json

@@ -132,6 +132,7 @@
       "9e4d06fd466fa896040109bac0018fcfb2f1604d55abb4180ff1f1a0b665bbc8",
       "9f14ca629e41730b1a9fb5d0ad1a39cff558fe34758d6ceccbb9de498f9f384e",
       "a11950a5880346f03257c688fd8bc6f8c29fc0b7c05c90e8f5211d5fb7665774",
+      "a1d5a9505c527af88bcac9305ec8bce0ee01d472ec383e7ffacbcccf9137565b",
       "a405a99b988f6edd2eabb0504b36309bb4cf0c3b97eab26bb7ef257e4515dbf3",
       "a463693773934b6de78f5326fb17acac34e8159f459b89c21aa66f3ac0874a57",
       "a66080b0ff25f35e8574a24ee01d87de9f579a59796977f3cc59f1865063f6f6",
@@ -353,6 +354,7 @@
       "05e824f63a6381e02042afb1df0f1437584e25a80de8e9db0bd9456aaeb7aab8",
       "0601ee535419b7039d5da34bd9c8e1c2b3631307214e4afaf394dd47494090c7",
       "062fde2838c0edc0c20e6716948a2ae9fe9d8a98b01a8e8c544c5801641c7cdb",
+      "0c54ebc6c95f04ee0ec2f21aa4ebe34f4d2cfb9697b45a2b02999b963bbbdbca",
       "0cef055580e00f9ed439eacb2dff9d238bb11619457472016095a8915162fa4b",
       "0dc69c20434966015176d83baa6f95b3421f9e13d0b1bd608a22f0560eae1049",
       "0fe9b270d670f70da9d2535969b6117684b7c1517806b3029ebaf9624da8006c",
@@ -836,6 +838,7 @@
     "4.3.30",
     "4.3.31",
     "4.3.32",
+    "4.3.33",
     "4.3.4",
     "4.3.5",
     "4.3.6",