@ganglion/xacpx 0.17.0-beta.2 → 0.17.0-beta.4

package/dist/cli.js

@@ -25585,6 +25585,10 @@ function terminalIdleTimeoutSeconds(config4) {
   const v = config4.terminal?.idleTimeoutSeconds;
   return typeof v === "number" && v > 0 ? v : 900;
 }
+function terminalShell(config4) {
+  const v = config4.terminal?.shell;
+  return typeof v === "string" && v.trim() ? v : undefined;
+}
 function filesWriteEnabled(config4) {
   return config4.files?.writeEnabled === true;
 }
@@ -33889,6 +33893,7 @@ class WorkspaceFs {
         path: rel,
         content: binary ? "" : slice.toString("utf8"),
         size: info.size,
+        mtimeMs: info.mtimeMs,
         truncated: info.size > FILE_READ_CAP,
         binary
       };
@@ -33896,6 +33901,23 @@ class WorkspaceFs {
       await fh.close();
     }
   }
+  async writeFile(workspace3, relPath, content, expected) {
+    const { abs, rel } = await this.resolve(workspace3, relPath);
+    const info = await stat3(abs);
+    if (!info.isFile())
+      throw new Error("not-a-file");
+    if (info.size > FILE_READ_CAP)
+      throw new Error("file-too-large");
+    if (content.includes("\x00"))
+      throw new Error("is-binary");
+    if (Buffer.byteLength(content, "utf8") > FILE_READ_CAP)
+      throw new Error("file-too-large");
+    if (info.mtimeMs !== expected.mtimeMs || info.size !== expected.size)
+      throw new Error("stale-write");
+    await import_write_file_atomic3.default(abs, content);
+    const after = await stat3(abs);
+    return { path: rel, mtimeMs: after.mtimeMs, size: after.size };
+  }
   async search(workspace3, opts) {
     const { root, abs: base, rel: scopeRel } = await this.resolve(workspace3, opts.path);
     const query = opts.query.trim();
@@ -34276,8 +34298,9 @@ function globToRegExp(glob) {
     return /$^/;
   }
 }
-var execFileAsync, MAX_ENTRIES = 2000, FILE_READ_CAP, DIFF_CAP, GIT_MAX_BUFFER, SEARCH_MAX_RESULTS = 200, SEARCH_MAX_SCAN = 20000, SEARCH_SKIP_DIRS, SEARCH_CONTENT_MAX_HITS = 500, SEARCH_CONTENT_MAX_FILE, LINE_MATCH_CAP = 2000, DOWNLOAD_MAX, GIT_TIMEOUT_MS = 1e4, SEARCH_DEADLINE_MS = 4000, MIME_BY_EXT;
+var import_write_file_atomic3, execFileAsync, MAX_ENTRIES = 2000, FILE_READ_CAP, DIFF_CAP, GIT_MAX_BUFFER, SEARCH_MAX_RESULTS = 200, SEARCH_MAX_SCAN = 20000, SEARCH_SKIP_DIRS, SEARCH_CONTENT_MAX_HITS = 500, SEARCH_CONTENT_MAX_FILE, LINE_MATCH_CAP = 2000, DOWNLOAD_MAX, GIT_TIMEOUT_MS = 1e4, SEARCH_DEADLINE_MS = 4000, MIME_BY_EXT;
 var init_workspace_fs = __esm(() => {
+  import_write_file_atomic3 = __toESM(require_lib(), 1);
   execFileAsync = promisify(execFile);
   FILE_READ_CAP = 256 * 1024;
   DIFF_CAP = 512 * 1024;
@@ -34348,6 +34371,11 @@ class ControlService {
       throw new Error("files-write-disabled");
     return this.workspaceFs.duplicate(workspace3, path16);
   }
+  async fsWrite(workspace3, path16, content, expected) {
+    if (!this.deps.filesWriteEnabled())
+      throw new Error("files-write-disabled");
+    return this.workspaceFs.writeFile(workspace3, path16, content, expected);
+  }
   async fsDownload(workspace3, path16) {
     return this.workspaceFs.readFileBytes(workspace3, path16);
   }
@@ -34816,6 +34844,11 @@ ${chunk}` : chunk
       throw new Error("session-not-found");
     return this.deps.terminal.create({ cwd: session3.cwd, cols, rows });
   }
+  attachTerminal(terminalId) {
+    if (!this.deps.terminalEnabled())
+      throw new Error("terminal-disabled");
+    return this.deps.terminal.attach(terminalId);
+  }
   writeTerminal(terminalId, data) {
     this.deps.terminal.write(terminalId, data);
   }
@@ -34862,6 +34895,7 @@ var init_control_service = __esm(() => {
 // src/control/terminal-service.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { createRequire as createRequire6 } from "node:module";
+import { statSync as statSync3 } from "node:fs";
 import { spawn as spawnPty2 } from "node-pty";
 function scrubEnv() {
   const out = {};
@@ -34876,9 +34910,33 @@ function scrubEnv() {
   out.LANG = out.LANG ?? "en_US.UTF-8";
   return out;
 }
-function defaultShell(platform) {
-  if (process.env.SHELL)
-    return process.env.SHELL;
+function defaultExists(p) {
+  try {
+    return statSync3(p).isFile();
+  } catch {
+    return false;
+  }
+}
+function resolveShell(args) {
+  const { platform, env, shellOverride } = args;
+  const exists = args.exists ?? defaultExists;
+  if (shellOverride && shellOverride.trim())
+    return shellOverride;
+  if (platform === "win32") {
+    const pathValue = env.PATH ?? env.Path ?? "";
+    const dirs = pathValue.split(";").filter(Boolean);
+    for (const name of ["pwsh.exe", "powershell.exe"]) {
+      for (const dir of dirs) {
+        const clean = dir.replace(/^"|"$/g, "");
+        const full = `${clean}\\${name}`;
+        if (exists(full))
+          return full;
+      }
+    }
+    return env.ComSpec ?? "cmd.exe";
+  }
+  if (env.SHELL)
+    return env.SHELL;
   return platform === "darwin" ? "/bin/zsh" : "/bin/bash";
 }
 function realPtySpawn(file, args, opts) {
@@ -34886,6 +34944,26 @@ function realPtySpawn(file, args, opts) {
   ensureNodePtyHelperExecutable(helperPath);
   return spawnPty2(file, args, opts);
 }
+function appendToBuffer(session3, data) {
+  session3.buffer += data;
+  session3.bufBytes += Buffer.byteLength(data, "utf8");
+  if (session3.bufBytes <= MAX_BUFFER_BYTES)
+    return;
+  while (session3.bufBytes > MAX_BUFFER_BYTES) {
+    const nl = session3.buffer.indexOf(`
+`);
+    if (nl === -1)
+      break;
+    const removed = session3.buffer.slice(0, nl + 1);
+    session3.buffer = session3.buffer.slice(nl + 1);
+    session3.bufBytes -= Buffer.byteLength(removed, "utf8");
+  }
+  while (session3.bufBytes > MAX_BUFFER_BYTES && session3.buffer.length > 0) {
+    const ch = session3.buffer[0];
+    session3.buffer = session3.buffer.slice(1);
+    session3.bufBytes -= Buffer.byteLength(ch, "utf8");
+  }
+}
 function createTerminalService(deps) {
   const spawn12 = deps.spawn ?? realPtySpawn;
   const platform = deps.platform ?? process.platform;
@@ -34910,13 +34988,13 @@ function createTerminalService(deps) {
   };
   return {
     create({ cwd, cols, rows }) {
-      if (platform === "win32")
-        throw new Error("terminal-unsupported-platform");
+      const shell = resolveShell({ platform, env: process.env, shellOverride: deps.shell?.() });
       const terminalId = randomUUID4();
-      const handle = spawn12(defaultShell(platform), [], { name: "xterm-256color", cols, rows, cwd, env: scrubEnv() });
-      const session3 = { handle, seq: 0, idleTimer: null };
+      const handle = spawn12(shell, [], { name: "xterm-256color", cols, rows, cwd, env: scrubEnv() });
+      const session3 = { handle, seq: 0, idleTimer: null, buffer: "", bufBytes: 0 };
       sessions.set(terminalId, session3);
       handle.onData((data) => {
+        appendToBuffer(session3, data);
         deps.events.emit({ type: "terminal-output", terminalId, seq: session3.seq++, data });
       });
       handle.onExit(({ exitCode }) => {
@@ -34928,6 +35006,13 @@ function createTerminalService(deps) {
       resetIdle(terminalId);
       return { terminalId };
     },
+    attach(terminalId) {
+      const s = sessions.get(terminalId);
+      if (!s)
+        return { ok: false };
+      resetIdle(terminalId);
+      return { ok: true, buffer: s.buffer, lastSeq: s.seq - 1 };
+    },
     write(terminalId, data) {
       const s = sessions.get(terminalId);
       if (!s)
@@ -34966,7 +35051,7 @@ function createTerminalService(deps) {
     }
   };
 }
-var require5, SENSITIVE_ENV_KEYS;
+var require5, SENSITIVE_ENV_KEYS, MAX_BUFFER_BYTES;
 var init_terminal_service = __esm(() => {
   init_node_pty_helper();
   require5 = createRequire6(import.meta.url);
@@ -34984,6 +35069,7 @@ var init_terminal_service = __esm(() => {
     "GITHUB_TOKEN",
     "NPM_TOKEN"
   ];
+  MAX_BUFFER_BYTES = 256 * 1024;
 });
 
 // src/control/upload-store.ts
@@ -35661,7 +35747,8 @@ async function buildApp(paths, deps = {}) {
   const controlEvents = createControlEventBus(logger2);
   const terminalService = createTerminalService({
     events: controlEvents,
-    idleTimeoutSeconds: () => terminalIdleTimeoutSeconds(config4)
+    idleTimeoutSeconds: () => terminalIdleTimeoutSeconds(config4),
+    shell: () => terminalShell(config4)
   });
   const uploadStore = new UploadStore;
   uploadStore.cleanup();

package/dist/config/types.d.ts

@@ -47,6 +47,8 @@ export interface TerminalConfig {
     enabled: boolean;
     /** Idle seconds before a terminal PTY is auto-killed. Defaults to 900 (15 min). */
     idleTimeoutSeconds?: number;
+    /** Explicit shell override (absolute path or bare name). Cross-platform: wins over SHELL / platform default. */
+    shell?: string;
 }
 export interface FilesConfig {
     /** Default false. When false, all fs write ops (new/rename/delete/copy) are rejected
@@ -119,4 +121,5 @@ export interface AppConfig {
 }
 export declare function terminalEnabled(config: AppConfig): boolean;
 export declare function terminalIdleTimeoutSeconds(config: AppConfig): number;
+export declare function terminalShell(config: AppConfig): string | undefined;
 export declare function filesWriteEnabled(config: AppConfig): boolean;

package/dist/control/control-service.d.ts

@@ -152,6 +152,14 @@ export declare class ControlService {
     fsCopy(workspace: string, path: string): Promise<{
         path: string;
     }>;
+    fsWrite(workspace: string, path: string, content: string, expected: {
+        mtimeMs: number;
+        size: number;
+    }): Promise<{
+        path: string;
+        mtimeMs: number;
+        size: number;
+    }>;
     fsDownload(workspace: string, path: string): Promise<{
         path: string;
         base64: string;
@@ -233,6 +241,7 @@ export declare class ControlService {
     createTerminal(chatKey: string, sessionAlias: string, cols: number, rows: number): Promise<{
         terminalId: string;
     }>;
+    attachTerminal(terminalId: string): import("./terminal-service").TerminalAttachResult;
     writeTerminal(terminalId: string, data: string): void;
     resizeTerminal(terminalId: string, cols: number, rows: number): void;
     closeTerminal(terminalId: string): void;

package/dist/control/terminal-service.d.ts

@@ -27,10 +27,18 @@ export interface TerminalCreateInput {
     cols: number;
     rows: number;
 }
+export type TerminalAttachResult = {
+    ok: false;
+} | {
+    ok: true;
+    buffer: string;
+    lastSeq: number;
+};
 export interface TerminalService {
     create(input: TerminalCreateInput): {
         terminalId: string;
     };
+    attach(terminalId: string): TerminalAttachResult;
     write(terminalId: string, data: string): void;
     resize(terminalId: string, cols: number, rows: number): void;
     close(terminalId: string): void;
@@ -39,10 +47,25 @@ export interface TerminalService {
 export interface TerminalServiceDeps {
     events: ControlEventBus;
     idleTimeoutSeconds: () => number;
+    /** Optional explicit shell override from config (terminal.shell). */
+    shell?: () => string | undefined;
     spawn?: PtySpawn;
     platform?: NodeJS.Platform;
     /** Injectable timer primitives; defaults to global setTimeout/clearTimeout. */
     setTimer?: (fn: () => void, ms: number) => unknown;
     clearTimer?: (id: unknown) => void;
 }
+export interface ResolveShellArgs {
+    platform: NodeJS.Platform;
+    env: NodeJS.ProcessEnv;
+    /** Explicit override from config terminal.shell — wins on every platform. */
+    shellOverride?: string;
+    /** Injectable executable-existence predicate (defaults to fs statSync). */
+    exists?: (p: string) => boolean;
+}
+/** Pick the shell to spawn. Priority: explicit override -> platform default.
+ *  win32 deliberately ignores SHELL (git-bash sets it to an MSYS path that
+ *  node-pty can't spawn on Windows) and scans PATH for pwsh -> powershell,
+ *  falling back to %ComSpec% (cmd.exe). Never throws — always returns a value. */
+export declare function resolveShell(args: ResolveShellArgs): string;
 export declare function createTerminalService(deps: TerminalServiceDeps): TerminalService;

package/dist/control/workspace-fs.d.ts

@@ -19,6 +19,7 @@ export interface FileContent {
     path: string;
     content: string;
     size: number;
+    mtimeMs: number;
     truncated: boolean;
     binary: boolean;
 }
@@ -109,6 +110,18 @@ export declare class WorkspaceFs {
      *  "nothing ignored". Never throws. */
     private gitCheckIgnore;
     readFile(workspace: string, relPath: string): Promise<FileContent>;
+    /** Overwrite an EXISTING file's content, guarded by a stale-write token. The target must
+     *  resolve inside the workspace (realpath containment), be a regular file, and match the
+     *  caller's `{mtimeMs,size}` token — otherwise `stale-write`. Content must be UTF-8 text
+     *  (no NUL) and within the read cap. Writes atomically. Returns a fresh token. */
+    writeFile(workspace: string, relPath: string, content: string, expected: {
+        mtimeMs: number;
+        size: number;
+    }): Promise<{
+        path: string;
+        mtimeMs: number;
+        size: number;
+    }>;
     /** Find files by name (default) or content. Name mode walks relative paths
      *  breadth-first, skipping `.git`/`node_modules` and never following symlinks (so it
      *  stays contained), applying the query plus any include/exclude globs. Content mode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.17.0-beta.2",
+  "version": "0.17.0-beta.4",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",