@ganglion/xacpx 0.20.0-beta.0 → 0.20.0

package/dist/adapters/hermes-acp-shim.js

@@ -44,7 +44,6 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __promiseAll = (args) => Promise.all(args);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/adapters/hermes-shim.ts

package/dist/bridge/bridge-main.js

@@ -44,7 +44,6 @@ var __export = (target, all) => {
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __promiseAll = (args) => Promise.all(args);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/process/windows-process-identity.ts
@@ -2168,7 +2167,12 @@ async function queryWindowsProcessIdentity(pid, options = {}) {
     if (item.pid !== pid || parseCanonicalFileTime(item.creationDate) === null || typeof item.executablePath !== "string" || !item.executablePath) {
       return null;
     }
-    return { pid, creationDate: String(item.creationDate), executablePath: item.executablePath };
+    return {
+      pid,
+      creationDate: String(item.creationDate),
+      executablePath: item.executablePath,
+      ...typeof item.commandLine === "string" && item.commandLine ? { commandLine: item.commandLine } : {}
+    };
   } catch {
     return null;
   }
@@ -2345,7 +2349,18 @@ if($request.action -eq 'identity'){
   try {
     $creation=[XacpxNativeProcess]::Creation($h);$image=[XacpxNativeProcess]::Image($h)
     if(!$creation -or !$image){Write-Output (@{status='unavailable'} | ConvertTo-Json -Compress);exit 0}
-    Write-Output (@{status='found';identity=@{pid=[int]$request.pid;creationDate=$creation;executablePath=$image}} | ConvertTo-Json -Depth 4 -Compress)
+    $commandLine=$null
+    try {
+      $cim=Get-CimInstance Win32_Process -Filter ("ProcessId = "+[int]$request.pid)
+      if($cim -and $cim.CreationDate){
+        $cimCreation=$cim.CreationDate.ToUniversalTime().ToFileTimeUtc().ToString()
+        $delta=[Numerics.BigInteger]::Abs([Numerics.BigInteger]::Parse($creation)-[Numerics.BigInteger]::Parse($cimCreation))
+        if($delta -le 9 -and [string]::Equals([string]$image,[string]$cim.ExecutablePath,[StringComparison]::OrdinalIgnoreCase)){
+          $commandLine=$cim.CommandLine
+        }
+      }
+    } catch {}
+    Write-Output (@{status='found';identity=@{pid=[int]$request.pid;creationDate=$creation;executablePath=$image;commandLine=$commandLine}} | ConvertTo-Json -Depth 4 -Compress)
     exit 0
   } finally {[XacpxNativeProcess]::Close($h)}
 }
@@ -4569,13 +4584,13 @@ var init_cli = __esm(() => {
     startFailed: (detail) => `xacpx failed to start: ${detail}`,
     running: "xacpx is running",
     notRunning: "xacpx is not running",
-    indeterminate: "xacpx process is still running but status metadata is missing",
+    indeterminate: "xacpx process is still running but daemon metadata is incomplete or inconsistent",
     stopped: "xacpx stopped",
     restarting: "xacpx restarting...",
     restartNotRunning: "xacpx is not running, starting...",
     restartFailed: (detail) => `xacpx failed to restart: ${detail}`,
-    restartIndeterminate: "xacpx process is still running but status metadata is missing",
-    restartIndeterminateHint: "Run `xacpx stop` first, or manually clean up the stale PID/status before retrying.",
+    restartIndeterminate: "xacpx process is still running but daemon metadata is incomplete or inconsistent",
+    restartIndeterminateHint: "Verify the PID shown above and stop that process before retrying; do not delete runtime metadata while it is still alive.",
     checkAppLog: (path2) => `Check App Log: ${path2}`,
     checkStderrLog: (path2) => `Check Stderr: ${path2}`,
     workspaceEmpty: "No workspaces yet.",
@@ -5694,13 +5709,13 @@ var init_cli2 = __esm(() => {
     startFailed: (detail) => `xacpx 启动失败：${detail}`,
     running: "xacpx 正在运行",
     notRunning: "xacpx 未运行",
-    indeterminate: "xacpx 进程仍在运行，但状态元数据缺失",
+    indeterminate: "xacpx 进程仍在运行，但 daemon 元数据不完整或不一致",
     stopped: "xacpx 已停止",
     restarting: "xacpx 正在重启...",
     restartNotRunning: "xacpx 未运行，正在启动...",
     restartFailed: (detail) => `xacpx 重启失败：${detail}`,
-    restartIndeterminate: "xacpx 进程仍在运行，但状态元数据缺失",
-    restartIndeterminateHint: "请先执行 `xacpx stop`，或手动清理 stale PID/status 后再重试。",
+    restartIndeterminate: "xacpx 进程仍在运行，但 daemon 元数据不完整或不一致",
+    restartIndeterminateHint: "请先核对上方 PID 并停止该进程；进程仍存活时不要删除 runtime 元数据。",
     checkAppLog: (path2) => `请查看 App Log: ${path2}`,
     checkStderrLog: (path2) => `请查看 Stderr: ${path2}`,
     workspaceEmpty: "还没有工作区。",
@@ -6216,6 +6231,9 @@ function resolveDaemonPaths(options) {
 function resolveRuntimeDirFromConfigPath(configPath) {
   return join7(dirname4(configPath), "runtime");
 }
+function resolveRuntimeConsumerLockPath(runtimeDir) {
+  return join7(runtimeDir, RUNTIME_CONSUMER_LOCK_FILE);
+}
 function resolveDaemonOrchestrationSocketPath(runtimeDir, platform = process.platform) {
   return resolveOrchestrationEndpoint(runtimeDir, platform).path;
 }
@@ -6227,6 +6245,7 @@ function isProcessAlive(pid) {
     return error.code === "EPERM";
   }
 }
+var RUNTIME_CONSUMER_LOCK_FILE = "runtime-consumer.lock.json";
 var init_daemon_files = __esm(() => {
   init_core_home();
   init_orchestration_ipc();

package/dist/channels/types.d.ts

@@ -94,6 +94,17 @@ export interface ConsumerLockMetadata {
     schemaVersion?: 2;
     lockId?: string;
     processCreationDate?: string | null;
+    processStartedAtMs?: number;
+}
+/**
+ * Shared conflict shape for runtime and channel compatibility locks. Keeping
+ * it in the generic channel contract lets the console report an active owner
+ * without importing a channel-specific implementation.
+ */
+export declare class ActiveConsumerLockError extends Error {
+    readonly lockFilePath: string;
+    readonly existing: ConsumerLockMetadata;
+    constructor(message: string, lockFilePath: string, existing: ConsumerLockMetadata);
 }
 export interface ConsumerLock {
     acquire(meta: ConsumerLockMetadata): Promise<void>;