@ckanner/dsh-plugin-flywheel 0.28.0 → 0.28.1

package/dist/control.js

@@ -4,6 +4,15 @@ import { directory, nonempty, record } from './protocol.js';
 const actions = ['start', 'status', 'stop', 'config', 'doctor'];
 const checkStatuses = ['pass', 'fail', 'warn', 'unknown', 'skipped'];
 
+// This marker is issued only where the host can prove that no control process
+// started. An engine/transport error after spawn must never acquire it.
+export class ControlNotDispatchedError extends Error {
+  constructor(cause) {
+    super(cause instanceof Error ? cause.message : String(cause), { cause });
+    this.name = 'ControlNotDispatchedError';
+  }
+}
+
 export async function validateControl(input, defaultCwd) {
   if (!record(input) || !actions.includes(input.action)) {
     throw new Error('action must be start, status, stop, config, or doctor');
@@ -46,13 +55,18 @@ function validDiagnostic(value, request) {
 
 /** Only the engine executable can mutate engine state. No shell interpolation. */
 export async function runControl(input, { binary = 'flywheel', defaultCwd, signal, timeoutMs = 60000 } = {}) {
-  nonempty(binary, 'flywheelBinary', 4096);
-  if (binary.startsWith('-')) throw new Error('flywheelBinary must name an executable');
-  if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 100 || timeoutMs > 120000) {
-    throw new Error('controlTimeoutMs must be between 100 and 120000');
+  let request;
+  try {
+    nonempty(binary, 'flywheelBinary', 4096);
+    if (binary.startsWith('-')) throw new Error('flywheelBinary must name an executable');
+    if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 100 || timeoutMs > 120000) {
+      throw new Error('controlTimeoutMs must be between 100 and 120000');
+    }
+    request = await validateControl(input, defaultCwd);
+    if (signal?.aborted) throw new Error('Flywheel control request cancelled');
+  } catch (error) {
+    throw new ControlNotDispatchedError(error);
   }
-  const request = await validateControl(input, defaultCwd);
-  if (signal?.aborted) throw new Error('Flywheel control request cancelled');
   // Diagnostic commands own watchdog child groups. Its TERM grace, pipe
   // WaitDelay, and quiescence confirmation may each take 5s; keep the Go owner
   // alive long enough to finish all three instead of orphaning its workers.
@@ -61,9 +75,17 @@ export async function runControl(input, { binary = 'flywheel', defaultCwd, signa
   if (request.taskDir) args.push('--task-dir', request.taskDir);
   if (request.probe) args.push('--probe');
   return new Promise((resolve, reject) => {
-    const child = spawn(binary, args, {
-      cwd: request.cwd, detached: false, stdio: ['ignore', 'pipe', 'pipe'],
-    });
+    let child;
+    try {
+      child = spawn(binary, args, {
+        cwd: request.cwd, detached: false, stdio: ['ignore', 'pipe', 'pipe'],
+      });
+    } catch (error) {
+      reject(new ControlNotDispatchedError(error));
+      return;
+    }
+    let spawned = false;
+    child.once('spawn', () => { spawned = true; });
     let stdout = '';
     let stderr = '';
     let failure;
@@ -88,7 +110,11 @@ export async function runControl(input, { binary = 'flywheel', defaultCwd, signa
       if (Buffer.byteLength(stdout) > 1024 * 1024) stop(new Error('Flywheel control response exceeds 1 MiB'));
     });
     child.stderr.on('data', chunk => { stderr = (stderr + chunk).slice(-8192); });
-    child.on('error', error => { failure = error; });
+    child.on('error', error => {
+      // Node emits spawn before other events after successful process creation.
+      // Require both the missing spawn event and missing PID for positive proof.
+      failure = !spawned && child.pid === undefined ? new ControlNotDispatchedError(error) : error;
+    });
     child.on('close', (code, childSignal) => {
       clearTimeout(timer);
       clearTimeout(killTimer);

package/dist/index.js

@@ -1,4 +1,4 @@
-import { runControl } from './control.js';
+import { ControlNotDispatchedError, runControl } from './control.js';
 import { resolveFlywheelBinary } from './installation.js';
 
 export const inject = ['commands', 'tools'];
@@ -33,11 +33,25 @@ export function apply(ctx, config = {}) {
     description: '通过 Go 引擎控制 Flywheel 任务、查看实际模型配置或执行无推理环境检查。',
     input: { hint: '{"action":"doctor"} 或 {"action":"status","taskDir":"/absolute/docs/task"}' },
     async handler({ rawInput, agent, signal }) {
+      let input;
       try {
-        const value = await control(JSON.parse(rawInput), agent, signal);
+        try {
+          input = JSON.parse(rawInput);
+        } catch (error) {
+          throw new ControlNotDispatchedError(error);
+        }
+        const value = await control(input, agent, signal);
         return { kind: 'success', text: JSON.stringify(value, null, 2) };
       } catch (error) {
-        return { kind: 'error', text: error.message };
+        // CommandResult preserves only kind/text. Wrap every failure, including
+        // unknown outcomes, so a child error's text cannot impersonate host proof.
+        return { kind: 'error', text: JSON.stringify({
+          protocol: 1,
+          type: 'flywheel-control-error',
+          action: typeof input?.action === 'string' ? input.action : null,
+          dispatch: error instanceof ControlNotDispatchedError ? 'not-dispatched' : 'unknown',
+          message: error instanceof Error ? error.message : String(error),
+        }, null, 2) };
       }
     },
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckanner/dsh-plugin-flywheel",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "description": "Flywheel engine controls with owned DSH SDK and Codex Pro machine workers",
   "type": "module",
   "license": "UNLICENSED",
@@ -25,7 +25,8 @@
     "cordis.patch.yml",
     "README.md",
     "README.en.md",
-    "PROTOCOL.md"
+    "PROTOCOL.md",
+    "THIRD_PARTY_NOTICES.md"
   ],
   "dsh": {
     "bundle": {
@@ -33,9 +34,10 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-ui-chat",
+        "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-commands",
-        "@deepseek-ai/dsh-api-remotes"
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-client-locale"
       ],
       "platform": "web"
     }
@@ -66,7 +68,11 @@
     "dsh-subagent-codex-pro": "0.8.0"
   },
   "devDependencies": {
+    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.1-rc.5",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.5",
     "jsdom": "26.1.0",
+    "lightningcss": "1.33.0",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },