@spexcode/spec-cli 0.7.0-next.4 → 0.7.0-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/client.js CHANGED
@@ -132,10 +132,10 @@ const post = (body) => ({ method: 'POST', headers: { 'content-type': 'applicatio
132
132
  const seg = (id) => encodeURIComponent(id);
133
133
  // A rendezvous liveness probe can displace the real delivery client.
134
134
  function cachedStatus(rec) {
135
- if (!rec.worktreePath || !existsSync(rec.worktreePath))
136
- return 'retired';
137
135
  if (rec.archived)
138
136
  return 'offline';
137
+ if (!rec.worktreePath || !existsSync(rec.worktreePath))
138
+ return 'retired';
139
139
  if (rec.status === 'awaiting')
140
140
  return displayStatusForProposal(rec.proposal);
141
141
  return rec.status === 'active' || rec.status === 'idle' ? 'unknown' : rec.status;
@@ -179,9 +179,11 @@ export function localCachedSessions(includeArchived = false) {
179
179
  if (!state)
180
180
  continue;
181
181
  const lifecycle = state.status;
182
- const status = state.status === 'awaiting'
183
- ? displayStatusForProposal(state.proposal)
184
- : state.status === 'archived' ? 'offline' : state.status;
182
+ const status = state.status === 'archived'
183
+ ? 'offline'
184
+ : state.status === 'awaiting'
185
+ ? displayStatusForProposal(state.proposal)
186
+ : state.status;
185
187
  rows.push({
186
188
  id,
187
189
  node: null,
@@ -46,6 +46,10 @@ export declare function prepareCodexGenerationClose(root: string, sessionId: str
46
46
  export declare function repinCodexGeneration(root: string, sessionId: string, threadId: string, generationId: string): void;
47
47
  export declare function resolveCodexGenerationForResume(root: string, sessionId: string, threadId: string, start: (endpoint: CodexGenerationEndpoint) => Promise<void>): Promise<CodexGenerationEndpoint | null>;
48
48
  export declare function resolveCodexGenerationForSession(root: string, sessionId: string, threadId: string): CodexGenerationEndpoint | null;
49
+ export declare function resolveCodexGenerationForClose(root: string, sessionId: string, threadId: string): {
50
+ endpoint: CodexGenerationEndpoint;
51
+ gone: boolean;
52
+ } | null;
49
53
  export declare function codexGenerationBindingForSession(root: string, sessionId: string): CodexGenerationBinding | null;
50
54
  export declare function currentCodexGeneration(root: string): CodexGenerationEndpoint | null;
51
55
  export declare function codexGenerationEndpoints(root: string): CodexGenerationEndpoint[];
@@ -765,6 +765,18 @@ export function resolveCodexGenerationForSession(root, sessionId, threadId) {
765
765
  const generation = ledger.generations[binding.generationId];
766
766
  return generation && generation.state !== 'reclaimed' ? generation.endpoint : null;
767
767
  }
768
+ // Close still needs the immutable endpoint record to recognize a positively retired generation. The
769
+ // endpoint is never used for native I/O in this state; it only identifies the empty control plane.
770
+ export function resolveCodexGenerationForClose(root, sessionId, threadId) {
771
+ const ledger = readCodexGenerationLedger(root);
772
+ const binding = ledger.bindings[sessionId];
773
+ if (!binding || binding.threadId !== threadId)
774
+ return null;
775
+ const generation = ledger.generations[binding.generationId];
776
+ if (!generation)
777
+ return null;
778
+ return { endpoint: generation.endpoint, gone: generation.state === 'reclaimed' };
779
+ }
768
780
  export function codexGenerationBindingForSession(root, sessionId) {
769
781
  return readCodexGenerationLedger(root).bindings[sessionId] ?? null;
770
782
  }
package/dist/harness.js CHANGED
@@ -18,7 +18,7 @@ import { runtimeRoot, mainCheckout, readConfig, sessionArtifactPath, spexcodeHom
18
18
  import { git } from '@spexcode/spec-core';
19
19
  import { shQuote } from './sh.js';
20
20
  import { detachedRuntimeGenerationToken, migrateLegacyDetachedRuntimeReceipt, processStartToken, verifyDetachedRuntime } from '@spexcode/spec-core';
21
- import { codexGenerationEndpoints, codexGenerationSocketPath, currentCodexGeneration, legacyCodexGenerationEndpoint, readCodexGenerationLedger, resolveCodexGenerationForSession } from './codex-runtime-generations.js';
21
+ import { codexGenerationEndpoints, codexGenerationSocketPath, currentCodexGeneration, legacyCodexGenerationEndpoint, readCodexGenerationLedger, prepareCodexGenerationClose, resolveCodexGenerationForClose, resolveCodexGenerationForSession } from './codex-runtime-generations.js';
22
22
  import { writeFileIfChanged } from './file-write.js';
23
23
  import { claudeTranscript, codexRolloutPath, codexTranscript, opencodeTranscript, piTranscript, unsupportedTranscript } from '@spexcode/transcript';
24
24
  import { harnessIdentity, HARNESS_IDENTITIES } from '@spexcode/spec-core';
@@ -220,12 +220,14 @@ function codexMutationGeneration(dir = runtimeRoot(), endpoint = legacyCodexGene
220
220
  return codexRuntimeGeneration(dir, endpoint);
221
221
  }
222
222
  const codexDescriptorKey = (endpoint) => endpoint.id === 'legacy' ? 'codex-app-server' : `codex-app-server:${endpoint.id}`;
223
- function codexEndpointForRecord(rec, dir = runtimeRoot()) {
223
+ function codexEndpointForRecord(rec, dir = runtimeRoot(), includeGone = false) {
224
224
  if (!rec.harnessSessionId)
225
225
  return null;
226
226
  const ledger = readCodexGenerationLedger(dir);
227
227
  if (ledger.revision === 0 && !ledger.current && !Object.keys(ledger.generations).length)
228
228
  return legacyCodexGenerationEndpoint(dir);
229
+ if (includeGone)
230
+ return resolveCodexGenerationForClose(dir, rec.session, rec.harnessSessionId)?.endpoint ?? null;
229
231
  return resolveCodexGenerationForSession(dir, rec.session, rec.harnessSessionId);
230
232
  }
231
233
  // the spex launcher (bin/spex.mjs), baked into the codex launch script (mirrors materialize.ts's SPEX) so
@@ -3028,7 +3030,7 @@ export const codexHarness = {
3028
3030
  interrupt: interruptCodexTurn,
3029
3031
  cleanupRuntime: async () => { },
3030
3032
  targetDescriptorKey: (rec) => {
3031
- const endpoint = codexEndpointForRecord(rec);
3033
+ const endpoint = codexEndpointForRecord(rec, runtimeRoot(), true);
3032
3034
  return endpoint ? codexDescriptorKey(endpoint) : null;
3033
3035
  },
3034
3036
  coldRetirementPreflight: async (rec) => {
@@ -3052,8 +3054,13 @@ export const codexHarness = {
3052
3054
  coldPreflight: async (rec) => {
3053
3055
  if (!rec.harnessSessionId)
3054
3056
  return { ok: false, reason: 'no exact Codex thread identity is registered' };
3055
- const endpoint = codexEndpointForRecord(rec);
3056
- return endpoint ? codexColdPreflight(rec.harnessSessionId, runtimeRoot(), undefined, endpoint)
3057
+ const dir = runtimeRoot();
3058
+ const binding = resolveCodexGenerationForClose(dir, rec.session, rec.harnessSessionId);
3059
+ if (binding?.gone) {
3060
+ return { ok: true, alreadyCold: true };
3061
+ }
3062
+ const endpoint = binding?.endpoint ?? codexEndpointForRecord(rec, dir);
3063
+ return endpoint ? codexColdPreflight(rec.harnessSessionId, dir, undefined, endpoint)
3057
3064
  : { ok: false, reason: 'no exact Codex generation binding is registered for this target' };
3058
3065
  },
3059
3066
  coldRuntime: async (rec, suppliedReceipt) => {
@@ -3061,7 +3068,12 @@ export const codexHarness = {
3061
3068
  return { ok: false, reason: 'no exact Codex thread identity is registered' };
3062
3069
  const threadId = rec.harnessSessionId;
3063
3070
  const dir = runtimeRoot();
3064
- const endpoint = codexEndpointForRecord(rec, dir);
3071
+ const binding = resolveCodexGenerationForClose(dir, rec.session, threadId);
3072
+ if (binding?.gone) {
3073
+ prepareCodexGenerationClose(dir, rec.session, threadId);
3074
+ return { ok: true };
3075
+ }
3076
+ const endpoint = binding?.endpoint ?? codexEndpointForRecord(rec, dir);
3065
3077
  if (!endpoint)
3066
3078
  return { ok: false, reason: 'no exact Codex generation binding is registered for this target' };
3067
3079
  const sock = endpoint.socketPath;
@@ -145,6 +145,23 @@ const descendants = (root, procs) => {
145
145
  }
146
146
  return ids;
147
147
  };
148
+ // tmux is a shared host for many independent session windows. Its inherited environment is therefore
149
+ // not a launch receipt: a token on the server or one of its panes cannot charge the whole hosted tree.
150
+ const isTmuxServer = (proc) => proc?.command === 'tmux: server';
151
+ const hasTmuxAncestor = (pid, procs) => {
152
+ const seen = new Set();
153
+ let next = procs.get(pid)?.ppid;
154
+ while (next && !seen.has(next)) {
155
+ seen.add(next);
156
+ const parent = procs.get(next);
157
+ if (!parent)
158
+ return false;
159
+ if (isTmuxServer(parent))
160
+ return true;
161
+ next = parent.ppid;
162
+ }
163
+ return false;
164
+ };
148
165
  const publicRecordInventory = () => {
149
166
  const entries = listSessionIds().map(readPublicRecordEntry);
150
167
  const application = configuredSessionApplicationIfCutover();
@@ -345,13 +362,13 @@ const buildInventory = (procs, publicRecords = publicRecordInventory()) => {
345
362
  for (const p of procs.values()) {
346
363
  const acting = actingSession(p);
347
364
  const fallback = p.env.SPEXCODE_SESSION_ID;
348
- const sid = acting ?? (fallback ? byId.get(fallback) : undefined);
365
+ const sid = acting ?? (!hasTmuxAncestor(p.pid, procs) && !isTmuxServer(p) && fallback ? byId.get(fallback) : undefined);
349
366
  if (sid)
350
367
  ownership.set(p.pid, `session:${sid}`);
351
368
  }
352
369
  for (const rec of activeRecs) {
353
370
  const root = runtimePid(join(runtimeRoot(), 'sessions', rec.session_id, 'agent.pid'));
354
- if (root && procs.has(root))
371
+ if (root && procs.has(root) && !isTmuxServer(procs.get(root)))
355
372
  for (const pid of descendants(root, procs))
356
373
  if (!ownership.has(pid))
357
374
  ownership.set(pid, `session:${rec.session_id}`);
@@ -391,7 +408,7 @@ const buildInventory = (procs, publicRecords = publicRecordInventory()) => {
391
408
  }
392
409
  const root = repoRoot();
393
410
  for (const p of procs.values()) {
394
- if (ownership.has(p.pid) || p.env.SPEXCODE_PROJECT_ROOT !== root)
411
+ if (ownership.has(p.pid) || p.env.SPEXCODE_PROJECT_ROOT !== root || hasTmuxAncestor(p.pid, procs) || isTmuxServer(p))
395
412
  continue;
396
413
  const claimed = p.env.SPEXCODE_SESSION_ID;
397
414
  if (claimed && !byId.has(claimed))
@@ -471,6 +488,17 @@ const sessionStopBlocker = async (id, harnessId, recs = rawRecords(), knownProbe
471
488
  const entryTargetThread = entry.recs.find((rec) => rec.session_id === id)?.harness_session_id;
472
489
  if (entryTargetThread && ownerCounts.get(entryTargetThread) !== 1)
473
490
  return `${descriptor.label} target thread ${entryTargetThread} has no one exact governed session owner`;
491
+ // A retired shared generation is positive death, not an unknown control plane. Its residency census is
492
+ // the only proof needed here; there is no native target left to signal or unload.
493
+ if (descriptor.residency && entryTargetThread) {
494
+ let residency = null;
495
+ try {
496
+ residency = await descriptor.residency();
497
+ }
498
+ catch { /* retain the normal fail-closed path */ }
499
+ if (residency?.healthy && residency.rootAbsent === true && residency.referenceIds.length === 0)
500
+ continue;
501
+ }
474
502
  if (!knownProbes && descriptor.mutationGuard) {
475
503
  if (!targetThread)
476
504
  return `${descriptor.label} target has no exact governed thread identity`;
@@ -30,6 +30,7 @@ export declare function readSessionTranscript(c: Context): Promise<(Response & i
30
30
  readonly output?: string | undefined;
31
31
  readonly outputLines: number;
32
32
  readonly outputBytes: number;
33
+ readonly outcome?: "failed" | "rejected" | undefined;
33
34
  }[] | undefined;
34
35
  }[];
35
36
  readonly truncated: boolean;
package/dist/sessions.js CHANGED
@@ -1102,7 +1102,7 @@ export function toSession(rec, status, lv, activity = null) {
1102
1102
  const pp = prompt ? oneLinePreview(prompt) : null;
1103
1103
  const parts = { id: rec.session, name: rec.name, node: rec.node, title: rec.title, branch: rec.branch, activity: act, note: rec.note, promptPreview: pp };
1104
1104
  const harness = harnessById(rec.harness || defaultHarness.id);
1105
- return { id: rec.session, node: rec.node, branch: rec.branch, label: deriveLabel(parts), title: deriveTitle(parts), raw: { name: rec.name, title: rec.title }, path: rec.worktreePath, parent: rec.parent, harness: harness.id, capabilities: { headless: harness.headless }, launcher: rec.launcher, lifecycle: rec.status, proposal: rec.proposal, merges: rec.merges, note: rec.note, status, liveness: lv, archived: rec.archived, closedAt: rec.archived ? rec.closedAt : null, archiveHazard: null, prompt, promptPreview: pp, created: rec.createdAt, activity: act, sortKey: rec.sortKey, files: readSessionFiles(rec.session), web: readSessionWebs(rec.session), ...(rec.zcodeChildSessionIds?.length ? { zcodeChildSessionIds: [...rec.zcodeChildSessionIds] } : {}) };
1105
+ return { id: rec.session, node: rec.node, branch: rec.branch, label: deriveLabel(parts), title: deriveTitle(parts), raw: { name: rec.name, title: rec.title }, path: rec.worktreePath, parent: rec.parent, harness: harness.id, capabilities: { headless: harness.headless }, launcher: rec.launcher, lifecycle: rec.closedAt ? 'archived' : rec.status, proposal: rec.closedAt ? null : rec.proposal, merges: rec.merges, note: rec.note, status, liveness: lv, archived: rec.archived || !!rec.closedAt, closedAt: rec.closedAt, archiveHazard: null, prompt, promptPreview: pp, created: rec.createdAt, activity: act, sortKey: rec.sortKey, files: readSessionFiles(rec.session), web: readSessionWebs(rec.session), ...(rec.zcodeChildSessionIds?.length ? { zcodeChildSessionIds: [...rec.zcodeChildSessionIds] } : {}) };
1106
1106
  }
1107
1107
  // @@@zcode child identity - ZCode owns the child id and SpexCode owns the session record. The writer accepts
1108
1108
  // only their exact declared pair; names, worktrees, branches, and timestamps are deliberately not candidates.
@@ -1176,7 +1176,7 @@ export async function listArchivedSessionIndex(probe) {
1176
1176
  if (entry.kind !== 'ok')
1177
1177
  continue;
1178
1178
  const rec = fromRaw(entry.raw);
1179
- if (!rec.governed || !rec.archived)
1179
+ if (!rec.governed || (!rec.archived && !rec.closedAt))
1180
1180
  continue;
1181
1181
  const parts = {
1182
1182
  id: rec.session, name: rec.name, node: rec.node, title: rec.title, branch: rec.branch,
@@ -1305,7 +1305,11 @@ export async function listSessions(includeArchived = false) {
1305
1305
  // missing durable cold proof is also legacy: leaf liveness alone cannot prove a Codex loaded thread was
1306
1306
  // unloaded, so it remains visible until an explicit archive repair.
1307
1307
  const cleanCold = projectedRecord.archived && !changedDuringCensus.has(id) && hasValidColdProof(projectedRecord) && physical === 'offline' && (!residentRequired || resident?.healthy === true);
1308
- const projected = projectedRecord.archived && !cleanCold ? { ...projectedRecord, archived: false, stopped: false } : projectedRecord;
1308
+ // A published close is terminal public history even if a later census cannot prove the old adapter fully
1309
+ // unloaded. Only legacy archived rows without closedAt may be exposed as a working hazard for repair.
1310
+ const projected = projectedRecord.archived && !cleanCold && !projectedRecord.closedAt
1311
+ ? { ...projectedRecord, archived: false, stopped: false }
1312
+ : projectedRecord;
1309
1313
  const projectedLv = projected === projectedRecord
1310
1314
  ? sessionHarness.runtimeOwnership === 'adapter'
1311
1315
  ? adapterResidentLiveness(projectedRecord, resident)
@@ -1824,12 +1828,16 @@ export function canonicalRecordProjection(rec, canonical) {
1824
1828
  // The application row is the only lifecycle fact after cutover. A JSON status is historical envelope data,
1825
1829
  // so it must not win merely because it says waiting/error/archived while the canonical row says otherwise.
1826
1830
  if (!canonical) {
1827
- return rec;
1831
+ return ('closedAt' in rec && rec.closedAt
1832
+ ? { ...rec, archived: true }
1833
+ : rec);
1828
1834
  }
1835
+ const closed = 'closedAt' in rec && !!rec.closedAt;
1829
1836
  return {
1830
1837
  ...rec,
1831
- status: canonical.status,
1832
- proposal: canonical.proposal,
1838
+ archived: closed ? true : rec.archived,
1839
+ status: (closed ? 'archived' : canonical.status),
1840
+ proposal: (closed ? null : canonical.proposal),
1833
1841
  note: canonical.note,
1834
1842
  parent: canonical.parentSessionId,
1835
1843
  };
@@ -4789,12 +4797,25 @@ async function closeOwnedSessionUnlocked(id, wt, _source, unboundStopped = false
4789
4797
  throw new ResourceConflict(`refusing to finish close for ${id}: session record disappeared before publication`);
4790
4798
  writeRecord({
4791
4799
  ...latest,
4800
+ proposal: null,
4792
4801
  archived: true,
4793
4802
  closedAt: latest.closedAt || new Date().toISOString(),
4794
4803
  stopped: true,
4795
4804
  coldProof: latest.coldProof || coldProofFor(latest),
4796
4805
  adapterRecovery: null,
4797
4806
  });
4807
+ // The canonical lifecycle must settle at the same terminal boundary as the durable close fact. `archived`
4808
+ // is an internal terminal marker; public projections render its closed record as `retired`.
4809
+ const application = configuredSessionApplicationIfCutover();
4810
+ if (application?.readState(id)) {
4811
+ application.transitionSession(id, {
4812
+ status: 'archived',
4813
+ proposal: null,
4814
+ note: latest.note,
4815
+ parentSessionId: latest.parent,
4816
+ recipientSessionIds: canonicalWatchRecipients(application, id, 'archived'),
4817
+ });
4818
+ }
4798
4819
  let slot = null;
4799
4820
  try {
4800
4821
  slot = existsSync(wt.path) ? treeSlotDir(wt.path) : null;
@@ -5367,6 +5388,8 @@ export async function drainSession(id) {
5367
5388
  const removed = application.dequeuePendingMessage(id, msg.messageId);
5368
5389
  if (!removed || removed.messageId !== msg.messageId)
5369
5390
  throw new ResourceConflict(`canonical queue head changed while delivering ${id}`);
5391
+ if (!msg.senderSessionId)
5392
+ markHumanPromptActive(id);
5370
5393
  }
5371
5394
  });
5372
5395
  return;
@@ -5393,6 +5416,8 @@ export async function drainSession(id) {
5393
5416
  const removed = application.dequeueForRuntime(id, 'spex-governed', binding.bindingGeneration, msg.messageId);
5394
5417
  if (!removed || removed.messageId !== msg.messageId)
5395
5418
  throw new ResourceConflict(`canonical queue head changed while delivering ${id}`);
5419
+ if (!msg.senderSessionId)
5420
+ markHumanPromptActive(id);
5396
5421
  }
5397
5422
  });
5398
5423
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spexcode/spec-cli",
3
- "version": "0.7.0-next.4",
3
+ "version": "0.7.0-next.6",
4
4
  "type": "module",
5
5
  "description": "SpexCode CLI + server. The root spexcode package delegates to this compiled package; dashboard assets live in @spexcode/spec-dashboard.",
6
6
  "bin": {
@@ -35,12 +35,12 @@
35
35
  "test": "tsx --import ../scripts/test-home.mjs --test src/*.test.ts"
36
36
  },
37
37
  "dependencies": {
38
- "@spexcode/session-application": "0.7.0-next.4",
39
- "@spexcode/session-selflaunch": "0.7.0-next.4",
40
- "@spexcode/spec-core": "0.7.0-next.4",
41
- "@spexcode/spec-eval": "0.7.0-next.4",
42
- "@spexcode/spec-forge": "0.7.0-next.4",
43
- "@spexcode/transcript": "0.7.0-next.4",
38
+ "@spexcode/session-application": "0.7.0-next.6",
39
+ "@spexcode/session-selflaunch": "0.7.0-next.6",
40
+ "@spexcode/spec-core": "0.7.0-next.6",
41
+ "@spexcode/spec-eval": "0.7.0-next.6",
42
+ "@spexcode/spec-forge": "0.7.0-next.6",
43
+ "@spexcode/transcript": "0.7.0-next.6",
44
44
  "smol-toml": "^1.8.0"
45
45
  },
46
46
  "devDependencies": {