@omnicross/cli-launcher 0.1.10 → 0.2.1

package/dist/index.js

@@ -1,9 +1,3 @@
-import {
-  __toCommonJS,
-  init_pty_adapter,
-  pty_adapter_exports
-} from "./chunk-K7IZD73K.js";
-
 // src/supervisor.ts
 import { randomUUID } from "crypto";
 import { serializeError } from "@omnicross/core/serializeError";
@@ -83,6 +77,7 @@ function killTreeUnix(pid, graceMs) {
 // src/child-adapter.ts
 var TAG2 = "[ProcessSupervisor]";
 var IS_WIN2 = process.platform === "win32";
+var PREBUFFER_CHUNK_LIMIT = 512;
 function createChildAdapter(input) {
   const [command, ...args] = input.argv;
   if (!command) {
@@ -97,6 +92,8 @@ function createChildAdapter(input) {
     detached: !IS_WIN2
   };
   const child = cpSpawn2(command, args, opts);
+  const stdoutPump = pump(child.stdout);
+  const stderrPump = pump(child.stderr);
   const stdinMode = input.stdinMode ?? (input.input ? "pipe-closed" : "pipe-open");
   if (input.input && child.stdin) {
     child.stdin.write(input.input, () => {
@@ -111,12 +108,10 @@ function createChildAdapter(input) {
   return {
     pid: child.pid,
     onStdout(cb) {
-      child.stdout?.setEncoding("utf8");
-      child.stdout?.on("data", cb);
+      stdoutPump.subscribe(cb);
     },
     onStderr(cb) {
-      child.stderr?.setEncoding("utf8");
-      child.stderr?.on("data", cb);
+      stderrPump.subscribe(cb);
     },
     wait() {
       return new Promise((resolve) => {
@@ -145,12 +140,125 @@ function createChildAdapter(input) {
     dispose() {
       if (disposed) return;
       disposed = true;
+      stdoutPump.dispose();
+      stderrPump.dispose();
       child.stdout?.removeAllListeners();
       child.stderr?.removeAllListeners();
       child.removeAllListeners();
     }
   };
 }
+function pump(stream) {
+  const buffered = [];
+  let subscriber = null;
+  if (!stream) {
+    return { subscribe: () => {
+    }, dispose: () => {
+    } };
+  }
+  stream.setEncoding("utf8");
+  const onData = (chunk) => {
+    if (subscriber) {
+      subscriber(chunk);
+      return;
+    }
+    if (buffered.length >= PREBUFFER_CHUNK_LIMIT) buffered.shift();
+    buffered.push(chunk);
+  };
+  stream.on("data", onData);
+  return {
+    subscribe(cb) {
+      subscriber = cb;
+      const replay = buffered.splice(0, buffered.length);
+      for (const chunk of replay) cb(chunk);
+    },
+    dispose() {
+      subscriber = null;
+      buffered.length = 0;
+      stream.off("data", onData);
+      stream.resume();
+    }
+  };
+}
+
+// src/pty-adapter.ts
+import { createRequire } from "module";
+import { isAbsolute } from "path";
+var requireFromThisModule = createRequire(
+  typeof __filename === "string" && isAbsolute(__filename) ? __filename : import.meta.url
+);
+function buildPtyEnv(overlay) {
+  return overlay ? { ...process.env, ...overlay } : { ...process.env };
+}
+function createPtyAdapter(input) {
+  const nodePty = requireFromThisModule("node-pty");
+  const shell = input.shell ?? (process.platform === "win32" ? "powershell.exe" : "/bin/bash");
+  const pty = nodePty.spawn(shell, input.args ?? [], {
+    name: "xterm-256color",
+    cols: input.cols ?? 120,
+    rows: input.rows ?? 30,
+    cwd: input.cwd,
+    env: buildPtyEnv(input.env)
+  });
+  const stdoutListeners = [];
+  const stderrListeners = [];
+  const dataDisposable = pty.onData((data) => {
+    for (const cb of stdoutListeners) cb(data);
+  });
+  let exitResolve = null;
+  const exitPromise = new Promise((resolve) => {
+    exitResolve = resolve;
+  });
+  const exitDisposable = pty.onExit(({ exitCode, signal }) => {
+    exitResolve?.({ code: exitCode, signal: signal != null ? String(signal) : null });
+  });
+  let disposed = false;
+  return {
+    pid: pty.pid,
+    onStdout(cb) {
+      stdoutListeners.push(cb);
+    },
+    onStderr(cb) {
+      stderrListeners.push(cb);
+    },
+    stdin: {
+      write(data) {
+        if (!disposed) pty.write(data);
+      },
+      end() {
+        if (!disposed) pty.write("");
+      },
+      destroy() {
+      }
+    },
+    write(data) {
+      if (!disposed) pty.write(data);
+    },
+    resize(cols, rows) {
+      if (!disposed) pty.resize(cols, rows);
+    },
+    wait() {
+      return exitPromise;
+    },
+    kill(signal) {
+      if (disposed) return;
+      try {
+        pty.kill(signal);
+      } catch {
+      }
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      dataDisposable.dispose();
+      exitDisposable.dispose();
+      try {
+        pty.kill();
+      } catch {
+      }
+    }
+  };
+}
 
 // src/run-registry.ts
 var MAX_EXITED = 500;
@@ -259,7 +367,6 @@ function createProcessSupervisor() {
     let adapter;
     try {
       if (input.mode === "pty") {
-        const { createPtyAdapter } = (init_pty_adapter(), __toCommonJS(pty_adapter_exports));
         adapter = createPtyAdapter(input);
       } else {
         adapter = createChildAdapter(input);
@@ -649,6 +756,7 @@ import {
 } from "@omnicross/core/provider-proxy";
 var CODEX_PROXY_PROVIDER_NAME = "omnicross";
 var CODEX_PROXY_BASE_PATH = "/openai";
+var CODEX_IMAGE_GENERATION_CAPABILITY_MARKER = "omnicross";
 function buildCodexConfigOverrides(baseUrl) {
   const name = CODEX_PROXY_PROVIDER_NAME;
   const providerBaseUrl = `${baseUrl}${CODEX_PROXY_BASE_PATH}`;
@@ -663,6 +771,8 @@ function buildCodexConfigOverrides(baseUrl) {
     `model_providers.${name}.wire_api="responses"`,
     "-c",
     `model_providers.${name}.env_key="${ROUTE_LEASE_CODEX_TOKEN_ENV}"`,
+    "-c",
+    `model_providers.${name}.http_headers={"X-OpenAI-Actor-Authorization"="${CODEX_IMAGE_GENERATION_CAPABILITY_MARKER}"}`,
     // disable_response_storage: the CLI sends full context each turn (no
     // server-side response store) — required because the proxy upstream is
     // stateless w.r.t. Codex's response-id store (design Q3 contract).

package/dist/pty-adapter.cjs

@@ -1,10 +1,109 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-
-
-var _chunkHNYCLVZPcjs = require('./chunk-HNYCLVZP.cjs');
-_chunkHNYCLVZPcjs.init_pty_adapter.call(void 0, );
-
-
-
-exports.buildPtyEnv = _chunkHNYCLVZPcjs.buildPtyEnv; exports.createPtyAdapter = _chunkHNYCLVZPcjs.createPtyAdapter;
+// src/pty-adapter.ts
+var pty_adapter_exports = {};
+__export(pty_adapter_exports, {
+  buildPtyEnv: () => buildPtyEnv,
+  createPtyAdapter: () => createPtyAdapter
+});
+module.exports = __toCommonJS(pty_adapter_exports);
+var import_node_module = require("module");
+var import_node_path = require("path");
+var import_meta = {};
+var requireFromThisModule = (0, import_node_module.createRequire)(
+  typeof __filename === "string" && (0, import_node_path.isAbsolute)(__filename) ? __filename : import_meta.url
+);
+function buildPtyEnv(overlay) {
+  return overlay ? { ...process.env, ...overlay } : { ...process.env };
+}
+function createPtyAdapter(input) {
+  const nodePty = requireFromThisModule("node-pty");
+  const shell = input.shell ?? (process.platform === "win32" ? "powershell.exe" : "/bin/bash");
+  const pty = nodePty.spawn(shell, input.args ?? [], {
+    name: "xterm-256color",
+    cols: input.cols ?? 120,
+    rows: input.rows ?? 30,
+    cwd: input.cwd,
+    env: buildPtyEnv(input.env)
+  });
+  const stdoutListeners = [];
+  const stderrListeners = [];
+  const dataDisposable = pty.onData((data) => {
+    for (const cb of stdoutListeners) cb(data);
+  });
+  let exitResolve = null;
+  const exitPromise = new Promise((resolve) => {
+    exitResolve = resolve;
+  });
+  const exitDisposable = pty.onExit(({ exitCode, signal }) => {
+    exitResolve?.({ code: exitCode, signal: signal != null ? String(signal) : null });
+  });
+  let disposed = false;
+  return {
+    pid: pty.pid,
+    onStdout(cb) {
+      stdoutListeners.push(cb);
+    },
+    onStderr(cb) {
+      stderrListeners.push(cb);
+    },
+    stdin: {
+      write(data) {
+        if (!disposed) pty.write(data);
+      },
+      end() {
+        if (!disposed) pty.write("");
+      },
+      destroy() {
+      }
+    },
+    write(data) {
+      if (!disposed) pty.write(data);
+    },
+    resize(cols, rows) {
+      if (!disposed) pty.resize(cols, rows);
+    },
+    wait() {
+      return exitPromise;
+    },
+    kill(signal) {
+      if (disposed) return;
+      try {
+        pty.kill(signal);
+      } catch {
+      }
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      dataDisposable.dispose();
+      exitDisposable.dispose();
+      try {
+        pty.kill();
+      } catch {
+      }
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildPtyEnv,
+  createPtyAdapter
+});

package/dist/pty-adapter.js

@@ -1,9 +1,81 @@
-import {
-  buildPtyEnv,
-  createPtyAdapter,
-  init_pty_adapter
-} from "./chunk-K7IZD73K.js";
-init_pty_adapter();
+// src/pty-adapter.ts
+import { createRequire } from "module";
+import { isAbsolute } from "path";
+var requireFromThisModule = createRequire(
+  typeof __filename === "string" && isAbsolute(__filename) ? __filename : import.meta.url
+);
+function buildPtyEnv(overlay) {
+  return overlay ? { ...process.env, ...overlay } : { ...process.env };
+}
+function createPtyAdapter(input) {
+  const nodePty = requireFromThisModule("node-pty");
+  const shell = input.shell ?? (process.platform === "win32" ? "powershell.exe" : "/bin/bash");
+  const pty = nodePty.spawn(shell, input.args ?? [], {
+    name: "xterm-256color",
+    cols: input.cols ?? 120,
+    rows: input.rows ?? 30,
+    cwd: input.cwd,
+    env: buildPtyEnv(input.env)
+  });
+  const stdoutListeners = [];
+  const stderrListeners = [];
+  const dataDisposable = pty.onData((data) => {
+    for (const cb of stdoutListeners) cb(data);
+  });
+  let exitResolve = null;
+  const exitPromise = new Promise((resolve) => {
+    exitResolve = resolve;
+  });
+  const exitDisposable = pty.onExit(({ exitCode, signal }) => {
+    exitResolve?.({ code: exitCode, signal: signal != null ? String(signal) : null });
+  });
+  let disposed = false;
+  return {
+    pid: pty.pid,
+    onStdout(cb) {
+      stdoutListeners.push(cb);
+    },
+    onStderr(cb) {
+      stderrListeners.push(cb);
+    },
+    stdin: {
+      write(data) {
+        if (!disposed) pty.write(data);
+      },
+      end() {
+        if (!disposed) pty.write("");
+      },
+      destroy() {
+      }
+    },
+    write(data) {
+      if (!disposed) pty.write(data);
+    },
+    resize(cols, rows) {
+      if (!disposed) pty.resize(cols, rows);
+    },
+    wait() {
+      return exitPromise;
+    },
+    kill(signal) {
+      if (disposed) return;
+      try {
+        pty.kill(signal);
+      } catch {
+      }
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      dataDisposable.dispose();
+      exitDisposable.dispose();
+      try {
+        pty.kill();
+      } catch {
+      }
+    }
+  };
+}
 export {
   buildPtyEnv,
   createPtyAdapter

package/dist/types.cjs

@@ -1 +1,18 @@
-"use strict";
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,58 +1,59 @@
-{
-  "name": "@omnicross/cli-launcher",
-  "version": "0.1.10",
-  "description": "Omnicross CLI-launcher — the ProcessSupervisor subprocess-lifecycle mechanism + per-CLI proxy-env wiring.",
-  "license": "MIT",
-  "author": "Sayo (https://github.com/Dumoedss)",
-  "homepage": "https://github.com/Dumoedss/omnicross#readme",
-  "keywords": [
-    "omnicross",
-    "cli",
-    "process-supervisor",
-    "subprocess",
-    "proxy"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Dumoedss/omnicross.git",
-    "directory": "packages/cli-launcher"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "type": "module",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./*": {
-      "types": "./dist/*.d.ts",
-      "import": "./dist/*.js",
-      "require": "./dist/*.cjs"
-    }
-  },
-  "files": [
-    "dist",
-    "LICENSE",
-    "NOTICE",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
-  },
-  "dependencies": {
-    "@omnicross/core": "^0.1.0"
-  },
-  "optionalDependencies": {
-    "node-pty": "npm:@karinjs/node-pty@^1.1.3"
-  }
-}
+{
+  "name": "@omnicross/cli-launcher",
+  "version": "0.2.1",
+  "description": "Omnicross CLI-launcher — the ProcessSupervisor subprocess-lifecycle mechanism + per-CLI proxy-env wiring.",
+  "license": "MIT",
+  "author": "Sayo (https://github.com/Dumoedss)",
+  "homepage": "https://github.com/Dumoedss/omnicross#readme",
+  "keywords": [
+    "omnicross",
+    "cli",
+    "process-supervisor",
+    "subprocess",
+    "proxy"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/DumoeDss/omnicross",
+    "directory": "packages/cli-launcher"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
+    }
+  },
+  "files": [
+    "dist",
+    "LICENSE",
+    "NOTICE",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "postbuild": "node scripts/smoke-dist.cjs",
+    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
+  },
+  "dependencies": {
+    "@omnicross/core": "^0.2.1"
+  },
+  "optionalDependencies": {
+    "node-pty": "npm:@karinjs/node-pty@^1.1.3"
+  }
+}