@buzzni/saycode-cli 0.4.0 → 0.5.0

package/README.md

@@ -131,7 +131,12 @@ happy agent stop <id>           # 사용자가 명시한 경우에만 현재 응
 `steer` 성공의 `accepted:true`는 세션 RPC가 요청을 받았다는 뜻이며 실제 transcript 전달 완료를
 뜻하지 않습니다(`delivered:false`). 끝난 턴의 후속 작업에는 `prompt`를 사용합니다. 사람이 시작한 세션
 (`depth` 0)은 스코프 안 모든 세션에 `steer`와 `stop`을 보낼 수 있고, spawn된 세션은 원장에 기록된 최대
-2단계 자식만 허용하며, `stop`은 보관·삭제를 하지 않습니다. 이 원장 검사는
+2단계 자식만 허용하며, `stop`은 보관·삭제를 하지 않습니다. spawn 한도(`whoami`의 `maxSpawn`)는 세션이
+도는 머신의 코어·메모리에서 산정하므로 머신마다 다르고, 최근 6시간 안의 spawn만 세는 롤링 윈도우라
+소진돼도 시간이 지나면 회복됩니다(`budgetResetsAt`, ADR-063). 데몬이 확인하지 못한 시도도 같은
+6시간을 차감합니다 — 응답만 유실됐을 뿐 세션은 만들어졌을 수 있기 때문입니다. 깊이 상한에는 이런
+회복이 없고, 에이전트 세션 안에서는 `chat`으로 **새** 대화를 시작할 수 없습니다(기존 세션 attach는
+가능). 예산과 계보를 적용하는 경로가 `agent spawn` 하나뿐이어야 하기 때문입니다. 이 원장 검사는
 같은 OS 사용자 아래의 오조작을 줄이는 advisory 가드레일이며 보안 경계나 서버 측 권한 증명은 아닙니다.
 같은 worktree에는 동시에 둘 이상의 쓰기 자식을 만들지 말고 격리가 필요하면 Desktop의 관리형
 worktree 병렬 실행을 사용하세요.

package/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createInterface } from "node:readline";
-import { homedir, tmpdir, platform } from "node:os";
+import { homedir, tmpdir, platform, totalmem, cpus } from "node:os";
 import require$$0$4, { Buffer as Buffer$1 } from "buffer";
 import require$$0 from "crypto";
 import require$$0$1 from "fs";
@@ -16,7 +16,7 @@ import require$$3$1 from "net";
 import require$$4$1 from "tls";
 import require$$0$5 from "stream";
 import require$$0$3 from "zlib";
-import { readFileSync, mkdirSync, writeFileSync, rmSync, chmodSync, constants as constants$1, appendFileSync, accessSync, statSync } from "node:fs";
+import { readFileSync, mkdirSync, writeFileSync, rmSync, chmodSync, constants as constants$1, appendFileSync, openSync, fstatSync, readSync, closeSync, accessSync, statSync } from "node:fs";
 import { dirname, join, basename, extname, delimiter } from "node:path";
 import { readFile, stat, mkdtemp, access, rm, mkdir, appendFile, writeFile, chmod } from "node:fs/promises";
 import { execFile, spawn } from "node:child_process";
@@ -40,7 +40,7 @@ function _mergeNamespaces(n, m) {
   }
   return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { value: "Module" }));
 }
-const version$1 = "0.4.0";
+const version$1 = "0.5.0";
 const manifest = {
   version: version$1
 };
@@ -271,6 +271,14 @@ const machineUsageKo = {
   "machineUsage.pollingNote": "{minutes}분 전 · 머신당 5분마다 한 번만 조회",
   "machineUsage.autoSwitched": "{provider} 계정을 자동 전환했습니다: {from} → {to}"
 };
+const hubSessionKo = {
+  "hubSession.enable": "이 대화를 프로젝트 허브로",
+  "hubSession.disable": "프로젝트 허브 해제",
+  "hubSession.hint": "같은 프로젝트의 다른 대화가 턴을 끝내거나 입력을 기다리면 이 대화에 메시지로 알려줍니다",
+  "hubSession.newSessionLabel": "이 대화를 프로젝트 허브로 시작",
+  "hubSession.newSessionHint": "다른 대화의 완료·질문을 여기로 모읍니다",
+  "hubSession.newSessionReplaces": '지금 허브는 "{title}" — 켜면 이 대화로 바뀝니다'
+};
 const taskNotificationKo = {
   "taskNotification.ariaLabel": "백그라운드 작업 알림",
   "taskNotification.status.completed": "작업 완료",
@@ -1005,7 +1013,11 @@ const memoryEventsKo = {
   "settings.memoryEvents.unavailable": "기억 대시보드가 실행 중이 아닙니다.",
   "settings.memoryEvents.searchLabel": "기억 검색",
   "settings.memoryEvents.prevPage": "이전",
-  "settings.memoryEvents.nextPage": "다음"
+  "settings.memoryEvents.nextPage": "다음",
+  "settings.memoryEvents.delete": "삭제",
+  "settings.memoryEvents.confirmDelete": "정말 삭제",
+  "settings.memoryEvents.deleteHint": "삭제한 기억은 되돌릴 수 없습니다.",
+  "settings.memoryEvents.deleteFailed": "삭제하지 못했습니다: {reason}"
 };
 const externalWorktreeInboxKo = {
   "externalWorktreeInbox.title": "앱 밖에서 만든 worktree",
@@ -1218,7 +1230,46 @@ const accountSettingsKo = {
   "settingsGroup.devices": "기기",
   "settingsGroup.app": "앱",
   "shortcuts.action.settings": "환경설정 열기",
-  "shortcuts.action.settingsDescription": "환경설정 창을 엽니다."
+  "shortcuts.action.settingsDescription": "환경설정 창을 엽니다.",
+  "accountKeyRecovery.title": "암호화된 데이터가 잠겨 있습니다",
+  "accountKeyRecovery.description": "이 데스크톱에서 암호화된 데이터를 잠금 해제하려면 E2EE 복구 키를 입력하세요. 복구 키는 이 기기를 벗어나지 않습니다.",
+  "accountKeyRecovery.label": "E2EE 복구 키",
+  "accountKeyRecovery.unavailable": "이 계정에서는 복구 키 잠금 해제를 사용할 수 없습니다.",
+  "accountKeyRecovery.invalid": "복구 키로 암호화된 데이터를 잠금 해제하지 못했습니다.",
+  "accountKeyRecovery.failed": "복구 키 잠금 해제에 실패했습니다.",
+  "accountKeyRecovery.action": "암호화된 데이터 잠금 해제",
+  "accountKeyRecovery.busy": "잠금 해제 중…",
+  "accountKeyDevice.title": "신뢰 기기",
+  "accountKeyDevice.description": "기존 신뢰 기기에서 이 데스크톱을 승인하거나 대기 중인 기기 요청을 검토하세요.",
+  "accountKeyDevice.loading": "신뢰 기기 상태를 불러오는 중…",
+  "accountKeyDevice.loadFailed": "기기 승인 상태를 불러오지 못했습니다.",
+  "accountKeyDevice.stableIdentityUnavailable": "안정적인 기기 ID를 사용할 수 없어 신뢰 기기 등록을 진행할 수 없습니다.",
+  "accountKeyDevice.secureStorageUnavailable": "보안 기기 저장소를 사용할 수 없어 신뢰 기기 등록을 진행할 수 없습니다.",
+  "accountKeyDevice.qrFailed": "기기 승인 QR을 만들지 못했습니다.",
+  "accountKeyDevice.qrAlt": "기기 승인 QR 코드",
+  "accountKeyDevice.requestFailed": "기기 승인 요청에 실패했습니다.",
+  "accountKeyDevice.pending": "신뢰 기기의 승인을 기다리고 있습니다.",
+  "accountKeyDevice.completeFailed": "기기 승인을 완료하지 못했습니다.",
+  "accountKeyDevice.approved": "이 데스크톱이 신뢰 기기로 승인되었습니다.",
+  "accountKeyDevice.cancelled": "이 기기에서 승인 요청을 취소했습니다.",
+  "accountKeyDevice.cancelFailed": "기기 승인 요청을 취소하지 못했습니다.",
+  "accountKeyDevice.requestsFailed": "대기 중인 기기 요청을 불러오지 못했습니다.",
+  "accountKeyDevice.approveFailed": "기기를 승인하지 못했습니다.",
+  "accountKeyDevice.rejectFailed": "기기 요청을 거절하지 못했습니다.",
+  "accountKeyDevice.revokeFailed": "신뢰 기기를 폐기하지 못했습니다.",
+  "accountKeyDevice.cleanupFailed": "기기는 폐기됐지만 로컬 자격 증명을 삭제하지 못했습니다.",
+  "accountKeyDevice.lockPersistFailed": "기기는 폐기됐지만 로컬 세션 잠금을 저장하지 못했습니다.",
+  "accountKeyDevice.request": "기기 승인 요청",
+  "accountKeyDevice.check": "승인 확인",
+  "accountKeyDevice.cancel": "요청 취소",
+  "accountKeyDevice.scanBefore": "{time} 전에 승인된 기기에서 이 QR을 스캔하세요.",
+  "accountKeyDevice.expires": "{time}에 만료",
+  "accountKeyDevice.approve": "기기 승인",
+  "accountKeyDevice.reject": "기기 거절",
+  "accountKeyDevice.refresh": "요청 새로 고침",
+  "accountKeyDevice.current": "현재 데스크톱",
+  "accountKeyDevice.lastUsed": "마지막 사용: {time}",
+  "accountKeyDevice.revoke": "신뢰 기기 폐기"
 };
 const projectScopeKo = {
   "projectScope.protected": "프로젝트 범위 보호됨",
@@ -1556,6 +1607,7 @@ const composerQuickCommandsKo = {
 const aiCommitPrKo = {
   "aiCommitPr.stagedCount": "스테이지된 파일 {count}개",
   "aiCommitPr.noStaged": "스테이지된 변경이 없습니다.",
+  "aiCommitPr.stagedUnknown": "스테이지된 변경을 확인하지 못했습니다.",
   "aiCommitPr.stageAll": "모든 변경 스테이지",
   "aiCommitPr.staging": "스테이지하는 중…",
   "aiCommitPr.messagePlaceholder": "커밋 메시지",
@@ -1633,6 +1685,14 @@ const connectorReadinessKo = {
   "connectorReadiness.state.unknown": "상태 미확인"
 };
 const checkpointKo = {
+  "checkpoint.activation.label": "파일 체크포인트 보호",
+  "checkpoint.activation.title": "에이전트가 파일을 변경하기 전에 세션별 체크포인트를 만듭니다.",
+  "checkpoint.activation.hint": "세션별",
+  "checkpoint.activation.unavailable.platform": "macOS에서만 지원",
+  "checkpoint.activation.unavailable.agent": "Claude와 Codex만 지원",
+  "checkpoint.activation.unavailable.sandbox": "프로젝트 샌드박스 필요",
+  "checkpoint.activation.unavailable.worktree": "작업 사본은 준비 중",
+  "checkpoint.activation.error": "파일 체크포인트 보호를 사용할 수 없습니다: {reason}",
   "checkpoint.title": "파일 체크포인트",
   "checkpoint.status.protected": "보호됨",
   "checkpoint.status.legacy": "보호되지 않음",
@@ -1793,7 +1853,7 @@ const settingsInfoStructureKo = {
   "overflowMenu.aria": "추가 액션 메뉴",
   "overflowMenu.title": "추가 액션"
 };
-const catalogExtensionsKo = { ...taskNotificationKo, ...machineUsageKo, ...completionInboxKo, ...agentBoardKo, ...fanoutLifecycleKo, ...conversationSearchKo, ...browserCookieImportKo, ...orcaPortKo, ...usageAnalyticsKo, ...outboundWebhookKo, ...scheduledAutomationsKo, ...githubTriggersKo, ...memoryHubKo, ...extensionPanelKo, ...extensionInstallKo, ...personalChatsKo, ...newSessionStarterKo, ...browserConsoleCaptureKo, ...completionSignalKo, ...agentLoopDetectionKo, ...operationModelRetryKo, ...skillCatalogKo, ...ciAutoFixKo, ...collaborationKo, ...backgroundTaskKo, ...sessionTitleKo, ...accountSettingsKo, ...projectScopeKo, ...machineSettingsConsoleKo, ...sessionTokenUsageKo, ...worktreeSetupKo, ...connectionIndicatorKo, ...voiceDictationKo, ...newSessionProfileKo, ...agentBoardBroadcastKo, ...judgementEvidenceKo, ...releaseNoteKo, ...notificationSoundKo, ...officeViewerKo, ...additionalDirectoriesKo, ...agentHandoffKo, ...sidebarUpdateKo, ...autopilotSelfReviewRoundsKo, ...aiCommitPrKo, ...externalWorktreeInboxKo, ...externalSessionVaultKo, ...orgSearchKo, ...terminalFontKo, ...globalPauseKo, ...subagentKo, ...reviewNavigationKo, ...projectLinksKo, ...projectHandoffKo, ...chatFolderUploadKo, ...composerAddMenuKo, ...composerQuickCommandsKo, ...connectorReadinessKo, ...settingsInfoStructureKo, ...localLoopKo, ...localizationGapKo, ...checkpointKo, ...memoryGuardrailsKo, ...memoryEventsKo };
+const catalogExtensionsKo = { ...taskNotificationKo, ...machineUsageKo, ...completionInboxKo, ...agentBoardKo, ...fanoutLifecycleKo, ...conversationSearchKo, ...browserCookieImportKo, ...orcaPortKo, ...usageAnalyticsKo, ...outboundWebhookKo, ...scheduledAutomationsKo, ...githubTriggersKo, ...memoryHubKo, ...extensionPanelKo, ...extensionInstallKo, ...personalChatsKo, ...newSessionStarterKo, ...browserConsoleCaptureKo, ...completionSignalKo, ...agentLoopDetectionKo, ...operationModelRetryKo, ...skillCatalogKo, ...ciAutoFixKo, ...collaborationKo, ...backgroundTaskKo, ...sessionTitleKo, ...accountSettingsKo, ...projectScopeKo, ...machineSettingsConsoleKo, ...sessionTokenUsageKo, ...worktreeSetupKo, ...connectionIndicatorKo, ...voiceDictationKo, ...newSessionProfileKo, ...agentBoardBroadcastKo, ...judgementEvidenceKo, ...releaseNoteKo, ...notificationSoundKo, ...officeViewerKo, ...additionalDirectoriesKo, ...agentHandoffKo, ...sidebarUpdateKo, ...autopilotSelfReviewRoundsKo, ...aiCommitPrKo, ...externalWorktreeInboxKo, ...externalSessionVaultKo, ...orgSearchKo, ...terminalFontKo, ...globalPauseKo, ...subagentKo, ...reviewNavigationKo, ...projectLinksKo, ...projectHandoffKo, ...chatFolderUploadKo, ...composerAddMenuKo, ...composerQuickCommandsKo, ...connectorReadinessKo, ...settingsInfoStructureKo, ...localLoopKo, ...localizationGapKo, ...checkpointKo, ...memoryGuardrailsKo, ...memoryEventsKo, ...hubSessionKo };
 const onboardingKo = {
   "boot.stage.app": "앱 준비 중…",
   "boot.stage.localRuntime": "로컬 작업공간 준비 중…",
@@ -2605,6 +2665,7 @@ const ko = {
   "gitControls.branchLoading": "Git branch 확인 중",
   "gitControls.noRemote": "origin remote 또는 branch를 찾을 수 없습니다.",
   "gitControls.checkFailed": "Git 확인 실패",
+  "gitControls.retryStatus": "다시 확인",
   "gitControls.checking": "Git 확인 중",
   "gitControls.manageBranchAria": "{branch} branch 관리",
   "gitControls.manageBranchTitle": "Branch 변경 및 생성",
@@ -3653,6 +3714,9 @@ const ko = {
   "preview.tokenUrlInvalid": "Preview 토큰 URL이 올바르지 않습니다.",
   "branchDialog.loading": "Branch 목록을 불러오는 중입니다.",
   "branchDialog.empty": "표시할 branch가 없습니다.",
+  "branchDialog.searchLabel": "브랜치 검색",
+  "branchDialog.searchPlaceholder": "브랜치 이름 검색",
+  "branchDialog.searchEmpty": "'{query}'와 일치하는 브랜치가 없습니다.",
   "branchDialog.actionsAria": "{name} 브랜치 작업",
   "branchDialog.rowAria": "{name} {meta}",
   "branchDialog.switch": "브랜치 이동",
@@ -3667,6 +3731,24 @@ const ko = {
   "branchDialog.deleteConfirm": "'{name}' 브랜치를 삭제할까요? 머지되지 않은 커밋이 있으면 Git이 거부합니다.",
   "branchDialog.deleteConfirmAction": "삭제",
   "branchDialog.cancel": "취소",
+  "branchCleanup.openAria": "병합된 브랜치 정리",
+  "branchCleanup.title": "정리 가능한 브랜치",
+  "branchCleanup.loading": "브랜치를 확인하는 중…",
+  "branchCleanup.empty": "정리 가능한 브랜치가 없습니다.",
+  "branchCleanup.scannedNote": "로컬 브랜치 {total}개 중 {count}개가 정리 가능합니다.",
+  "branchCleanup.selectAll": "모두 선택",
+  "branchCleanup.deselectAll": "모두 해제",
+  "branchCleanup.deleteSelected": "{count}개 삭제",
+  "branchCleanup.deleteFailed": "브랜치를 삭제할 수 없습니다.",
+  "branchCleanup.deletePartial": "{total}개 중 {failed}개를 삭제하지 못했습니다: {detail}",
+  "branchCleanup.loadFailed": "브랜치 확인을 실패했습니다.",
+  "branchCleanup.noBaseBranch": "기본 브랜치를 찾을 수 없습니다. origin/HEAD 를 설정하거나 프로젝트 설정에서 기본 브랜치를 지정하세요.",
+  "branchCleanup.probeIncomplete": "브랜치 정보를 완전히 읽지 못했습니다. 목록이 비어 보일 수 있으니 다시 시도하세요.",
+  "branchCleanup.demoUnsupported": "Demo 모드에서는 지원하지 않습니다.",
+  "branchCleanup.refreshAria": "브랜치 목록 새로고침",
+  "branchCleanup.squashScanning": "squash merge된 브랜치를 찾는 중…",
+  "branchCleanup.squashFailed": "squash merge 검사에 실패했습니다. 아래 목록은 일반 merge 후보만입니다.",
+  "branchCleanup.squashTag": "squash 병합",
   "message.deleteConfirm": "이 메시지를 삭제할까요? 이 작업은 새로고침 후에도 유지됩니다.",
   "message.deleteFailed": "메시지를 삭제할 수 없습니다.",
   "message.sendFailed": "메시지를 보낼 수 없습니다.",
@@ -7531,6 +7613,7 @@ function parseUnlockMethod(value2) {
   const kdfParams = parseKdfParams(method.kdfParams);
   const salt = boundedAllowEmpty(method.salt, 256);
   const wrappedMasterKey = bounded(method.wrappedMasterKey, 16384);
+  const possessionPublicKey = bounded(method.possessionPublicKey, 43);
   if (!id || !/^[A-Za-z0-9_-]+$/.test(id) || type !== "password" && type !== "recovery" && type !== "device" || !kdfAlgorithm || !kdfParams || salt === void 0 || !wrappedMasterKey) return void 0;
   const revision = method.revision;
   if (revision !== void 0 && (!Number.isSafeInteger(revision) || revision < 1)) return void 0;
@@ -7541,6 +7624,7 @@ function parseUnlockMethod(value2) {
     kdfParams,
     salt,
     wrappedMasterKey,
+    ...possessionPublicKey && /^[A-Za-z0-9_-]{43}$/.test(possessionPublicKey) ? { possessionPublicKey } : {},
     ...revision === void 0 ? {} : { revision }
   };
 }
@@ -7674,6 +7758,19 @@ async function decryptDataKeyToString(dataEncryptionKey, bundleBase64) {
     return null;
   }
 }
+async function decryptDataKeyJson(dataEncryptionKey, bundleBase64) {
+  const json = await decryptDataKeyToString(dataEncryptionKey, bundleBase64);
+  if (json === null) return null;
+  try {
+    return JSON.parse(json);
+  } catch {
+    return null;
+  }
+}
+async function decryptDataKeyRecord(dataEncryptionKey, bundleBase64) {
+  const value2 = await decryptDataKeyJson(dataEncryptionKey, bundleBase64);
+  return value2 && typeof value2 === "object" && !Array.isArray(value2) ? value2 : null;
+}
 async function encryptDataKeyContent(dataEncryptionKey, value2) {
   const nonce = nacl.randomBytes(GCM_NONCE_LENGTH);
   const key = await importGcmKey(dataEncryptionKey);
@@ -7687,6 +7784,9 @@ async function encryptDataKeyContent(dataEncryptionKey, value2) {
 }
 let candidates = [];
 let version = 0;
+function dataKeyUnwrapCandidates(accountPrivateKey, companyKeys = getCompanyKeyCandidates()) {
+  return accountPrivateKey ? [accountPrivateKey, ...companyKeys] : [];
+}
 function getCompanyKeyCandidates() {
   return candidates.map((candidate) => candidate.privateKey);
 }
@@ -7696,9 +7796,25 @@ function companyKeyChainVersion() {
 const dekBySessionId = /* @__PURE__ */ new Map();
 const lockedSessionIds = /* @__PURE__ */ new Set();
 const fingerprints = /* @__PURE__ */ new Map();
-let boundaryGeneration = 0;
+const companyUnwrappedEnvelopes = /* @__PURE__ */ new Map();
+function firstUnwrap(envelope, candidates2) {
+  for (const candidate of candidates2) {
+    const dek = unwrapDataEncryptionKey(envelope, candidate);
+    if (dek) return dek;
+  }
+  return null;
+}
+let boundaryGeneration$1 = 0;
 function sessionDekRegistryGeneration() {
-  return boundaryGeneration;
+  return boundaryGeneration$1;
+}
+function adoptSessionDek(sessionId, envelope, dek, byCompanyKey) {
+  const existing = dekBySessionId.get(sessionId);
+  if (existing && existing.length === dek.length && existing.every((byte, index) => byte === dek[index])) dek.fill(0);
+  else dekBySessionId.set(sessionId, dek);
+  lockedSessionIds.delete(sessionId);
+  if (byCompanyKey) companyUnwrappedEnvelopes.set(sessionId, envelope);
+  else companyUnwrappedEnvelopes.delete(sessionId);
 }
 function registerSessionDek(session, accountPrivateKey) {
   const envelope = session.dataEncryptionKey ?? null;
@@ -7706,6 +7822,7 @@ function registerSessionDek(session, accountPrivateKey) {
     dekBySessionId.delete(session.id);
     lockedSessionIds.delete(session.id);
     fingerprints.delete(session.id);
+    companyUnwrappedEnvelopes.delete(session.id);
     return;
   }
   const fingerprint = `${envelope}|${accountPrivateKey ? "1" : "0"}|${companyKeyChainVersion()}`;
@@ -7713,20 +7830,16 @@ function registerSessionDek(session, accountPrivateKey) {
   if (!accountPrivateKey && dekBySessionId.has(session.id) && fingerprints.get(session.id)?.startsWith(`${envelope}|1|`)) return;
   const previousFingerprint = fingerprints.get(session.id);
   fingerprints.set(session.id, fingerprint);
-  const candidates2 = accountPrivateKey ? [accountPrivateKey, ...getCompanyKeyCandidates()] : [];
-  let dek = null;
-  for (const candidate of candidates2) {
-    dek = unwrapDataEncryptionKey(envelope, candidate);
-    if (dek) break;
-  }
+  const accountDek = accountPrivateKey ? unwrapDataEncryptionKey(envelope, accountPrivateKey) : null;
+  const dek = accountDek ?? (accountPrivateKey ? firstUnwrap(envelope, getCompanyKeyCandidates()) : null);
   if (dek) {
-    dekBySessionId.set(session.id, dek);
-    lockedSessionIds.delete(session.id);
+    adoptSessionDek(session.id, envelope, dek, accountDek === null);
     return;
   }
   if (dekBySessionId.has(session.id) && previousFingerprint?.startsWith(`${envelope}|`)) return;
   dekBySessionId.delete(session.id);
   lockedSessionIds.add(session.id);
+  if (companyUnwrappedEnvelopes.has(session.id)) companyUnwrappedEnvelopes.set(session.id, envelope);
 }
 function getSessionDek(sessionId) {
   return dekBySessionId.get(sessionId) ?? null;
@@ -7768,6 +7881,60 @@ async function preDecryptSessionHeaders(sessions, accountPrivateKey, sinceGenera
     }
   }));
 }
+const machineDekById = /* @__PURE__ */ new Map();
+let boundaryGeneration = 0;
+function machineDekRegistryGeneration() {
+  return boundaryGeneration;
+}
+function discardMachineDek(machineId) {
+  machineDekById.get(machineId)?.dek.fill(0);
+  machineDekById.delete(machineId);
+}
+function machineFingerprint(envelope) {
+  return `${envelope}|${companyKeyChainVersion()}`;
+}
+async function resolveMachineDataKeyFields(record2, legacyKeys, privateKeys, scope) {
+  const discard = { machineId: record2.id, fields: null, entry: null };
+  if (!record2.dataEncryptionKey || !record2.metadata) return discard;
+  if (decryptJsonWithCandidates(record2.metadata, legacyKeys)) return discard;
+  const fingerprint = machineFingerprint(record2.dataEncryptionKey);
+  const cached = machineDekById.get(record2.id);
+  const machineKey = cached?.fingerprint === fingerprint ? cached.dek : unwrapMachineKey(record2.dataEncryptionKey, privateKeys);
+  if (!machineKey) return discard;
+  const metadata = await decryptDataKeyRecord(machineKey, record2.metadata);
+  if (!metadata) return discard;
+  const daemonState = record2.daemonState ? await decryptDataKeyRecord(machineKey, record2.daemonState) : null;
+  const entry = cached?.dek === machineKey ? cached : { dek: machineKey, scope, fingerprint };
+  entry.scope = scope;
+  return { machineId: record2.id, fields: { metadata, daemonState }, entry };
+}
+function commitMachineDek(resolved) {
+  if (resolved.entry) machineDekById.set(resolved.machineId, resolved.entry);
+  else discardMachineDek(resolved.machineId);
+}
+function unwrapMachineKey(envelope, privateKeys) {
+  for (const privateKey of privateKeys) {
+    const machineKey = unwrapDataEncryptionKey(envelope, privateKey);
+    if (machineKey) return machineKey;
+  }
+  return null;
+}
+async function decryptMachineDataKeyRows(rows, legacyKeys, options, scope, sinceGeneration = machineDekRegistryGeneration()) {
+  const none = () => rows.map(() => null);
+  if (sinceGeneration !== boundaryGeneration) return none();
+  const listed = new Set(rows.map((row2) => row2.id));
+  for (const [machineId, entry] of [...machineDekById]) {
+    if (entry.scope === scope && !listed.has(machineId)) discardMachineDek(machineId);
+  }
+  if (!options.accountPrivateKey || !rows.some((row2) => row2.dataEncryptionKey)) return none();
+  await options.dataKeyReady;
+  if (sinceGeneration !== boundaryGeneration) return none();
+  const privateKeys = dataKeyUnwrapCandidates(options.accountPrivateKey);
+  const resolved = await Promise.all(rows.map((row2) => resolveMachineDataKeyFields(row2, legacyKeys, privateKeys, scope)));
+  if (sinceGeneration !== boundaryGeneration) return none();
+  for (const entry of resolved) commitMachineDek(entry);
+  return resolved.map((entry) => entry.fields);
+}
 function buildUserTextMessageContent(input) {
   return {
     role: "user",
@@ -17951,10 +18118,10 @@ function normalizeAutomationSupport(value2) {
     ...Number.isSafeInteger(capability.keyVersion) && capability.keyVersion > 0 ? { keyVersion: capability.keyVersion } : {}
   };
 }
-function normalizeMachine(row2, candidateKeys) {
+function normalizeMachine(row2, candidateKeys, dataKeyFields = null) {
   const registry = row2.registry;
-  const decrypted = decryptJsonWithCandidates(row2.metadata, candidateKeys) ?? {};
-  const daemonState = decryptJsonWithCandidates(row2.daemonState, candidateKeys);
+  const decrypted = dataKeyFields?.metadata ?? decryptJsonWithCandidates(row2.metadata, candidateKeys) ?? {};
+  const daemonState = dataKeyFields?.daemonState ?? decryptJsonWithCandidates(row2.daemonState, candidateKeys);
   const resources = row2.resources ?? parseMachineResources(daemonState);
   const host = row2.host || registry?.host || (typeof decrypted.host === "string" ? decrypted.host : row2.id.slice(0, 8));
   const platform2 = row2.platform || registry?.platform || (typeof decrypted.platform === "string" ? decrypted.platform : "unknown");
@@ -19180,13 +19347,16 @@ class ApiClient {
   async getMachines(companyId, candidateKeys = [], options = {}) {
     const company = companyId ?? "personal";
     const statusParam = options.withStatus ? "&withStatus=1" : "";
+    const dekGeneration = machineDekRegistryGeneration();
     const data = await this.request(
       `/api/machines/list?company=${encodeURIComponent(company)}${statusParam}`,
       { boundary: "api" }
     );
     const rows = Array.isArray(data) ? data : data.machines ?? [];
     const registry = await this.fetchMachineRegistry(rows.map((row2) => row2.id));
-    return rows.map((row2) => normalizeMachine(withMachineRegistry(row2, registry), candidateKeys));
+    const enriched = rows.map((row2) => withMachineRegistry(row2, registry));
+    const dataKeyFields = await decryptMachineDataKeyRows(enriched, candidateKeys, options, company, dekGeneration);
+    return enriched.map((row2, index) => normalizeMachine(row2, candidateKeys, dataKeyFields[index]));
   }
   /**
    * Fail-open: a registry outage degrades machine names back to the daemon
@@ -21813,6 +21983,141 @@ function resumeHistoryCount(input) {
   if (!input.resuming) return 0;
   return input.since ?? DEFAULT_RESUME_HISTORY;
 }
+const AGENT_SPAWN_BUDGET_MIN = 4;
+const AGENT_SPAWN_BUDGET_MAX = 32;
+const MEMORY_BYTES_PER_AGENT = 2 * 1024 ** 3;
+const AGENTS_PER_CORE = 2;
+function machineSpawnBudget(capacity) {
+  const cores = Number.isFinite(capacity.cpuCount) ? Math.max(0, Math.floor(capacity.cpuCount)) : 0;
+  const memory = Number.isFinite(capacity.totalMemoryBytes) ? Math.max(0, capacity.totalMemoryBytes) : 0;
+  if (cores <= 0 || memory <= 0) return AGENT_SPAWN_BUDGET_MIN;
+  const budget = Math.min(Math.floor(memory / MEMORY_BYTES_PER_AGENT), cores * AGENTS_PER_CORE);
+  return Math.min(Math.max(budget, AGENT_SPAWN_BUDGET_MIN), AGENT_SPAWN_BUDGET_MAX);
+}
+function tierSpawnBudget(depth, machineBudget) {
+  return depth <= 0 ? machineBudget : Math.ceil(machineBudget / 2);
+}
+function resolveMaxSpawn(input) {
+  const tier = tierSpawnBudget(input.depth, input.machineBudget);
+  return input.policy === null ? tier : Math.min(input.policy, tier);
+}
+const SPAWN_BUDGET_WINDOW_MS = 6 * 60 * 60 * 1e3;
+function isCharged(chargedAt, now) {
+  return chargedAt > now - SPAWN_BUDGET_WINDOW_MS;
+}
+function chargeTimes(records) {
+  const byId = /* @__PURE__ */ new Map();
+  const unkeyed = [];
+  for (const record2 of records) {
+    if (record2.spawnId === void 0) {
+      unkeyed.push(record2.ts);
+      continue;
+    }
+    const seen = byId.get(record2.spawnId);
+    if (seen === void 0 || record2.ts < seen) byId.set(record2.spawnId, record2.ts);
+  }
+  return [...byId.values(), ...unkeyed];
+}
+function chargedSpawnCount(records, now) {
+  return chargeTimes(records).filter((chargedAt) => isCharged(chargedAt, now)).length;
+}
+function spawnBudgetResetsAt(records, now, maxSpawn) {
+  if (maxSpawn <= 0) return null;
+  const expiries = chargeTimes(records).filter((chargedAt) => isCharged(chargedAt, now)).map((ts) => ts + SPAWN_BUDGET_WINDOW_MS).sort((a, b) => a - b);
+  if (expiries.length < maxSpawn) return null;
+  return expiries[expiries.length - maxSpawn];
+}
+function spawnLimitDetail(input) {
+  const used = `${input.spawned}/${input.maxSpawn} used`;
+  if (input.resetsAt === null || input.resetsAt <= input.now) return used;
+  const minutes = Math.ceil((input.resetsAt - input.now) / 6e4);
+  return `${used}; the next slot frees in ${minutes} minute${minutes === 1 ? "" : "s"}`;
+}
+const AGENT_ENV_FLAG = "SAYCODE_AGENT_ENV";
+const AGENT_MAX_DEPTH = 2;
+function readOptionalNonNegativeInt(raw) {
+  if (raw === void 0 || !/^\d+$/.test(raw.trim())) return null;
+  const value2 = Number(raw.trim());
+  return Number.isSafeInteger(value2) ? value2 : null;
+}
+function normalizeDirectory(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return "";
+  const stripped = trimmed.replace(/\/+$/, "");
+  return stripped || "/";
+}
+function hasAgentMarker(env) {
+  return env[AGENT_ENV_FLAG] === "1";
+}
+function isAgentEnv(env) {
+  return hasAgentMarker(env) && normalizeDirectory(env.SAYCODE_AGENT_ROOT ?? "") !== "";
+}
+function readAgentEnv(env, machineBudget) {
+  if (!isAgentEnv(env)) return null;
+  const root = normalizeDirectory(env.SAYCODE_AGENT_ROOT ?? "");
+  const depth = readOptionalNonNegativeInt(env.SAYCODE_AGENT_DEPTH) ?? 0;
+  return {
+    root,
+    scope: normalizeDirectory(env.SAYCODE_AGENT_SCOPE ?? "") || root,
+    depth,
+    maxSpawn: resolveMaxSpawn({
+      policy: readOptionalNonNegativeInt(env.SAYCODE_AGENT_MAX_SPAWN),
+      depth,
+      machineBudget
+    }),
+    agentId: env.SAYCODE_AGENT_ID?.trim() || null,
+    sessionId: env.APLUS_SESSION_ID?.trim() || null
+  };
+}
+function spawnDecision(input) {
+  if (input.depth >= AGENT_MAX_DEPTH) return "spawn_depth_exceeded";
+  if (input.spawned >= input.maxSpawn) return "spawn_limit_exceeded";
+  return "allow";
+}
+function childAgentEnv(parent, childAgentId) {
+  return {
+    [AGENT_ENV_FLAG]: "1",
+    SAYCODE_AGENT_ROOT: parent.root,
+    SAYCODE_AGENT_SCOPE: parent.scope,
+    SAYCODE_AGENT_DEPTH: String(parent.depth + 1),
+    SAYCODE_AGENT_MAX_SPAWN: String(tierSpawnBudget(parent.depth + 1, parent.maxSpawn)),
+    SAYCODE_AGENT_ID: childAgentId
+  };
+}
+function isInScope(session, scope) {
+  if (!session.machineId || !scope.machineId) return false;
+  if (session.machineId !== scope.machineId) return false;
+  const root = normalizeDirectory(scope.root);
+  const directory = normalizeDirectory(session.directory);
+  if (!root || !directory) return false;
+  if (directory === root) return true;
+  return directory.startsWith(root === "/" ? "/" : `${root}/`);
+}
+function sessionsInScope(sessions, scope) {
+  return sessions.filter((session) => isInScope(session, scope));
+}
+function machineSettingsPaths(input) {
+  const override = input.env.SAYCODE_HAPPY_HOME?.trim();
+  const runtimeHome = input.env.HAPPY_HOME_DIR?.trim();
+  const homes = CREDENTIAL_SOURCE_ORDER.filter((source) => source !== "saycode").map((source) => `${input.homeDir}/.${source}`);
+  const ordered = [input.credentialHome?.trim(), override, runtimeHome, ...homes];
+  return [...new Set(ordered.filter((home) => Boolean(home)))].map((home) => `${home}/settings.json`.replace(/\/{2,}/g, "/"));
+}
+function readMachineId(input, readFile2) {
+  for (const path of machineSettingsPaths(input)) {
+    const raw = readFile2(path);
+    if (!raw) continue;
+    try {
+      const parsed = JSON.parse(raw);
+      if (typeof parsed?.machineId === "string" && parsed.machineId) return parsed.machineId;
+    } catch {
+    }
+  }
+  return null;
+}
+function spawnBudgetKey(env) {
+  return env.agentId ?? env.root;
+}
 const REAL_CLI_SESSION_CONNECTION_DEPS = {
   createLocalId: () => `saycode-cli-${process.pid}-${Math.random().toString(36).slice(2)}`
 };
@@ -23891,6 +24196,9 @@ async function askTemporaryLine(question) {
 }
 async function runChat(context, options, providedTransport) {
   const resuming = !!options.sessionId;
+  if (!resuming && hasAgentMarker(process.env)) {
+    throw new CliError("This session may not start a new conversation with `chat`. Use `saycode agent spawn`, which applies the spawn budget and hands the child its lineage. `chat <session-id>` to attach still works.");
+  }
   let optionPrompter = null;
   let optionInput = null;
   if (!resuming && options.promptForOptions) {
@@ -24795,6 +25103,9 @@ function waitForSessionState(options) {
   });
 }
 const AGENT_FAILURE_EXIT_CODE = 3;
+function isAgentFailure(value2) {
+  return typeof value2 === "object" && value2 !== null && "stdout" in value2;
+}
 function line(value2) {
   return `${JSON.stringify(value2)}
 `;
@@ -24927,87 +25238,6 @@ async function promptTarget(runtime, target, text2, options) {
     stream2.close();
   }
 }
-const AGENT_ENV_FLAG = "SAYCODE_AGENT_ENV";
-const AGENT_MAX_DEPTH = 2;
-const DEFAULT_AGENT_MAX_SPAWN = 4;
-const AGENT_MAX_SPAWN_CEILING = 16;
-function readNonNegativeInt(raw, fallback) {
-  if (raw === void 0) return fallback;
-  if (!/^\d+$/.test(raw.trim())) return fallback;
-  const value2 = Number(raw.trim());
-  return Number.isSafeInteger(value2) ? value2 : fallback;
-}
-function normalizeDirectory(raw) {
-  const trimmed = raw.trim();
-  if (!trimmed) return "";
-  const stripped = trimmed.replace(/\/+$/, "");
-  return stripped || "/";
-}
-function readAgentEnv(env) {
-  if (env[AGENT_ENV_FLAG] !== "1") return null;
-  const root = normalizeDirectory(env.SAYCODE_AGENT_ROOT ?? "");
-  if (!root) return null;
-  return {
-    root,
-    scope: normalizeDirectory(env.SAYCODE_AGENT_SCOPE ?? "") || root,
-    depth: readNonNegativeInt(env.SAYCODE_AGENT_DEPTH, 0),
-    maxSpawn: Math.min(
-      readNonNegativeInt(env.SAYCODE_AGENT_MAX_SPAWN, DEFAULT_AGENT_MAX_SPAWN),
-      AGENT_MAX_SPAWN_CEILING
-    ),
-    agentId: env.SAYCODE_AGENT_ID?.trim() || null,
-    sessionId: env.APLUS_SESSION_ID?.trim() || null
-  };
-}
-function spawnDecision(input) {
-  if (input.depth >= AGENT_MAX_DEPTH) return "spawn_depth_exceeded";
-  if (input.spawned >= input.maxSpawn) return "spawn_limit_exceeded";
-  return "allow";
-}
-function childAgentEnv(parent, childAgentId) {
-  return {
-    [AGENT_ENV_FLAG]: "1",
-    SAYCODE_AGENT_ROOT: parent.root,
-    SAYCODE_AGENT_SCOPE: parent.scope,
-    SAYCODE_AGENT_DEPTH: String(parent.depth + 1),
-    SAYCODE_AGENT_MAX_SPAWN: String(Math.min(parent.maxSpawn, DEFAULT_AGENT_MAX_SPAWN)),
-    SAYCODE_AGENT_ID: childAgentId
-  };
-}
-function isInScope(session, scope) {
-  if (!session.machineId || !scope.machineId) return false;
-  if (session.machineId !== scope.machineId) return false;
-  const root = normalizeDirectory(scope.root);
-  const directory = normalizeDirectory(session.directory);
-  if (!root || !directory) return false;
-  if (directory === root) return true;
-  return directory.startsWith(root === "/" ? "/" : `${root}/`);
-}
-function sessionsInScope(sessions, scope) {
-  return sessions.filter((session) => isInScope(session, scope));
-}
-function machineSettingsPaths(input) {
-  const override = input.env.SAYCODE_HAPPY_HOME?.trim();
-  const runtimeHome = input.env.HAPPY_HOME_DIR?.trim();
-  const homes = CREDENTIAL_SOURCE_ORDER.filter((source) => source !== "saycode").map((source) => `${input.homeDir}/.${source}`);
-  const ordered = [input.credentialHome?.trim(), override, runtimeHome, ...homes];
-  return [...new Set(ordered.filter((home) => Boolean(home)))].map((home) => `${home}/settings.json`.replace(/\/{2,}/g, "/"));
-}
-function readMachineId(input, readFile2) {
-  for (const path of machineSettingsPaths(input)) {
-    const raw = readFile2(path);
-    if (!raw) continue;
-    try {
-      const parsed = JSON.parse(raw);
-      if (typeof parsed?.machineId === "string" && parsed.machineId) return parsed.machineId;
-    } catch {
-    }
-  }
-  return null;
-}
-function spawnBudgetKey(env) {
-  return env.agentId ?? env.root;
-}
 function normalizeAbsolutePath(raw) {
   const trimmed = raw.trim();
   if (!trimmed.startsWith("/")) return "";
@@ -25118,6 +25348,71 @@ function buildAgentHandoffPrompt(source, context) {
     ...FIRST_ACTIONS.map((action) => `- ${action}`)
   ].join("\n");
 }
+function checkSpawnBudget(runtime, env) {
+  const key = spawnBudgetKey(env);
+  let usage;
+  try {
+    usage = runtime.countSpawns(key, env.maxSpawn);
+  } catch (error) {
+    return agentFail("spawn_limit_exceeded", `spawn ledger is unreadable, refusing: ${String(error)}`);
+  }
+  const decision = spawnDecision({ depth: env.depth, maxSpawn: env.maxSpawn, spawned: usage.spawned });
+  if (decision === "allow") return { spawned: usage.spawned, key };
+  return agentFail(decision, spawnLimitDetail({
+    spawned: usage.spawned,
+    maxSpawn: env.maxSpawn,
+    resetsAt: usage.resetsAt,
+    now: runtime.now()
+  }));
+}
+function reserveSpawn(runtime, env, key, attempt2, spawnedBefore) {
+  const spawnId = runtime.newAgentId();
+  try {
+    runtime.recordSpawn({
+      ts: runtime.now(),
+      agentKey: key,
+      root: env.scope,
+      depth: env.depth,
+      // Unknown until the daemon answers; `resolveSpawn` appends the id under
+      // the same `spawnId`, and the counter charges the pair once.
+      childSessionId: null,
+      ...env.sessionId ? { parentSessionId: env.sessionId } : {},
+      agent: attempt2.agent,
+      promptPreview: attempt2.promptPreview,
+      outcome: "failed",
+      spawnId
+    });
+  } catch (error) {
+    return agentFail("spawn_limit_exceeded", `spawn ledger is unwritable, refusing before anything is created: ${String(error)}`);
+  }
+  try {
+    if (runtime.countSpawns(key, env.maxSpawn).spawned <= spawnedBefore) {
+      return agentFail("spawn_limit_exceeded", "the spawn reservation did not land in the ledger, refusing before anything is created");
+    }
+  } catch (error) {
+    return agentFail("spawn_limit_exceeded", `spawn ledger became unreadable after reserving, refusing: ${String(error)}`);
+  }
+  return { spawnId };
+}
+function resolveSpawn(runtime, env, key, spawnId, outcome) {
+  try {
+    runtime.recordSpawn({
+      ts: runtime.now(),
+      agentKey: key,
+      root: env.scope,
+      depth: env.depth,
+      childSessionId: outcome.sessionId,
+      ...env.sessionId ? { parentSessionId: env.sessionId } : {},
+      agent: outcome.agent,
+      promptPreview: outcome.promptPreview,
+      outcome: outcome.sessionId ? "spawned" : "failed",
+      spawnId
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function fileSpawnedSessionUnderProject(runtime, sessionId, directory) {
   if (!runtime.registerSpawnedSession) return;
   try {
@@ -25163,15 +25458,9 @@ async function handoffToSibling(runtime, scope, env, handoff, agent, modelOption
   if (env.depth >= AGENT_MAX_DEPTH) {
     return agentFail("spawn_depth_exceeded", `depth ${env.depth} is already at the ceiling of ${AGENT_MAX_DEPTH}`);
   }
-  const key = spawnBudgetKey(env);
-  let spawned;
-  try {
-    spawned = runtime.countSpawns(key);
-  } catch (error) {
-    return agentFail("spawn_limit_exceeded", `spawn ledger is unreadable, refusing: ${String(error)}`);
-  }
-  const decision = spawnDecision({ depth: env.depth, maxSpawn: env.maxSpawn, spawned });
-  if (decision !== "allow") return agentFail(decision, `${spawned}/${env.maxSpawn} used`);
+  const budget = checkSpawnBudget(runtime, env);
+  if (isAgentFailure(budget)) return budget;
+  const { spawned, key } = budget;
   let prompt;
   try {
     prompt = buildHandoffPrompt(await runtime.readMessages(from, HANDOFF_READ_MESSAGES), source, agent);
@@ -25179,6 +25468,9 @@ async function handoffToSibling(runtime, scope, env, handoff, agent, modelOption
     return agentFail("handoff_context_failed", String(error));
   }
   const childId = runtime.newAgentId();
+  const preview = `handoff from ${from}`;
+  const reservation = reserveSpawn(runtime, env, key, { agent, promptPreview: preview }, spawned);
+  if (isAgentFailure(reservation)) return reservation;
   let sessionId = null;
   let spawnError = null;
   try {
@@ -25192,22 +25484,7 @@ async function handoffToSibling(runtime, scope, env, handoff, agent, modelOption
   } catch (error) {
     spawnError = error;
   }
-  try {
-    runtime.recordSpawn({
-      ts: runtime.now(),
-      agentKey: key,
-      root: env.scope,
-      depth: env.depth,
-      childSessionId: sessionId,
-      ...env.sessionId ? { parentSessionId: env.sessionId } : {},
-      agent,
-      promptPreview: `handoff from ${from}`,
-      outcome: sessionId ? "spawned" : "failed"
-    });
-  } catch (error) {
-    const created = sessionId ? `spawned ${sessionId} but ` : "";
-    return agentFail("spawn_limit_exceeded", `${created}the ledger write failed: ${String(error)}`);
-  }
+  const lineageRecorded = resolveSpawn(runtime, env, key, reservation.spawnId, { agent, promptPreview: preview, sessionId });
   if (!sessionId) {
     return agentFail("spawn_failed", `the machine daemon did not confirm a session: ${String(spawnError)}`);
   }
@@ -25219,6 +25496,7 @@ async function handoffToSibling(runtime, scope, env, handoff, agent, modelOption
     depth: env.depth + 1,
     spawned: spawned + 1,
     maxSpawn: env.maxSpawn,
+    lineageRecorded,
     handoff: { mode: "summary", from }
   });
 }
@@ -25493,7 +25771,7 @@ function cliSpawnModelOptions() {
 }
 const DEFAULT_READ_LIMIT = 20;
 function scopeOf(runtime) {
-  const env = readAgentEnv(runtime.env);
+  const env = readAgentEnv(runtime.env, runtime.machineBudget);
   if (!env) return agentFail("not_agent_env", "This command only runs inside a Saycode-spawned session.");
   const machineId = readMachineId(
     { homeDir: runtime.homeDir, env: runtime.env, credentialHome: runtime.credentialHome ?? null },
@@ -25504,9 +25782,6 @@ function scopeOf(runtime) {
   }
   return { scope: { root: env.scope, machineId }, env };
 }
-function isFailure(value2) {
-  return typeof value2 === "object" && value2 !== null && "stdout" in value2;
-}
 async function resolveTarget(runtime, scope, sessionId) {
   const sessions = await runtime.listSessions();
   const session = sessions.find((candidate) => candidate.id === sessionId);
@@ -25557,16 +25832,12 @@ async function spawnSibling(runtime, env, text2, agent, contextFiles = [], model
   if (!context.ok) {
     return context.reason === "out_of_scope" ? agentFail("out_of_scope", `${context.path} is outside ${env.scope}`) : agentFail("file_unreadable", `${context.path} could not be read`);
   }
-  const key = spawnBudgetKey(env);
-  let spawned;
-  try {
-    spawned = runtime.countSpawns(key);
-  } catch (error) {
-    return agentFail("spawn_limit_exceeded", `spawn ledger is unreadable, refusing: ${String(error)}`);
-  }
-  const decision = spawnDecision({ depth: env.depth, maxSpawn: env.maxSpawn, spawned });
-  if (decision !== "allow") return agentFail(decision, `${spawned}/${env.maxSpawn} used`);
+  const budget = checkSpawnBudget(runtime, env);
+  if (isAgentFailure(budget)) return budget;
+  const { spawned, key } = budget;
   const childId = runtime.newAgentId();
+  const reservation = reserveSpawn(runtime, env, key, { agent, promptPreview: text2 }, spawned);
+  if (isAgentFailure(reservation)) return reservation;
   let sessionId = null;
   let spawnError = null;
   try {
@@ -25580,36 +25851,34 @@ async function spawnSibling(runtime, env, text2, agent, contextFiles = [], model
   } catch (error) {
     spawnError = error;
   }
-  try {
-    runtime.recordSpawn({
-      ts: runtime.now(),
-      agentKey: key,
-      root: env.scope,
-      depth: env.depth,
-      childSessionId: sessionId,
-      ...env.sessionId ? { parentSessionId: env.sessionId } : {},
-      agent,
-      promptPreview: text2,
-      outcome: sessionId ? "spawned" : "failed"
-    });
-  } catch (error) {
-    const created = sessionId ? `spawned ${sessionId} but ` : "";
-    return agentFail("spawn_limit_exceeded", `${created}the ledger write failed: ${String(error)}`);
-  }
+  const lineageRecorded = resolveSpawn(runtime, env, key, reservation.spawnId, { agent, promptPreview: text2, sessionId });
   if (!sessionId) {
     return agentFail("spawn_failed", `the machine daemon did not confirm a session: ${String(spawnError)}`);
   }
   await fileSpawnedSessionUnderProject(runtime, sessionId, env.root);
-  return agentOk({ sessionId, agent, directory: env.root, depth: env.depth + 1, spawned: spawned + 1, maxSpawn: env.maxSpawn });
+  return agentOk({
+    sessionId,
+    agent,
+    directory: env.root,
+    depth: env.depth + 1,
+    spawned: spawned + 1,
+    maxSpawn: env.maxSpawn,
+    // False means the child runs but this session's ownership link went
+    // unwritten, so a spawned parent cannot steer or stop it.
+    lineageRecorded
+  });
 }
 async function runAgentCommand(runtime, args) {
   const context = scopeOf(runtime);
-  if (isFailure(context)) return context;
+  if (isAgentFailure(context)) return context;
   const { scope, env } = context;
   if (args.verb === "whoami") {
     let spawned = null;
+    let resetsAt = null;
     try {
-      spawned = runtime.countSpawns(spawnBudgetKey(env));
+      const usage = runtime.countSpawns(spawnBudgetKey(env), env.maxSpawn);
+      spawned = usage.spawned;
+      resetsAt = usage.resetsAt;
     } catch {
       spawned = null;
     }
@@ -25624,6 +25893,9 @@ async function runAgentCommand(runtime, args) {
       maxSpawn: env.maxSpawn,
       spawned,
       spawnsRemaining: spawned === null ? null : Math.max(0, env.maxSpawn - spawned),
+      // The budget is a rolling window, so "full" is a temporary state with a
+      // known end — an agent that is told only "0 left" would give up for good.
+      budgetResetsAt: resetsAt,
       canSpawn: env.depth < AGENT_MAX_DEPTH && spawned !== null && spawned < env.maxSpawn,
       spawnModelOptions: cliSpawnModelOptions()
     });
@@ -25635,7 +25907,7 @@ async function runAgentCommand(runtime, args) {
   if (args.verb === "spawn") {
     const agent = args.agent ?? DEFAULT_SPAWN_AGENT;
     const modelOptions = args.model !== void 0 || args.effort !== void 0 ? await validateSpawnModelOptions(agent, args.model, args.effort) : {};
-    if (isFailure(modelOptions)) return modelOptions;
+    if (isAgentFailure(modelOptions)) return modelOptions;
     if (args.handoff) {
       return handoffToSibling(runtime, scope, env, args.handoff, agent, modelOptions);
     }
@@ -25646,7 +25918,7 @@ async function runAgentCommand(runtime, args) {
   }
   if (!args.sessionId) return agentFail("session_not_found", "no session id given");
   const target = await resolveTarget(runtime, scope, args.sessionId);
-  if (isFailure(target)) return target;
+  if (isAgentFailure(target)) return target;
   switch (args.verb) {
     case "read":
       return readSession(runtime, target, args.last ?? DEFAULT_READ_LIMIT, args.since);
@@ -25681,7 +25953,7 @@ async function validateSpawnModelOptions(agent, model, effort) {
 function parseSpawnRecord(value2) {
   if (!value2 || typeof value2 !== "object" || Array.isArray(value2)) return null;
   const record2 = value2;
-  return typeof record2.ts === "number" && Number.isFinite(record2.ts) && typeof record2.agentKey === "string" && record2.agentKey.length > 0 && typeof record2.root === "string" && record2.root.length > 0 && typeof record2.depth === "number" && Number.isInteger(record2.depth) && record2.depth >= 0 && (record2.childSessionId === null || typeof record2.childSessionId === "string" && record2.childSessionId.length > 0) && (record2.parentSessionId === void 0 || typeof record2.parentSessionId === "string" && record2.parentSessionId.length > 0) && typeof record2.agent === "string" && record2.agent.length > 0 && typeof record2.promptPreview === "string" && (record2.outcome === "spawned" || record2.outcome === "failed") ? record2 : null;
+  return typeof record2.ts === "number" && Number.isFinite(record2.ts) && typeof record2.agentKey === "string" && record2.agentKey.length > 0 && typeof record2.root === "string" && record2.root.length > 0 && typeof record2.depth === "number" && Number.isInteger(record2.depth) && record2.depth >= 0 && (record2.childSessionId === null || typeof record2.childSessionId === "string" && record2.childSessionId.length > 0) && (record2.parentSessionId === void 0 || typeof record2.parentSessionId === "string" && record2.parentSessionId.length > 0) && (record2.spawnId === void 0 || typeof record2.spawnId === "string" && record2.spawnId.length > 0) && typeof record2.agent === "string" && record2.agent.length > 0 && typeof record2.promptPreview === "string" && (record2.outcome === "spawned" || record2.outcome === "failed") ? record2 : null;
 }
 const LEDGER_FILE_MODE = 384;
 const PREVIEW_MAX_LENGTH = 200;
@@ -25722,7 +25994,8 @@ function recordIdentity(record2) {
     record2.parentSessionId ?? null,
     record2.agent,
     record2.promptPreview,
-    record2.outcome
+    record2.outcome,
+    record2.spawnId ?? null
   ]);
 }
 function readSpawnRecords(homeDir, rootDir) {
@@ -25738,14 +26011,35 @@ function readSpawnRecords(homeDir, rootDir) {
     return true;
   });
 }
-function countSpawnsFor(homeDir, rootDir, agentKey) {
-  return readSpawnRecords(homeDir, rootDir).filter((record2) => record2.agentKey === agentKey).length;
+function spawnBudgetUsage(homeDir, rootDir, agentKey, now, maxSpawn) {
+  const mine = readSpawnRecords(homeDir, rootDir).filter((record2) => record2.agentKey === agentKey);
+  return {
+    spawned: chargedSpawnCount(mine, now),
+    resetsAt: spawnBudgetResetsAt(mine, now, maxSpawn)
+  };
+}
+function endsWithNewline(path) {
+  let fd;
+  try {
+    fd = openSync(path, "r");
+    const size = fstatSync(fd).size;
+    if (size === 0) return true;
+    const tail = Buffer.alloc(1);
+    readSync(fd, tail, 0, 1, size - 1);
+    return tail[0] === 10;
+  } catch (error) {
+    if (error.code === "ENOENT") return true;
+    throw error;
+  } finally {
+    if (fd !== void 0) closeSync(fd);
+  }
 }
 function appendSpawnRecord(rootDir, record2) {
   const path = agentLineagePath(rootDir);
   mkdirSync(join(rootDir, ".aplus"), { recursive: true, mode: 448 });
   const entry = { ...record2, promptPreview: record2.promptPreview.slice(0, PREVIEW_MAX_LENGTH) };
-  appendFileSync(path, `${JSON.stringify(entry)}
+  const separator = endsWithNewline(path) ? "" : "\n";
+  appendFileSync(path, `${separator}${JSON.stringify(entry)}
 `, { mode: LEDGER_FILE_MODE });
 }
 function normalize(raw) {
@@ -25947,13 +26241,16 @@ async function openStream(context, transport, sessionId) {
 }
 function createAgentRuntime(context, transport, env = process.env) {
   const keys = [decodeBase64(context.syncCredential.secret)];
-  const homeDir = context.homeDir, lineageRoot = readAgentEnv(env)?.scope ?? context.homeDir;
+  const machineBudget = machineSpawnBudget({ cpuCount: cpus().length, totalMemoryBytes: totalmem() });
+  const homeDir = context.homeDir, lineageRoot = readAgentEnv(env, machineBudget)?.scope ?? context.homeDir;
   const credentialHome = context.credential.source === "saycode" ? null : dirname(context.credential.path);
+  const now = () => Date.now();
   return {
     env,
     homeDir,
     credentialHome,
-    now: () => Date.now(),
+    machineBudget,
+    now,
     readFile: readFileOrNull,
     isReadableFile: isReadableFileSync,
     listSessions: async () => normalizeSessionRows(await context.rest.listSessions(), keys),
@@ -25989,7 +26286,7 @@ function createAgentRuntime(context, transport, env = process.env) {
       return { sessionId: result.sessionId };
     },
     newAgentId: () => randomBytes(8).toString("hex"),
-    countSpawns: (agentKey) => countSpawnsFor(homeDir, lineageRoot, agentKey),
+    countSpawns: (agentKey, maxSpawn) => spawnBudgetUsage(homeDir, lineageRoot, agentKey, now(), maxSpawn),
     recordSpawn: (record2) => appendSpawnRecord(lineageRoot, record2),
     readLineage: () => readSpawnRecords(homeDir, lineageRoot),
     steerSession: (sessionId, text2) => steerAgentSession(transport, sessionId, text2),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buzzni/saycode-cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Drive Saycode sessions across your machines from the terminal.",
   "type": "module",
   "bin": {