acpx 0.1.8 → 0.1.9

package/dist/cli.d.ts

@@ -10,7 +10,7 @@ type SessionHistoryEntry = {
 type SessionRecord = {
     id: string;
     sessionId: string;
-    runtimeSessionId?: string;
+    agentSessionId?: string;
     agentCommand: string;
     cwd: string;
     name?: string;

package/dist/cli.js

@@ -1715,14 +1715,9 @@ function classifyPermissionDecision(params, response) {
   return "denied";
 }
 
-// src/runtime-session-id.ts
-var RUNTIME_SESSION_ID_META_KEYS = [
-  "runtimeSessionId",
-  "providerSessionId",
-  "codexSessionId",
-  "claudeSessionId"
-];
-function normalizeRuntimeSessionId(value) {
+// src/agent-session-id.ts
+var AGENT_SESSION_ID_META_KEYS = ["agentSessionId", "sessionId"];
+function normalizeAgentSessionId(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -1735,13 +1730,13 @@ function asMetaRecord(meta) {
   }
   return meta;
 }
-function extractRuntimeSessionId(meta) {
+function extractAgentSessionId(meta) {
   const record = asMetaRecord(meta);
   if (!record) {
     return void 0;
   }
-  for (const key of RUNTIME_SESSION_ID_META_KEYS) {
-    const normalized = normalizeRuntimeSessionId(record[key]);
+  for (const key of AGENT_SESSION_ID_META_KEYS) {
+    const normalized = normalizeAgentSessionId(record[key]);
     if (normalized) {
       return normalized;
     }
@@ -2409,7 +2404,7 @@ var AcpClient = class {
     });
     return {
       sessionId: result.sessionId,
-      runtimeSessionId: extractRuntimeSessionId(result._meta)
+      agentSessionId: extractAgentSessionId(result._meta)
     };
   }
   async loadSession(sessionId, cwd = this.options.cwd) {
@@ -2435,7 +2430,7 @@ var AcpClient = class {
       this.suppressSessionUpdates = previousSuppression;
     }
     return {
-      runtimeSessionId: extractRuntimeSessionId(response?._meta)
+      agentSessionId: extractAgentSessionId(response?._meta)
     };
   }
   async prompt(sessionId, text) {
@@ -4244,7 +4239,7 @@ function parseSessionRecord(raw) {
     return null;
   }
   const record = raw;
-  const runtimeSessionId = normalizeRuntimeSessionId(record.runtimeSessionId);
+  const agentSessionId = normalizeAgentSessionId(record.agentSessionId);
   const name = record.name == null ? void 0 : typeof record.name === "string" && record.name.trim().length > 0 ? record.name.trim() : null;
   const pid = record.pid == null ? void 0 : Number.isInteger(record.pid) && record.pid > 0 ? record.pid : null;
   const closed = record.closed == null ? false : typeof record.closed === "boolean" ? record.closed : null;
@@ -4267,7 +4262,7 @@ function parseSessionRecord(raw) {
     ...record,
     id: record.id,
     sessionId: record.sessionId,
-    runtimeSessionId,
+    agentSessionId,
     agentCommand: record.agentCommand,
     cwd: record.cwd,
     name,
@@ -4660,12 +4655,12 @@ function applyLifecycleSnapshotToRecord(record, snapshot) {
   record.lastAgentExitAt = void 0;
   record.lastAgentDisconnectReason = void 0;
 }
-function reconcileRuntimeSessionId(record, runtimeSessionId) {
-  const normalized = normalizeRuntimeSessionId(runtimeSessionId);
+function reconcileAgentSessionId(record, agentSessionId) {
+  const normalized = normalizeAgentSessionId(agentSessionId);
   if (!normalized) {
     return;
   }
-  record.runtimeSessionId = normalized;
+  record.agentSessionId = normalized;
 }
 function shouldFallbackToNewSession(error) {
   if (error instanceof TimeoutError || error instanceof InterruptedError) {
@@ -4709,7 +4704,7 @@ async function connectAndLoadSession(options) {
         }),
         options.timeoutMs
       );
-      reconcileRuntimeSessionId(record, loadResult.runtimeSessionId);
+      reconcileAgentSessionId(record, loadResult.agentSessionId);
       resumed = true;
     } catch (error) {
       loadError = formatErrorMessage(error);
@@ -4722,7 +4717,7 @@ async function connectAndLoadSession(options) {
       );
       sessionId = createdSession.sessionId;
       record.sessionId = sessionId;
-      reconcileRuntimeSessionId(record, createdSession.runtimeSessionId);
+      reconcileAgentSessionId(record, createdSession.agentSessionId);
     }
   } else {
     const createdSession = await withTimeout(
@@ -4731,12 +4726,12 @@ async function connectAndLoadSession(options) {
     );
     sessionId = createdSession.sessionId;
     record.sessionId = sessionId;
-    reconcileRuntimeSessionId(record, createdSession.runtimeSessionId);
+    reconcileAgentSessionId(record, createdSession.agentSessionId);
   }
   options.onSessionIdResolved?.(sessionId);
   return {
     sessionId,
-    runtimeSessionId: record.runtimeSessionId,
+    agentSessionId: record.agentSessionId,
     resumed,
     loadError
   };
@@ -5139,7 +5134,7 @@ async function createSession(options) {
         const record = {
           id: sessionId,
           sessionId,
-          runtimeSessionId: createdSession.runtimeSessionId,
+          agentSessionId: createdSession.agentSessionId,
           agentCommand: options.agentCommand,
           cwd: absolutePath(options.cwd),
           name: normalizeName(options.name),
@@ -5717,8 +5712,22 @@ function resolveAgentInvocation(explicitAgentName, globalFlags, config) {
 }
 function printSessionsByFormat(sessions, format) {
   if (format === "json") {
-    process.stdout.write(`${JSON.stringify(sessions)}
-`);
+    process.stdout.write(
+      `${JSON.stringify(
+        sessions.map((session) => {
+          const { id, sessionId, agentSessionId, ...rest } = session;
+          return {
+            ...rest,
+            ...canonicalSessionIdentity({
+              id,
+              sessionId,
+              agentSessionId
+            })
+          };
+        })
+      )}
+`
+    );
     return;
   }
   if (format === "quiet") {
@@ -5746,8 +5755,7 @@ function printClosedSessionByFormat(record, format) {
     process.stdout.write(
       `${JSON.stringify({
         type: "session_closed",
-        id: record.id,
-        sessionId: record.sessionId,
+        ...canonicalSessionIdentity(record),
         name: record.name
       })}
 `
@@ -5760,23 +5768,22 @@ function printClosedSessionByFormat(record, format) {
   process.stdout.write(`${record.id}
 `);
 }
-function runtimeSessionIdPayload(runtimeSessionId) {
-  const normalized = normalizeRuntimeSessionId(runtimeSessionId);
-  if (!normalized) {
-    return {};
-  }
-  return { runtimeSessionId: normalized };
+function canonicalSessionIdentity(record) {
+  const normalizedAgentSessionId = normalizeAgentSessionId(record.agentSessionId);
+  return {
+    acpxRecordId: record.id,
+    acpxSessionId: record.sessionId,
+    ...normalizedAgentSessionId ? { agentSessionId: normalizedAgentSessionId } : {}
+  };
 }
 function printNewSessionByFormat(record, replaced, format) {
   if (format === "json") {
     process.stdout.write(
       `${JSON.stringify({
         type: "session_created",
-        id: record.id,
-        sessionId: record.sessionId,
+        ...canonicalSessionIdentity(record),
         name: record.name,
-        replacedSessionId: replaced?.id,
-        ...runtimeSessionIdPayload(record.runtimeSessionId)
+        ...replaced ? { replacedAcpxRecordId: replaced.id } : {}
       })}
 `
     );
@@ -5800,11 +5807,9 @@ function printEnsuredSessionByFormat(record, created, format) {
     process.stdout.write(
       `${JSON.stringify({
         type: "session_ensured",
-        id: record.id,
-        sessionId: record.sessionId,
+        ...canonicalSessionIdentity(record),
         name: record.name,
-        created,
-        ...runtimeSessionIdPayload(record.runtimeSessionId)
+        created
       })}
 `
     );
@@ -5824,7 +5829,7 @@ function printQueuedPromptByFormat(result, format) {
     process.stdout.write(
       `${JSON.stringify({
         type: "queued",
-        sessionId: result.sessionId,
+        acpxRecordId: result.sessionId,
         requestId: result.requestId
       })}
 `
@@ -5981,8 +5986,13 @@ async function handleExec(explicitAgentName, promptParts, flags, command, config
 }
 function printCancelResultByFormat(result, format) {
   if (format === "json") {
-    process.stdout.write(`${JSON.stringify(result)}
-`);
+    process.stdout.write(
+      `${JSON.stringify({
+        acpxRecordId: result.sessionId || null,
+        cancelled: result.cancelled
+      })}
+`
+    );
     return;
   }
   if (result.cancelled) {
@@ -5995,7 +6005,7 @@ function printSetModeResultByFormat(modeId, result, format) {
   if (format === "json") {
     process.stdout.write(
       `${JSON.stringify({
-        sessionId: result.record.id,
+        ...canonicalSessionIdentity(result.record),
         modeId,
         resumed: result.resumed
       })}
@@ -6015,7 +6025,7 @@ function printSetConfigOptionResultByFormat(configId, value, result, format) {
   if (format === "json") {
     process.stdout.write(
       `${JSON.stringify({
-        sessionId: result.record.id,
+        ...canonicalSessionIdentity(result.record),
         configId,
         value,
         resumed: result.resumed,
@@ -6207,8 +6217,18 @@ async function handleSessionsEnsure(explicitAgentName, flags, command, config) {
 }
 function printSessionDetailsByFormat(record, format) {
   if (format === "json") {
-    process.stdout.write(`${JSON.stringify(record)}
-`);
+    const { id, sessionId, agentSessionId, ...rest } = record;
+    process.stdout.write(
+      `${JSON.stringify({
+        ...rest,
+        ...canonicalSessionIdentity({
+          id,
+          sessionId,
+          agentSessionId
+        })
+      })}
+`
+    );
     return;
   }
   if (format === "quiet") {
@@ -6216,11 +6236,11 @@ function printSessionDetailsByFormat(record, format) {
 `);
     return;
   }
-  process.stdout.write(`id: ${record.id}
+  process.stdout.write(`acpxRecordId: ${record.id}
 `);
-  process.stdout.write(`sessionId: ${record.sessionId}
+  process.stdout.write(`acpxSessionId: ${record.sessionId}
 `);
-  process.stdout.write(`runtimeSessionId: ${record.runtimeSessionId ?? "-"}
+  process.stdout.write(`agentSessionId: ${record.agentSessionId ?? "-"}
 `);
   process.stdout.write(`agent: ${record.agentCommand}
 `);
@@ -6261,8 +6281,7 @@ function printSessionHistoryByFormat(record, limit, format) {
   if (format === "json") {
     process.stdout.write(
       `${JSON.stringify({
-        id: record.id,
-        sessionId: record.sessionId,
+        ...canonicalSessionIdentity(record),
         limit,
         count: visible.length,
         entries: visible
@@ -6348,7 +6367,9 @@ async function handleStatus(explicitAgentName, flags, command, config) {
   });
   if (!record) {
     const payload2 = {
-      sessionId: null,
+      acpxRecordId: null,
+      acpxSessionId: null,
+      agentSessionId: null,
       agentCommand: agent.agentCommand,
       pid: null,
       status: "no-session",
@@ -6382,15 +6403,14 @@ async function handleStatus(explicitAgentName, flags, command, config) {
   }
   const running = isProcessAlive(record.pid);
   const payload = {
-    sessionId: record.id,
+    ...canonicalSessionIdentity(record),
     agentCommand: record.agentCommand,
     pid: record.pid ?? null,
     status: running ? "running" : "dead",
     uptime: running ? formatUptime(record.agentStartedAt) ?? null : null,
     lastPromptTime: record.lastPromptAt ?? null,
     exitCode: running ? null : record.lastAgentExitCode ?? null,
-    signal: running ? null : record.lastAgentExitSignal ?? null,
-    ...runtimeSessionIdPayload(record.runtimeSessionId)
+    signal: running ? null : record.lastAgentExitSignal ?? null
   };
   if (globalFlags.format === "json") {
     process.stdout.write(`${JSON.stringify(payload)}
@@ -6402,12 +6422,12 @@ async function handleStatus(explicitAgentName, flags, command, config) {
 `);
     return;
   }
-  process.stdout.write(`session: ${payload.sessionId}
+  process.stdout.write(`acpxRecordId: ${payload.acpxRecordId}
 `);
-  if ("runtimeSessionId" in payload) {
-    process.stdout.write(`runtimeSessionId: ${payload.runtimeSessionId}
+  process.stdout.write(`acpxSessionId: ${payload.acpxSessionId}
+`);
+  process.stdout.write(`agentSessionId: ${payload.agentSessionId ?? "-"}
 `);
-  }
   process.stdout.write(`agent: ${payload.agentCommand}
 `);
   process.stdout.write(`pid: ${payload.pid ?? "-"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acpx",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Headless CLI client for the Agent Client Protocol (ACP) — talk to coding agents from the command line",
   "type": "module",
   "files": [