gm-plugkit 2.0.1867 → 2.0.1869

package/instructions/entry.md

@@ -71,7 +71,7 @@ Write `in/<lang>/<N>.<ext>` for language stems, `in/<verb>/<N>.txt` for orchestr
 
 ## SESSION_ID
 
-Thread SESSION_ID through every spool body + rs-exec RPC; plugkit rejects empty.
+Thread SESSION_ID through every spool body; plugkit rejects empty.
 
 ## Daemonize
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-plugkit",
-  "version": "2.0.1867",
+  "version": "2.0.1869",
   "description": "Bootstrap and daemon-spawn tool for gm plugkit binary. Downloads the correct platform binary, verifies SHA256, and starts the spool watcher daemon. Includes plugkit-wasm-wrapper for WASM-based spool watching.",
   "main": "index.js",
   "bin": {
@@ -12,7 +12,6 @@
     "index.js",
     "bootstrap.js",
     "supervisor.js",
-    "lang-host-runner.js",
     "plugkit-wasm-wrapper.js",
     "plugkit.version",
     "plugkit.sha256",

package/plugkit-wasm-wrapper.js

@@ -1049,18 +1049,6 @@ function resolveWindowsExeLocal(cmd) {
   }
 }
 
-function isPortReachableSync(host, port, timeoutMs) {
-  const r = spawnSync(process.execPath, ['-e', `
-    const net = require('net');
-    const s = net.connect({ port: ${port}, host: ${JSON.stringify(host)} });
-    let done = false;
-    s.on('connect', () => { done = true; s.destroy(); process.exit(0); });
-    s.on('error', () => { if (!done) process.exit(1); });
-    setTimeout(() => { if (!done) { s.destroy(); process.exit(1); } }, ${timeoutMs || 800});
-  `], { timeout: (timeoutMs || 800) + 2000, windowsHide: true });
-  return r.status === 0;
-}
-
 function findFreePortSync() {
   const r = spawnSync(process.execPath, ['-e', `
     const net = require('net');
@@ -1072,17 +1060,6 @@ function findFreePortSync() {
   return parseInt(r.stdout.trim(), 10);
 }
 
-function isPortAliveSync(port) {
-  const r = spawnSync(process.execPath, ['-e', `
-    const net = require('net');
-    const s = net.connect({ port: ${port}, host: '127.0.0.1' });
-    s.on('connect', () => { s.destroy(); process.exit(0); });
-    s.on('error', () => process.exit(1));
-    setTimeout(() => process.exit(1), 800);
-  `], { timeout: 2000 });
-  return r.status === 0;
-}
-
 function sleepSync(ms) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Math.max(0, ms | 0));
 }
@@ -4390,16 +4367,42 @@ async function runSpoolWatcher(instance, spoolDir) {
       // The window must therefore comfortably exceed the worst-case cold embed;
       // it is a one-time cost (the digest persists after a single completion,
       // so subsequent boots' warmup is near-instant).
-      _writeStatusBusy(1200000);
-      const vb = new TextEncoder().encode('codesearch');
-      const bb = new TextEncoder().encode(JSON.stringify({ query: 'index warmup', k: 1 }));
-      const vp = writeWasmInput(instance, vb, 'boot-warmup:codesearch.verb');
-      const bp = writeWasmInput(instance, bb, 'boot-warmup:codesearch.body');
+      // A single warmup dispatch only advances the index by one wall-budget
+      // slice, so a large repo needs many passes before the digest converges
+      // (deferred_files == 0). A single-shot warmup left the digest permanently
+      // withheld: every later verb and every respawn re-triggered a fresh
+      // partial pass, and the stale-digest boot path re-embedded from scratch
+      // forever. Loop the warmup, refreshing busy_until each pass so the
+      // supervisor's stale-heartbeat check never kills a converging rebuild,
+      // until deferred_files reaches 0 or a bounded pass count is hit.
       const t0 = Date.now();
-      const r = dispatch(vp, vb.length, bp, bb.length);
-      decodeWasmResult(instance, r, 'boot-warmup:codesearch');
+      let passes = 0;
+      let lastDeferred = -1;
+      let stagnant = 0;
+      const MAX_WARMUP_PASSES = 80;
+      while (passes < MAX_WARMUP_PASSES) {
+        _writeStatusBusy(1200000);
+        const vb = new TextEncoder().encode('codeinsight_index');
+        const bb = new TextEncoder().encode(JSON.stringify({ root: '.', max_files: 500 }));
+        const vp = writeWasmInput(instance, vb, 'boot-warmup:codeinsight_index.verb');
+        const bp = writeWasmInput(instance, bb, 'boot-warmup:codeinsight_index.body');
+        const r = dispatch(vp, vb.length, bp, bb.length);
+        const decoded = decodeWasmResult(instance, r, 'boot-warmup:codeinsight_index');
+        passes++;
+        let deferred = null;
+        try {
+          const parsed = typeof decoded === 'string' ? JSON.parse(decoded) : decoded;
+          const d = parsed && (parsed.data || parsed);
+          if (d && typeof d.deferred_files === 'number') deferred = d.deferred_files;
+          else if (parsed && typeof parsed.deferred_files === 'number') deferred = parsed.deferred_files;
+        } catch (_) {}
+        if (deferred === null) break;
+        if (deferred === 0) break;
+        if (deferred === lastDeferred) { stagnant++; if (stagnant >= 4) break; } else { stagnant = 0; }
+        lastDeferred = deferred;
+      }
       writeStatus();
-      logEvent('plugkit', 'boot.index-warmup', { ms: Date.now() - t0 });
+      logEvent('plugkit', 'boot.index-warmup', { ms: Date.now() - t0, passes, converged: lastDeferred === -1 || lastDeferred === 0 });
     } catch (e) {
       try { logEvent('plugkit', 'boot.index-warmup-failed', { error: String(e && e.message || e) }); } catch (_) {}
     }

package/plugkit.version

@@ -1 +1 @@
-0.1.851
+0.1.852

package/lang-host-runner.js

@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-const fs = require('fs');
-const path = require('path');
-
-async function main() {
-  const [, , projectDir, command, codeB64] = process.argv;
-  if (!projectDir || !command || codeB64 === undefined) {
-    console.log(JSON.stringify({ ok: false, error: 'usage: lang-host-runner <projectDir> <command> <code-base64>' }));
-    process.exit(2);
-  }
-  const code = Buffer.from(codeB64, 'base64').toString('utf8');
-  const langDir = path.join(projectDir, 'lang');
-  if (!fs.existsSync(langDir)) {
-    console.log(JSON.stringify({ ok: false, error: 'no-lang-dir', langDir }));
-    return;
-  }
-  const files = fs.readdirSync(langDir).filter(f => f.endsWith('.js') && f !== 'loader.js');
-  const plugins = files.reduce((acc, f) => {
-    try {
-      const p = require(path.join(langDir, f));
-      if (p && typeof p.id === 'string' && p.exec && p.exec.match instanceof RegExp && typeof p.exec.run === 'function') {
-        acc.push(p);
-      }
-    } catch (_) {}
-    return acc;
-  }, []);
-  const plugin = plugins.find(p => p.exec.match.test(command));
-  if (!plugin) {
-    console.log(JSON.stringify({ ok: false, error: 'no-plugin-matched', command, available: plugins.map(p => p.id) }));
-    return;
-  }
-  const t0 = Date.now();
-  const timer = setTimeout(() => {
-    console.log(JSON.stringify({ ok: false, error: 'timeout', plugin_id: plugin.id, ms: Date.now() - t0 }));
-    process.exit(0);
-  }, 30000);
-  try {
-    const out = await plugin.exec.run(code, projectDir);
-    clearTimeout(timer);
-    console.log(JSON.stringify({ ok: true, plugin_id: plugin.id, output: String(out), ms: Date.now() - t0 }));
-  } catch (e) {
-    clearTimeout(timer);
-    console.log(JSON.stringify({ ok: false, error: String(e && e.message || e), plugin_id: plugin.id, ms: Date.now() - t0 }));
-  }
-}
-
-main();