orkestrator 2.34.4-beta → 2.35.0-beta

package/dist/client.js

@@ -147,13 +147,16 @@ __export(exports_standalone_service, {
   STANDALONE_MAX_BOOT_ATTEMPTS: () => STANDALONE_MAX_BOOT_ATTEMPTS,
   STANDALONE_PACKAGE: () => STANDALONE_PACKAGE,
   activateRelease: () => activateRelease,
+  effectiveServiceArguments: () => effectiveServiceArguments,
   installLauncher: () => installLauncher,
   installRelease: () => installRelease,
   isNewerVersion: () => isNewerVersion,
   linkedVersion: () => linkedVersion,
+  nextRollbackTarget: () => nextRollbackTarget,
   readLauncherState: () => readLauncherState,
   readReleaseManifest: () => readReleaseManifest,
   readServiceConfig: () => readServiceConfig,
+  readStartupFailure: () => readStartupFailure,
   readText: () => readText,
   releaseDirectory: () => releaseDirectory,
   releaseEntry: () => releaseEntry,
@@ -202,9 +205,31 @@ function readServiceConfig(layout) {
     bun: value.bun,
     bunVersion: typeof value.bunVersion === "string" ? value.bunVersion : "",
     args: value.args.filter((arg) => typeof arg === "string"),
+    ...typeof value.rollbackTarget?.version === "string" && Array.isArray(value.rollbackTarget.args) ? {
+      rollbackTarget: {
+        version: value.rollbackTarget.version,
+        args: value.rollbackTarget.args.filter((arg) => typeof arg === "string")
+      }
+    } : {},
+    ...typeof value.installGeneration === "string" ? { installGeneration: value.installGeneration } : {},
     installedAt: typeof value.installedAt === "string" ? value.installedAt : ""
   };
 }
+function nextRollbackTarget(layout, config, before, version) {
+  if (!config || !before)
+    return;
+  const target = config.rollbackTarget;
+  if (before === version)
+    return target?.version === version ? undefined : target;
+  return {
+    version: before,
+    args: effectiveServiceArguments(config, before, linkedVersion(layout.previous))
+  };
+}
+function effectiveServiceArguments(config, current, previous) {
+  const target = config?.rollbackTarget;
+  return target && target.version === current && previous === current ? target.args : config?.args ?? [];
+}
 async function writeServiceConfig(layout, config) {
   await mkdir(layout.root, { recursive: true });
   await writeAtomically(layout.serviceFile, `${JSON.stringify(config, null, 2)}
@@ -213,13 +238,30 @@ async function writeServiceConfig(layout, config) {
 function readLauncherState(layout) {
   const value = readJson(layout.stateFile);
   const rollback = value?.rollback;
+  const bootFailure = value?.bootFailure;
   return {
     version: 1,
+    ...typeof value?.installGeneration === "string" ? { installGeneration: value.installGeneration } : {},
     lastReadyVersion: typeof value?.lastReadyVersion === "string" ? value.lastReadyVersion : null,
     bootAttempts: value?.bootAttempts && typeof value.bootAttempts === "object" ? value.bootAttempts : {},
-    rollback: rollback && typeof rollback.failedVersion === "string" && typeof rollback.restoredVersion === "string" && typeof rollback.at === "string" ? rollback : null
+    rollback: rollback && typeof rollback.failedVersion === "string" && typeof rollback.restoredVersion === "string" && typeof rollback.at === "string" ? rollback : null,
+    bootFailure: bootFailure && typeof bootFailure.version === "string" && typeof bootFailure.exits === "number" && typeof bootFailure.at === "string" ? bootFailure : null
   };
 }
+function readStartupFailure(layout, version, sinceMs, installGeneration) {
+  const state = readLauncherState(layout);
+  const rollback = state.rollback;
+  if (rollback?.failedVersion === version && (installGeneration === undefined || rollback.installGeneration === installGeneration) && Date.parse(rollback.at) >= sinceMs) {
+    return { restoredVersion: rollback.restoredVersion };
+  }
+  const failure = state.bootFailure;
+  if (failure?.version !== version || installGeneration !== undefined && failure.installGeneration !== installGeneration || failure.exits < STANDALONE_MAX_BOOT_ATTEMPTS || Date.parse(failure.at) < sinceMs) {
+    return null;
+  }
+  const previous = linkedVersion(layout.previous);
+  const rollbackComing = previous && previous !== version && state.lastReadyVersion !== version;
+  return rollbackComing ? null : { restoredVersion: null };
+}
 async function writeAtomically(file, contents) {
   const temporary = `${file}.${process.pid}.${Date.now()}.tmp`;
   await writeFile(temporary, contents, { mode: 384 });
@@ -3457,7 +3499,7 @@ var require_crc32 = __commonJS(function(exports, module) {
 });
 
 // ../../node_modules/.bun/yauzl@3.4.0/node_modules/yauzl/index.js
-function open(path, options2, callback) {
+function open2(path, options2, callback) {
   if (typeof options2 === "function") {
     callback = options2;
     options2 = null;
@@ -3773,7 +3815,7 @@ var init_yauzl = __esm(() => {
   PassThrough = __require("stream").PassThrough;
   Writable = __require("stream").Writable;
   crc32 = typeof zlib.crc32 === "function" ? zlib.crc32 : require_crc32();
-  $open = open;
+  $open = open2;
   $validateFileName = validateFileName;
   util.inherits(ZipFile, EventEmitter);
   ZipFile.prototype.close = function() {
@@ -4391,10 +4433,10 @@ function pinnedToolchainArtifacts(platform = process.platform, architecture = pr
 var PINNED_TOOLCHAIN_VERSIONS, PINNED_SUPPORT_TOOL_VERSIONS, PINNED_TOOL_VERSIONS, GITHUB_RELEASE_HOSTS, NPM_REGISTRY_HOSTS, GROK_DOWNLOAD_HOSTS, CODEX_RELEASE_BASE, PI_RELEASE_BASE, GH_RELEASE_BASE, OPENCODE_RELEASE_BASE, CODEX_CODE_MODE_HOST_FILE_NAME = "codex-code-mode-host", PINNED_TOOLCHAIN_ARTIFACTS;
 var init_manifest = __esm(() => {
   PINNED_TOOLCHAIN_VERSIONS = {
-    claude: "2.1.309",
-    codex: "0.164.0",
-    grok: "1.0.67",
-    opencode: "1.19.4",
+    claude: "2.1.314",
+    codex: "0.166.0",
+    grok: "1.0.70",
+    opencode: "1.19.5",
     pi: "1.4.0"
   };
   PINNED_SUPPORT_TOOL_VERSIONS = {
@@ -4425,23 +4467,23 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${CODEX_RELEASE_BASE}/codex-aarch64-apple-darwin.tar.gz`,
         entryPath: "codex-aarch64-apple-darwin",
-        size: 101767166,
-        sha256: "aa8299c169d80111aac05543ad2621c9bdbedb9bc252c905fe3f5a5baf9a4142",
+        size: 107610108,
+        sha256: "c48824462fc57681eafb0925d97b11b589010475613904f570b42fea53e240d5",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       companions: [
         codexCodeModeHost("aarch64-apple-darwin", {
-          size: 24347400,
-          sha256: "7bc3ca697567bc884a76233999c46cb22b023b09f2d4d4ab3518f1354c64e415"
+          size: 24769716,
+          sha256: "7abd50fe5f033495a7b693c45fb82dc57093a18f1c4ba3e8043577de46c5c7c5"
         }, {
-          size: 68543072,
-          sha256: "416721e33af8822041dc650793512b3e58d43e0be4f3a5c6187eb4dfaad3148a"
+          size: 69182864,
+          sha256: "fd37051bfdce0b65cf22a7077e265720a7bd6709d5e400dcbc26197f3041400a"
         })
       ],
       executable: {
         fileName: "codex",
-        size: 260293200,
-        sha256: "d8990e3ee7acfbc26f91265b12a1a83f0fee40d0e0f8f1f40a37d4ec21f499cf"
+        size: 268972064,
+        sha256: "39acf979729dd290f9a24ee38b2914e036c91b65952872e28ae2a6b88a7db7c1"
       }
     },
     {
@@ -4453,23 +4495,23 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${CODEX_RELEASE_BASE}/codex-x86_64-apple-darwin.tar.gz`,
         entryPath: "codex-x86_64-apple-darwin",
-        size: 110491441,
-        sha256: "de6bbc013c56337f6ddd3f26dfbfd62aad5924cb68cd5ef6430538922bfa0e75",
+        size: 117027024,
+        sha256: "db0c38713c36199b12e7c8d1629386c35a4ce8f99e1c9ce72f1725a74df67b57",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       companions: [
         codexCodeModeHost("x86_64-apple-darwin", {
-          size: 26213130,
-          sha256: "50f93d5413647488940aa23db9b1c822ee86f2c45fa37af34993e992c9848211"
+          size: 26748407,
+          sha256: "b35c775d5e5f8d60d05e0de7154e5bbbf320b6d0e28a3237d42cc8a742ccaf65"
         }, {
-          size: 72251296,
-          sha256: "067f9c14f67b02bdb984d4fc4740da14cd397da7ee60b4506eb378921afe3e7d"
+          size: 73183424,
+          sha256: "9d96de017ecec30ec3f8689f489584151c167c255a787dc6e297b6edc9ebe08c"
         })
       ],
       executable: {
         fileName: "codex",
-        size: 279923568,
-        sha256: "d7e19691e0c1945612475ee8ab32e59ead55472e976b5cea1682d827d34dbba1"
+        size: 289445104,
+        sha256: "1361e18268866b7f9f5e8703fabcea0a2a990a439eedcce03940abb4ba9eaaeb"
       }
     },
     {
@@ -4481,23 +4523,23 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${CODEX_RELEASE_BASE}/codex-aarch64-unknown-linux-musl.tar.gz`,
         entryPath: "codex-aarch64-unknown-linux-musl",
-        size: 106977873,
-        sha256: "29a507a2a3fd8f6cd94b96b762d281d299d15d7902dee6132d314b78cf9108eb",
+        size: 113382496,
+        sha256: "94eb707605ec2646b2e05b7edf7c4e7b3ccf02b16237c34ae9beb8cfb7f810a9",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       companions: [
         codexCodeModeHost("aarch64-unknown-linux-musl", {
-          size: 26642339,
-          sha256: "0e0bdde24d5b31b05519693635baa9c4f2dc4fe7eee31c67b92155f190dd32d2"
+          size: 27023046,
+          sha256: "ac98d1f878e353a16cba711fd47bfef2f6c814109bdd819ee2b6b6d6a19701e7"
         }, {
-          size: 70117728,
-          sha256: "7d28b996b825b13ea058af67655b619a26a125d61d4fb2985694a9c4e77d2e21"
+          size: 70838624,
+          sha256: "587436a943a59c18cabdbe83f07800d237b60ddd2e0f54d05b23d8b37a0b36f4"
         })
       ],
       executable: {
         fileName: "codex",
-        size: 268045528,
-        sha256: "8813c8d8a4cea2eeba271b72ab22f49628b184b24ab18dbef06b4ce41e9a8d39"
+        size: 277549176,
+        sha256: "f2e6c980c937e734644bed1b4a9a018d3e63a0ccbe71aafc85c86a8c6e4b462a"
       }
     },
     {
@@ -4509,23 +4551,23 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${CODEX_RELEASE_BASE}/codex-x86_64-unknown-linux-musl.tar.gz`,
         entryPath: "codex-x86_64-unknown-linux-musl",
-        size: 114979035,
-        sha256: "90dd0b03b28afcb7fa733a4f73b413db2916a47347efd43fb669cc1c774ee8e4",
+        size: 121764138,
+        sha256: "a0bf572d2f93f056c6712a6da348e96078dc84f3885fd7be67807ef389cb3978",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       companions: [
         codexCodeModeHost("x86_64-unknown-linux-musl", {
-          size: 28137475,
-          sha256: "feade7026436baa4e82e898050c7ef82a8adbd98163dc504771275b5ef224f2f"
+          size: 28565521,
+          sha256: "7588334fd47bc4003d970b70dfd4d1e4578491b1e9baa72976a4c2d7e97590da"
         }, {
-          size: 76997904,
-          sha256: "8ee4f472e92ac226a189e98998633b2d07f989f208515750764db660369f2926"
+          size: 77997328,
+          sha256: "657f4e902726e05867c937b583049d5997e057f8cd0ab40450633c9c9ef8d630"
         })
       ],
       executable: {
         fileName: "codex",
-        size: 308139304,
-        sha256: "b93f6811d3f653f0fb83be4050d857fb9abbb111dfa2ce160563327daff7f306"
+        size: 319346888,
+        sha256: "b8a11fedf24b2dfb59a70c9e52b030f9a508dcd49cd2dd0d41956f4c785156b8"
       }
     },
     {
@@ -4537,14 +4579,14 @@ var init_manifest = __esm(() => {
         format: "zip",
         url: `${OPENCODE_RELEASE_BASE}/opencode-darwin-arm64.zip`,
         entryPath: "opencode",
-        size: 64291659,
-        sha256: "c400a2f8c8ab7e99478a7f4dd1a466b57bf33888e520d85c55780a5464c4b689",
+        size: 64278924,
+        sha256: "c1c9e62521192192ef4c3ed1355ada2144055bddb61682217e997b03c55203c1",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       executable: {
         fileName: "opencode",
-        size: 180803872,
-        sha256: "417af53923f3d529759ab85ce3e8dd09116f742efcd332de591d2da6ebae696b",
+        size: 180672544,
+        sha256: "feaafead8cd563af0c2dcb386b0757e4355e327ebb6bd1aaad5440fe2f83596c",
         repairInvalidMacSignature: true
       }
     },
@@ -4557,14 +4599,14 @@ var init_manifest = __esm(() => {
         format: "zip",
         url: `${OPENCODE_RELEASE_BASE}/opencode-darwin-x64.zip`,
         entryPath: "opencode",
-        size: 69113309,
-        sha256: "123ebd72609c4f8dbae0485cdac39b9aedfeb6576b2eef64f2e73152b1de82f4",
+        size: 69100888,
+        sha256: "b0212efa6db347187225a17fa3a31c6b261bf4c9f1589a290b0ca902d720d250",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       executable: {
         fileName: "opencode",
-        size: 194103008,
-        sha256: "6d6a980039553a6b4efe2221fdbd5e8945abf3c2365d97fcab097713a327228f",
+        size: 193954400,
+        sha256: "4b15c8aab1844936e9e1d1327213355d94c820de8c7084fad88d3812a067d3d0",
         repairInvalidMacSignature: true
       }
     },
@@ -4577,14 +4619,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${OPENCODE_RELEASE_BASE}/opencode-linux-arm64.tar.gz`,
         entryPath: "opencode",
-        size: 78526339,
-        sha256: "8568230ccd847dc93e95b9f6894379077d3e014a16b48040743573e77c23e85f",
+        size: 78513091,
+        sha256: "fae5be262d693b7c5e562856cc473e59e741772936db0c0600ac0d5ed5bd088b",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       executable: {
         fileName: "opencode",
-        size: 211340280,
-        sha256: "eba0da50d9cc22f2dd062c32e0e7e58d7ece301aa50aabdad1e9dba4ffbf25b4"
+        size: 211209208,
+        sha256: "dab85b46f4ea4813da5367997f99a60aab64a2118d58ebf552980e792747436c"
       }
     },
     {
@@ -4596,14 +4638,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: `${OPENCODE_RELEASE_BASE}/opencode-linux-x64.tar.gz`,
         entryPath: "opencode",
-        size: 79667571,
-        sha256: "849bd6b3d959a1d2ef200ed1634a51c79a45ca236aa26665d75debd694805cce",
+        size: 79651896,
+        sha256: "588310a336fa3b9df36b3f0225b26f679d453efaad0cf3d66c3651ef3ec1647a",
         allowedHosts: GITHUB_RELEASE_HOSTS
       },
       executable: {
         fileName: "opencode",
-        size: 214522032,
-        sha256: "538fcb1b6408c8d4608822acee19f7ff5b3a3eb3383c0633c4f06170857312a7"
+        size: 214386864,
+        sha256: "7df4e4136301f16589b0f30bf91a61380fca5f8ef22dd36570f5ebe1d4ec802c"
       }
     },
     {
@@ -4615,14 +4657,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: claudeArchiveUrl("darwin-arm64"),
         entryPath: "package/claude",
-        size: 122689402,
-        sha256: "0e8ce1ddb8566129661bb7698db69db89d904e23b464afc6e85d5bd8879b9a51",
+        size: 124539940,
+        sha256: "e4524422963f1c79a4894b5ecb70e123cc45a3dd3a0915f312f6135f70aa570c",
         allowedHosts: NPM_REGISTRY_HOSTS
       },
       executable: {
         fileName: "claude",
-        size: 275923296,
-        sha256: "5eadc0009cdcdbc0d06e58110d7b2baf88ced6088b1c33a60a21217fe410619c"
+        size: 278848096,
+        sha256: "21d6e7b9a6f07b4cfcb7df13760b3b72aa25e084e13a5354413382987ba832ed"
       }
     },
     {
@@ -4634,14 +4676,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: claudeArchiveUrl("darwin-x64"),
         entryPath: "package/claude",
-        size: 127778018,
-        sha256: "58f2fcea83ddc59839353a55dafc2a8cd084b8acb9bf7131ff7db48a28604c33",
+        size: 129924753,
+        sha256: "f0041d107ad1a613e82fa4d8149e44390c975c3488ca34812fa27ccc9a92b8d6",
         allowedHosts: NPM_REGISTRY_HOSTS
       },
       executable: {
         fileName: "claude",
-        size: 287157296,
-        sha256: "200e0d775ae55c040db3bb8db8de3e22efcddbd7e0abff5ab50dd10f6853425d"
+        size: 290710016,
+        sha256: "404779a308a358ecec8b25c8bccf0ce79a94cf261d12cb74065518d189c174f8"
       }
     },
     {
@@ -4653,14 +4695,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: claudeArchiveUrl("linux-arm64"),
         entryPath: "package/claude",
-        size: 133084470,
-        sha256: "3108f1bf04723cd654cf98269eb861827a15d9256db13ebf88a09d3b497926b2",
+        size: 136687968,
+        sha256: "5a8087f6b0df5796326bb8e58c6e89637c58f28a16aea45434a7e914e854b0dc",
         allowedHosts: NPM_REGISTRY_HOSTS
       },
       executable: {
         fileName: "claude",
-        size: 293331128,
-        sha256: "9796dd26899337f687739a0b39a7353b639f062a3436a7b941fcf19a1b757a9b"
+        size: 297067016,
+        sha256: "a66c0a8f5d0c87a439953d797985192bbcbaefbce2e0d7b2eaa8df30ef0f3ef2"
       }
     },
     {
@@ -4672,14 +4714,14 @@ var init_manifest = __esm(() => {
         format: "tar.gz",
         url: claudeArchiveUrl("linux-x64"),
         entryPath: "package/claude",
-        size: 132508222,
-        sha256: "e960c4437f6f99648437784db43e04ad5f12711aecd710864f96876f94c2fc1a",
+        size: 137217467,
+        sha256: "c6b690e52ba2d038c4c8d2566b2ec35acef4995c4321f7d57fa464a7088c2b78",
         allowedHosts: NPM_REGISTRY_HOSTS
       },
       executable: {
         fileName: "claude",
-        size: 293469552,
-        sha256: "4d704a8aecbe038affa3000f498ae17c1b4f753add8facb8764120affc99b658"
+        size: 298229464,
+        sha256: "4487042b4c4f5d88d4568f68ae98aae0b1ffae58864cf57fb868641bc5f84594"
       }
     },
     {
@@ -4691,14 +4733,14 @@ var init_manifest = __esm(() => {
         format: "raw",
         url: `https://storage.googleapis.com/grok-build-public-artifacts/cli/grok-${PINNED_TOOLCHAIN_VERSIONS.grok}-macos-aarch64`,
         entryPath: "",
-        size: 177770992,
-        sha256: "036a47ce2987adae04de827f7803bf0cc460bf169b640db168f18ec7acb734db",
+        size: 179063008,
+        sha256: "5c8a688251bf61e35370b828b6a353b0a20fcc3f64000de8a91d426039f29cec",
         allowedHosts: GROK_DOWNLOAD_HOSTS
       },
       executable: {
         fileName: "grok",
-        size: 177770992,
-        sha256: "036a47ce2987adae04de827f7803bf0cc460bf169b640db168f18ec7acb734db"
+        size: 179063008,
+        sha256: "5c8a688251bf61e35370b828b6a353b0a20fcc3f64000de8a91d426039f29cec"
       }
     },
     {
@@ -4710,14 +4752,14 @@ var init_manifest = __esm(() => {
         format: "raw",
         url: `https://storage.googleapis.com/grok-build-public-artifacts/cli/grok-${PINNED_TOOLCHAIN_VERSIONS.grok}-macos-x86_64`,
         entryPath: "",
-        size: 192143296,
-        sha256: "24a951871bfb7b3f6036fc1e1cd2442c664e2b2eeba58de9e8f47de4c633a03e",
+        size: 193578304,
+        sha256: "d9ecd462f1f3c3b40a7a131944987ee7ed1c38069b7009cc4107398ab767f484",
         allowedHosts: GROK_DOWNLOAD_HOSTS
       },
       executable: {
         fileName: "grok",
-        size: 192143296,
-        sha256: "24a951871bfb7b3f6036fc1e1cd2442c664e2b2eeba58de9e8f47de4c633a03e"
+        size: 193578304,
+        sha256: "d9ecd462f1f3c3b40a7a131944987ee7ed1c38069b7009cc4107398ab767f484"
       }
     },
     {
@@ -4729,14 +4771,14 @@ var init_manifest = __esm(() => {
         format: "raw",
         url: `https://storage.googleapis.com/grok-build-public-artifacts/cli/grok-${PINNED_TOOLCHAIN_VERSIONS.grok}-linux-aarch64`,
         entryPath: "",
-        size: 165548280,
-        sha256: "089a0acc2c1b570efcd791c5cd0f8aa074f6e8ab82c00ab78af0b934acdb6386",
+        size: 166639048,
+        sha256: "3aa36883574b263088e5addffe241f55430e8daaee1a0c4934b02180007a9761",
         allowedHosts: GROK_DOWNLOAD_HOSTS
       },
       executable: {
         fileName: "grok",
-        size: 165548280,
-        sha256: "089a0acc2c1b570efcd791c5cd0f8aa074f6e8ab82c00ab78af0b934acdb6386"
+        size: 166639048,
+        sha256: "3aa36883574b263088e5addffe241f55430e8daaee1a0c4934b02180007a9761"
       }
     },
     {
@@ -4748,14 +4790,14 @@ var init_manifest = __esm(() => {
         format: "raw",
         url: `https://storage.googleapis.com/grok-build-public-artifacts/cli/grok-${PINNED_TOOLCHAIN_VERSIONS.grok}-linux-x86_64`,
         entryPath: "",
-        size: 194169184,
-        sha256: "ce33b1a29e37901f56fe59916cda7a1149e6fd377118f918e90d89f9abb52a51",
+        size: 195700192,
+        sha256: "22d281c5964c5444147328096ba2a221f3f0874c6858e27c825656a80f6e58e9",
         allowedHosts: GROK_DOWNLOAD_HOSTS
       },
       executable: {
         fileName: "grok",
-        size: 194169184,
-        sha256: "ce33b1a29e37901f56fe59916cda7a1149e6fd377118f918e90d89f9abb52a51"
+        size: 195700192,
+        sha256: "22d281c5964c5444147328096ba2a221f3f0874c6858e27c825656a80f6e58e9"
       }
     },
     {
@@ -4893,7 +4935,7 @@ var init_manifest = __esm(() => {
 
 // ../toolchain/src/manager.ts
 import { spawn } from "child_process";
-import { createHash as createHash4, randomUUID as randomUUID4 } from "crypto";
+import { createHash as createHash4, randomUUID as randomUUID5 } from "crypto";
 import { createReadStream, createWriteStream } from "fs";
 import {
   chmod,
@@ -4901,13 +4943,13 @@ import {
   lstat,
   mkdir as mkdir3,
   mkdtemp as mkdtemp2,
-  open as open2,
+  open as open3,
   readFile as readFile2,
   readdir as readdir3,
   readlink,
   rename as rename2,
   rm as rm3,
-  stat as stat2,
+  stat as stat3,
   symlink as symlink2,
   utimes
 } from "fs/promises";
@@ -5214,7 +5256,7 @@ async function acquireInstallLock(rootDir, onProgress, timings, openLockFile, ow
   let announcedWait = false;
   while (Date.now() - startedAt < timings.lockWaitTimeoutMs) {
     const owner = {
-      token: randomUUID4(),
+      token: randomUUID5(),
       pid: process.pid,
       createdAt: new Date().toISOString()
     };
@@ -5260,7 +5302,7 @@ async function acquireInstallLock(rootDir, onProgress, timings, openLockFile, ow
         continue;
       }
     }
-    const lockStat = await stat2(lockPath).catch(() => null);
+    const lockStat = await stat3(lockPath).catch(() => null);
     if (!observedOwner && lockStat && Date.now() - lockStat.mtimeMs > timings.lockStaleAfterMs) {
       const currentOwner = await readInstallLockOwner(lockPath);
       if (!currentOwner) {
@@ -5307,7 +5349,7 @@ async function downloadArchive(label, archive, archivePath, fetchImpl, onBytes,
     if (contentLength !== null && Number(contentLength) !== archive.size) {
       throw new Error(`${label} archive size header did not match the pinned manifest`);
     }
-    handle = await open2(archivePath, "wx", 384);
+    handle = await open3(archivePath, "wx", 384);
     const reader = response.body.getReader();
     const hash = createHash4("sha256");
     let received = 0;
@@ -5583,7 +5625,7 @@ async function repairInvalidMacSignature(executablePath, artifact, timeoutMs, sp
   await runCodesign(["--sign", "-", "--force", executablePath], `${artifact.name} could not be ad-hoc signed after source verification`, timeoutMs, spawnProcess);
 }
 async function prepareRepairableExecutable(sourcePath, executablePath, artifact, skipExecutableProbeForTests, processTimeoutMs, spawnProcess) {
-  const temporaryPath = path17.join(path17.dirname(executablePath), `.repair-${artifact.executable.fileName}-${randomUUID4()}.tmp`);
+  const temporaryPath = path17.join(path17.dirname(executablePath), `.repair-${artifact.executable.fileName}-${randomUUID5()}.tmp`);
   try {
     await copyFile2(sourcePath, temporaryPath);
     await chmod(temporaryPath, 448);
@@ -5743,7 +5785,7 @@ async function acquireVersionLease(rootDir, artifact, openLeaseFile) {
     return;
   processVersionLeases.delete(leaseKey);
   const owner = {
-    token: randomUUID4(),
+    token: randomUUID5(),
     pid: process.pid,
     createdAt: new Date().toISOString()
   };
@@ -5799,7 +5841,7 @@ async function pruneSupersededVersions(rootDir, artifacts, retainSupersededMs, o
       await Promise.all(entries.filter((entry) => entry.isDirectory() && !keep.has(entry.name)).map(async (entry) => {
         const versionDir = path17.join(toolDir, entry.name);
         try {
-          if ((await stat2(versionDir)).mtimeMs > staleBefore)
+          if ((await stat3(versionDir)).mtimeMs > staleBefore)
             return;
           if (await versionHasLiveLease(rootDir, name, entry.name, ownerProcessExists))
             return;
@@ -5855,7 +5897,7 @@ async function activateExecutables(rootDir, artifacts) {
   const executables = {};
   const activate = async (linkName, target) => {
     const activePath = path17.join(binDir, linkName);
-    const temporaryLink = path17.join(binDir, `.${linkName}-${randomUUID4()}.tmp`);
+    const temporaryLink = path17.join(binDir, `.${linkName}-${randomUUID5()}.tmp`);
     const existingTarget = await readlink(activePath).catch(() => null);
     if (existingTarget !== target) {
       await symlink2(target, temporaryLink, "file");
@@ -5921,7 +5963,7 @@ async function ensurePinnedToolchains(options2) {
     phase: "waiting",
     completedTools: 0,
     message
-  }), timings, options2.openLockFileForTests ?? open2, ownerProcessExists);
+  }), timings, options2.openLockFileForTests ?? open3, ownerProcessExists);
   try {
     await cleanStagingDirectories(rootDir);
     const statuses = await Promise.all(artifacts.map((artifact) => installationStatus(rootDir, artifact)));
@@ -5995,7 +6037,7 @@ async function ensurePinnedToolchains(options2) {
     const result = await activateExecutables(rootDir, artifacts);
     await Promise.all(artifacts.map((artifact) => touchArtifactDirectory(rootDir, artifact)));
     if (!options2.skipVersionLeaseForTests) {
-      await Promise.all(artifacts.map((artifact) => acquireVersionLease(rootDir, artifact, options2.openLeaseFileForTests ?? open2)));
+      await Promise.all(artifacts.map((artifact) => acquireVersionLease(rootDir, artifact, options2.openLeaseFileForTests ?? open3)));
     }
     await options2.onActivated?.(result);
     await pruneSupersededVersions(rootDir, artifacts, timings.retainSupersededMs, ownerProcessExists, options2.removeSupersededVersionForTests ?? rm3);
@@ -6072,7 +6114,7 @@ var init_platform_selection = __esm(() => {
 });
 
 // ../toolchain/src/install.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 import { lstat as lstat2, mkdir as mkdir4, readdir as readdir4, readlink as readlink2, rename as rename3, rm as rm4, symlink as symlink3 } from "fs/promises";
 import path19 from "path";
 async function resolveToolchainSelection(options2) {
@@ -6150,7 +6192,7 @@ async function pointCurrentAt(rootDir, binDir) {
   }
   if (existing && await readlink2(link) === target)
     return link;
-  const temporary = path19.join(binRoot, `.${CURRENT_TOOLCHAIN_LINK}-${randomUUID5()}.tmp`);
+  const temporary = path19.join(binRoot, `.${CURRENT_TOOLCHAIN_LINK}-${randomUUID6()}.tmp`);
   await symlink3(target, temporary, "dir");
   try {
     await rename3(temporary, link);
@@ -6443,7 +6485,7 @@ var PUBLIC_ACTIONS = {
     effects: [],
     observation: "immediate",
     milestone: "A",
-    summary: "List native-agent sessions of one environment without reading transcripts."
+    summary: "List native-agent sessions of one environment or Coordinator conversation without reading transcripts."
   },
   "session.get": {
     version: 1,
@@ -6488,10 +6530,10 @@ var PUBLIC_ACTIONS = {
   "session.stop": {
     version: 1,
     mutation: true,
-    effects: ["provider-session"],
+    effects: ["metadata", "provider-session", "filesystem", "process"],
     observation: "receipt",
     milestone: "C",
-    summary: "Stop the current turn of one session, optionally bound to an expected run."
+    summary: "Stop the current turn and pause its goal, optionally bound to an expected run."
   },
   "session.steer": {
     version: 1,
@@ -6565,6 +6607,46 @@ var PUBLIC_ACTIONS = {
     milestone: "C",
     summary: "Pause or resume one pending interaction's countdown where its deadline is enforced."
   },
+  "session.goal.set": {
+    version: 1,
+    mutation: true,
+    effects: ["provider-session", "filesystem", "process"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Give one agent tab a durable objective: the backend sends turns until a check proves it, the agent needs a person, or a limit stops it."
+  },
+  "session.goal.get": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "Read one session's goal and its recent history, without starting anything; check output on request."
+  },
+  "session.goal.pause": {
+    version: 1,
+    mutation: true,
+    effects: ["metadata", "provider-session", "filesystem", "process"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Pause a running goal; no further turn starts until it is resumed."
+  },
+  "session.goal.resume": {
+    version: 1,
+    mutation: true,
+    effects: ["provider-session", "filesystem", "process"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Resume a stopped goal, optionally with a higher iteration cap or token budget."
+  },
+  "session.goal.clear": {
+    version: 1,
+    mutation: true,
+    effects: ["metadata", "provider-session", "filesystem", "process"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Remove a session's goal in any status; it stays readable in the goal history."
+  },
   "session.transcript": {
     version: 1,
     mutation: false,
@@ -6733,6 +6815,158 @@ var PUBLIC_ACTIONS = {
     milestone: "D",
     summary: "Start the Resolve Conflicts agent session in an environment (the Resolve tab): merge the target branch, resolve and validate conflicts, commit and push."
   },
+  "pr.get": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "Read the pull request attached to an environment's branch: attachment, URL, state, draft, base and head branches, head SHA, mergeability, checks, reviewers, labels and conversation comments."
+  },
+  "pr.list": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "List a project's pull requests from GitHub, by filter and search text."
+  },
+  "pr.timeline": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "Read the timeline of an environment's pull request: commits, comments, reviews and events, oldest first."
+  },
+  "pr.files": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "Read the changed files and review threads of an environment's pull request; with path, that file's diff hunks."
+  },
+  "pr.options": {
+    version: 1,
+    mutation: false,
+    effects: [],
+    observation: "immediate",
+    milestone: "D",
+    summary: "Read the labels and assignable users of the repository of an environment's pull request, for pr.label and pr.reviewers."
+  },
+  "pr.merge": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository", "filesystem", "process"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Merge an environment's pull request into its target branch (the Merge button, squash by default): a draft is marked ready first and the head branch is deleted unless deleteBranch is false. With cleanup, the Merge and Cleanup button: also delete the environment and its worktree once the merge is confirmed."
+  },
+  "pr.close": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Close an environment's pull request without merging; pr.reopen undoes it."
+  },
+  "pr.reopen": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Reopen an environment's closed pull request."
+  },
+  "pr.ready": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Mark an environment's draft pull request ready for review."
+  },
+  "pr.draft": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Convert an environment's pull request back to a draft."
+  },
+  "pr.comment": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Add a conversation comment to an environment's pull request."
+  },
+  "pr.comment.edit": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Edit a conversation comment on an environment's pull request; the GitHub user must be allowed to edit it."
+  },
+  "pr.review": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Submit a review of an environment's pull request: approve, request changes or comment, with optional inline comments."
+  },
+  "pr.review.comment": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Add one inline review comment to a line of an environment's pull request."
+  },
+  "pr.thread.reply": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Reply to a review thread on an environment's pull request (threadId from pr.files)."
+  },
+  "pr.thread.resolve": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Resolve or unresolve a review thread on an environment's pull request (threadId from pr.files)."
+  },
+  "pr.file.viewed": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Mark a changed file of an environment's pull request as viewed or not viewed for the GitHub user."
+  },
+  "pr.reviewers": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Request or remove reviewers on an environment's pull request."
+  },
+  "pr.label": {
+    version: 1,
+    mutation: true,
+    effects: ["external-repository"],
+    observation: "receipt",
+    milestone: "D",
+    summary: "Add or remove one label on an environment's pull request."
+  },
   "attention.list": {
     version: 1,
     mutation: false,
@@ -7003,7 +7237,12 @@ var PUBLIC_EXIT = Object.freeze({
   deadline: 5,
   interactionRequired: 6,
   unknownDispatch: 7,
-  conflict: 8
+  conflict: 8,
+  goalClaimed: 10,
+  goalBlocked: 11,
+  goalLimited: 12,
+  goalPaused: 13,
+  goalGone: 14
 });
 var PUBLIC_SIGNAL_EXIT = Object.freeze({ SIGINT: 130, SIGTERM: 143 });
 var PUBLIC_ERROR_EXIT = {
@@ -7055,7 +7294,12 @@ var PUBLIC_ERROR_EXIT = {
   "session-idle": PUBLIC_EXIT.conflict,
   "interaction-stale": PUBLIC_EXIT.conflict,
   "dispatch-parked": PUBLIC_EXIT.conflict,
-  "node-unsupported": PUBLIC_EXIT.conflict
+  "node-unsupported": PUBLIC_EXIT.conflict,
+  "goal-claimed": PUBLIC_EXIT.goalClaimed,
+  "goal-blocked": PUBLIC_EXIT.goalBlocked,
+  "goal-limited": PUBLIC_EXIT.goalLimited,
+  "goal-paused": PUBLIC_EXIT.goalPaused,
+  "goal-gone": PUBLIC_EXIT.goalGone
 };
 function isPublicErrorCode(value) {
   return typeof value === "string" && Object.hasOwn(PUBLIC_ERROR_EXIT, value);
@@ -7550,7 +7794,7 @@ function splitFlag(token) {
 }
 
 // src/client/fix.ts
-import { existsSync as existsSync3, realpathSync as realpathSync2 } from "fs";
+import { existsSync as existsSync3, realpathSync as realpathSync3 } from "fs";
 import { mkdtemp, readdir as readdir2, rmdir } from "fs/promises";
 import os4 from "os";
 import path6 from "path";
@@ -7562,16 +7806,19 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "add_ticket_comment",
   "address_multi_review",
   "adopt_workflow",
+  "answer_worker_question",
   "cancel_build_pipeline",
   "cancel_graph_run",
   "cancel_multi_review",
   "cancel_schedule",
+  "clear_worker_goal",
   "compare_project_files",
   "create_pr",
   "create_schedule",
   "create_ticket",
   "custom_fix_multi_review",
   "edit_worker_tab",
+  "fork_worker",
   "get_build_pipeline",
   "get_environment",
   "get_feature_plan",
@@ -7584,6 +7831,9 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "get_tab_state",
   "get_tab_transcript",
   "get_ticket",
+  "get_usage_limits",
+  "get_worker_changes",
+  "get_worker_goal",
   "launch_environment",
   "launch_feature_plan",
   "launch_graph",
@@ -7598,14 +7848,18 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "list_node_environments",
   "list_nodes",
   "list_projects",
+  "list_provider_accounts",
   "list_schedules",
   "list_tabs",
   "list_tickets",
+  "list_worker_commands",
   "list_workflows",
   "open_multi_review",
   "open_multi_review_fix",
   "open_worker_browser",
   "pause_build_pipeline",
+  "pause_schedule",
+  "pause_worker_goal",
   "propose_agents_md_update",
   "read_messages",
   "read_node_environment",
@@ -7614,18 +7868,26 @@ var COORDINATOR_CONTROL_TOOL_NAMES = Object.freeze([
   "request_project_file_update",
   "request_project_on_node",
   "request_root_changes",
+  "resolve_conflicts",
   "resume_build_pipeline",
+  "resume_schedule",
+  "run_worker_command",
   "send_message",
   "send_node_message",
   "send_prompt_to_node_tab",
   "send_prompt_to_tab",
+  "set_worker_goal",
   "start_build_pipeline",
   "start_environment",
   "start_multi_review",
   "start_node_environment",
   "stop_environment",
   "stop_node_environment",
+  "stop_worker_turn",
+  "switch_provider_account",
+  "set_account_auto_switch",
   "transfer_files",
+  "update_schedule",
   "update_ticket"
 ]);
 
@@ -8066,12 +8328,13 @@ async function writePrivateFile(file, contents) {
 }
 
 // ../../apps/backend/src/data-dir.ts
+import { realpathSync as realpathSync2 } from "fs";
 import os3 from "os";
 import path5 from "path";
 // ../../apps/backend/package.json
 var package_default = {
   name: "@orkestrator/backend",
-  version: "2.34.4-beta",
+  version: "2.35.0-beta",
   private: true,
   type: "module",
   exports: {
@@ -8091,7 +8354,7 @@ var package_default = {
   dependencies: {
     "@modelcontextprotocol/node": "2.1.1",
     "@modelcontextprotocol/server": "2.3.1",
-    "@opencode-ai/sdk": "1.19.4",
+    "@opencode-ai/sdk": "1.19.5",
     "@orkestrator/protocol": "workspace:*",
     "@orkestrator/toolchain": "workspace:*",
     "@xterm/addon-serialize": "0.14.0",
@@ -8191,6 +8454,16 @@ function defaultDataDir(platform = process.platform, env = process.env, home = o
     return path5.join(home, "Library", "Application Support", APP_SLUG);
   return path5.join(env.XDG_CONFIG_HOME ?? path5.join(home, ".config"), APP_SLUG);
 }
+function isDefaultDataDir(dataDir, platform = process.platform, env = process.env, home = os3.homedir()) {
+  const canonical = (value) => {
+    try {
+      return realpathSync2(value);
+    } catch {
+      return path5.resolve(value);
+    }
+  };
+  return canonical(dataDir) === canonical(defaultDataDir(platform, env, home));
+}
 
 // src/client/fix.ts
 var FIX_ISSUE_REPOSITORY = BUG_REPORT_ISSUE_REPOSITORY;
@@ -8292,10 +8565,10 @@ function resolveFixAgent(name, options2) {
   if (onPath) {
     let isManaged = false;
     try {
-      const root = realpathSync2(toolchainRootDir(options2.dataDir));
-      const target = realpathSync2(onPath);
+      const root = realpathSync3(toolchainRootDir(options2.dataDir));
+      const target = realpathSync3(onPath);
       const relative = path6.relative(root, target);
-      isManaged = !relative.startsWith(`..${path6.sep}`) && relative !== ".." && !path6.isAbsolute(relative) || existsSync3(managed) && target === realpathSync2(managed);
+      isManaged = !relative.startsWith(`..${path6.sep}`) && relative !== ".." && !path6.isAbsolute(relative) || existsSync3(managed) && target === realpathSync3(managed);
     } catch {}
     return { agent, executable: onPath, source: isManaged ? "managed" : "path" };
   }
@@ -8305,13 +8578,13 @@ function resolveFixAgent(name, options2) {
 }
 async function diagnosticConnection(dataDir, env) {
   try {
-    const descriptor = realpathSync2(path6.join(dataDir, "backend-instance.json"));
+    const descriptor = realpathSync3(path6.join(dataDir, "backend-instance.json"));
     const config = await new CliConfigStore(defaultCliConfigDir(env)).read();
     for (const [name, connection] of Object.entries(config.connections)) {
       if (connection.kind !== "descriptor")
         continue;
       try {
-        if (realpathSync2(connection.descriptorPath) === descriptor)
+        if (realpathSync3(connection.descriptorPath) === descriptor)
           return name;
       } catch {}
     }
@@ -8538,6 +8811,63 @@ async function observe(check, options2) {
   }
 }
 
+// ../protocol/src/native-agent-goal.ts
+init_agent_platforms();
+function goalIsRunning(status) {
+  return status === "active" || status === "checking" || status === "verifying";
+}
+var NATIVE_AGENT_GOAL_LIMITS = Object.freeze({
+  objectiveMaxChars: 4000,
+  checkMaxBytes: 4 * 1024,
+  reportMessageMaxBytes: 2 * 1024,
+  checkOutputMaxBytes: 8 * 1024,
+  statusDetailMaxBytes: 1024,
+  maxIterationsDefault: 20,
+  maxIterationsLimit: 100,
+  noProgressLimit: 3,
+  checkTimeoutDefaultMs: 10 * 60000,
+  checkTimeoutMaxMs: 30 * 60000,
+  verifierModelMaxChars: 200,
+  verifierTimeoutDefaultMs: 30 * 60000,
+  verdictSummaryMaxBytes: 2 * 1024,
+  verdictReasonsMax: 16,
+  verdictReasonMaxBytes: 512,
+  historyLimit: 5
+});
+var AGENT_GOAL_TOOL_NAMES = Object.freeze(["report_goal"]);
+var GOAL_QUALIFIED_PLATFORMS = Object.freeze([
+  "claude",
+  "codex",
+  "opencode",
+  "cursor",
+  "grok",
+  "pi"
+]);
+var GOAL_TOKEN_BUDGET_PLATFORMS = Object.freeze([
+  "claude",
+  "codex",
+  "opencode",
+  "cursor",
+  "grok",
+  "pi"
+]);
+function parseVerifierFlag(text) {
+  const colon = text.indexOf(":");
+  const agent = colon < 0 ? text : text.slice(0, colon);
+  const model = colon < 0 ? undefined : text.slice(colon + 1);
+  if (!isAgentPlatform(agent)) {
+    return { error: "--verifier takes an agent, optionally with a model: --verifier codex:o3." };
+  }
+  if (model === undefined)
+    return { agent };
+  if (!model || model.length > NATIVE_AGENT_GOAL_LIMITS.verifierModelMaxChars) {
+    return {
+      error: `The verifier's model name must be 1 to ${NATIVE_AGENT_GOAL_LIMITS.verifierModelMaxChars} characters.`
+    };
+  }
+  return { agent, model };
+}
+
 // ../protocol/src/public-api-wait.ts
 function isTerminalPublicReceipt(receipt) {
   return !["admitted", "running", "unknown"].includes(receipt.state);
@@ -8592,6 +8922,34 @@ function terminalReceiptErrorCode(receipt) {
     return "run-unknown";
   return receipt.error?.code ?? "operation-failed";
 }
+var GOAL_END_CODES = {
+  claimed: "goal-claimed",
+  blocked: "goal-blocked",
+  limited: "goal-limited",
+  paused: "goal-paused"
+};
+function classifyGoalForWait(read, goalId, options2 = {}) {
+  const current = read.goal?.goalId === goalId ? read.goal : null;
+  if (!current) {
+    const past = read.history.findLast((goal) => goal.goalId === goalId);
+    if (past?.status === "complete")
+      return { kind: "complete", goal: past };
+    if (past?.status === "claimed")
+      return { kind: "stopped", code: "goal-claimed", goal: past };
+    return past ? { kind: "gone", goal: past } : { kind: "gone" };
+  }
+  if (goalIsRunning(current.status)) {
+    const needsAnswer = read.activity === "waiting" || (read.pendingInteractionCount ?? 0) > 0;
+    return needsAnswer && !options2.continueOnInteraction ? { kind: "interaction", goal: current } : { kind: "pending", goal: current };
+  }
+  if (current.status === "complete")
+    return { kind: "complete", goal: current };
+  return {
+    kind: "stopped",
+    code: GOAL_END_CODES[current.status],
+    goal: current
+  };
+}
 
 // src/client/commands/common.ts
 var REQUEST_ID_OPTION = {
@@ -8766,6 +9124,15 @@ async function waitForOperation(context, session, initial, timeoutMs, options2 =
 }
 async function waitForEnvironment(context, session, environmentId, condition, receipt, timeoutMs) {
   let latestReceipt = receipt;
+  const deadline = Date.now() + timeoutMs;
+  const remaining = () => {
+    if (context.signal?.aborted)
+      throw new ObservationStopped("signal", signalName(context.signal));
+    const budget = deadline - Date.now();
+    if (budget <= 0)
+      throw new ObservationStopped("deadline");
+    return budget;
+  };
   const conditionMet = (environment) => {
     if (condition === "deleted")
       return environment === null;
@@ -8779,8 +9146,10 @@ async function waitForEnvironment(context, session, environmentId, condition, re
   };
   try {
     return await observe(async () => {
+      remaining();
       if (latestReceipt && !isTerminalReceipt(latestReceipt)) {
-        latestReceipt = await readOperation(session, latestReceipt.operationId);
+        latestReceipt = await readOperation(session, latestReceipt.operationId, remaining());
+        remaining();
       }
       if (latestReceipt && isTerminalReceipt(latestReceipt)) {
         const failure = receiptFailure(latestReceipt);
@@ -8789,15 +9158,15 @@ async function waitForEnvironment(context, session, environmentId, condition, re
       }
       let environment;
       try {
-        environment = await session.read("environment.get", {
-          environmentId
-        });
+        const snapshot = await session.readWithReceipt("environment.get", { environmentId }, remaining());
+        environment = snapshot.result;
       } catch (error) {
         if (error instanceof CliError && error.code === "not-found")
           environment = null;
         else
           throw error;
       }
+      remaining();
       if (condition !== "deleted" && !environment) {
         throw new CliError("not-found", "The environment no longer exists", latestReceipt ? { receipt: latestReceipt } : {});
       }
@@ -8816,8 +9185,9 @@ async function waitForEnvironment(context, session, environmentId, condition, re
       return { done: false };
     }, { timeoutMs, signal: context.signal });
   } catch (error) {
-    if (error instanceof ObservationStopped) {
-      throw stoppedError(error, latestReceipt?.action ?? "environment.get", latestReceipt, `the environment (${condition})`);
+    const stopped = context.signal?.aborted ? new ObservationStopped("signal", signalName(context.signal)) : Date.now() >= deadline && error instanceof CliError && error.code === "connection-failed" ? new ObservationStopped("deadline") : error;
+    if (stopped instanceof ObservationStopped) {
+      throw stoppedError(stopped, latestReceipt?.action ?? "environment.get", latestReceipt, `the environment (${condition})`);
     }
     throw error;
   }
@@ -9862,6 +10232,7 @@ var PROJECTION_FIELD_SET = new Set([
   "queue",
   "asyncQuestionResponses",
   "contextUsage",
+  "goal",
   "rateLimits",
   "runtime",
   "runtimeHealthAuthoritative",
@@ -9886,6 +10257,7 @@ var OPTIONAL_PROJECTION_FIELD_SET = new Set([
   "queue",
   "asyncQuestionResponses",
   "contextUsage",
+  "goal",
   "rateLimits",
   "runtime",
   "runtimeHealthAuthoritative",
@@ -9910,6 +10282,35 @@ var REVIEWER_STATUSES = new Set([
   "cancelled"
 ]);
 
+// ../protocol/src/build-pipeline-key-information.ts
+var KEY_INFORMATION_LIMITS = Object.freeze({
+  proseLength: 4000,
+  itemLength: 600,
+  listItems: 30,
+  decisions: 12,
+  decisionLength: 400,
+  options: 6,
+  optionLength: 300,
+  prosCons: 6,
+  rationaleLength: 1000,
+  tests: 40,
+  testNameLength: 400,
+  issues: 60,
+  issueLength: 400,
+  severityLength: 40,
+  resolutionLength: 1000,
+  verifications: 20,
+  summaryLength: 2000,
+  checks: 30,
+  checkLength: 400,
+  updates: 30,
+  maxRound: 1000
+});
+var KEY_INFORMATION_TOOL_NAMES = Object.freeze([
+  "get_key_information",
+  "update_key_information"
+]);
+
 // ../protocol/src/ticket-sections.ts
 var ACCEPTANCE_CRITERION_STATUSES = ["passed", "failed", "not-checked"];
 var TICKET_SECTION_DEFINITIONS = [
@@ -10079,6 +10480,11 @@ var VERIFICATION_VERDICT_SCHEMA = Object.freeze({
   properties: VERIFICATION_VERDICT_PROPERTIES
 });
 var MAX_BUILD_PIPELINE_ITERATIONS = 10;
+var SETUP_BUILD_PHASES = new Set([
+  "creating-environment",
+  "starting-environment",
+  "waiting-for-setup"
+]);
 var BUILD_PHASES = new Set([
   "creating-environment",
   "starting-environment",
@@ -10114,6 +10520,15 @@ var FAILURE_KINDS = new Set([
 var INTERACTION_PAYLOAD_ENCODER = new TextEncoder;
 var INTERACTION_PROVIDERS = new Set(AGENT_INTERACTION_PROVIDERS);
 var INTERACTION_KINDS = new Set(AGENT_INTERACTION_KINDS);
+var VALIDATION_RESULT_STATUSES = new Set([
+  "pending",
+  "queued",
+  "running",
+  "passed",
+  "failed",
+  "skipped",
+  "incomplete"
+]);
 
 // ../protocol/src/public-api-inputs-build.ts
 init_agent_platforms();
@@ -10401,7 +10816,11 @@ function sessionLines(session) {
     ["activity", session.activity],
     ["latest request", session.latestRequestId],
     ["pending interactions", session.pendingInteractionCount],
-    ["recoverable dispatch", session.recoverableDispatch]
+    ["recoverable dispatch", session.recoverableDispatch],
+    [
+      "goal",
+      session.goal ? `${session.goal.status} (${session.goal.iterations}/${session.goal.maxIterations})` : undefined
+    ]
   ]);
 }
 function receiptLines(receipt) {
@@ -15001,6 +15420,15 @@ function parseEndpoints(value) {
     return { role: entry.role, url: entry.url };
   });
 }
+function parseControlMcp(value) {
+  if (!isRecord3(value) || typeof value.running !== "boolean" || value.url !== undefined && !isHttpUrl(value.url)) {
+    throw new Error("Backend instance descriptor field is invalid: controlMcp");
+  }
+  return {
+    running: value.running,
+    ...value.url !== undefined ? { url: value.url } : {}
+  };
+}
 function parseBackendInstanceDescriptor(value) {
   if (!isRecord3(value))
     throw new Error("Backend instance descriptor must be an object");
@@ -15023,6 +15451,7 @@ function parseBackendInstanceDescriptor(value) {
     throw new Error("Backend instance descriptor field is invalid: browserUrl");
   }
   const endpoints = value.endpoints === undefined ? undefined : parseEndpoints(value.endpoints);
+  const controlMcp = value.controlMcp === undefined ? undefined : parseControlMcp(value.controlMcp);
   if (!Number.isSafeInteger(value.publicApiSchemaVersion) || value.publicApiSchemaVersion < 1) {
     throw new Error("Backend instance descriptor field is invalid: publicApiSchemaVersion");
   }
@@ -15041,6 +15470,7 @@ function parseBackendInstanceDescriptor(value) {
     url: value.url,
     ...value.browserUrl !== undefined ? { browserUrl: value.browserUrl } : {},
     ...endpoints !== undefined ? { endpoints } : {},
+    ...controlMcp !== undefined ? { controlMcp } : {},
     authFile,
     dataDir,
     appVersion: text("appVersion", 64),
@@ -16277,17 +16707,24 @@ function waitOption(conditions) {
     description: `Observe until the environment is ${conditions.join(" or ")} (bounded by --timeout).`
   };
 }
+function remainingBudget(budget, recoveryDeadline) {
+  return recoveryDeadline === undefined ? budget : Math.max(0, recoveryDeadline - Date.now());
+}
 async function lifecycle(context, parsed, action, conditions, extraInput = {}) {
   const environmentId = String(parsed.positionals.environment);
   const wait = parsed.options.wait === undefined ? undefined : oneOf(parsed.options.wait, conditions, "--wait");
   if (parsed.options.timeout !== undefined && wait === undefined) {
     throw new CliError("invalid-input", "--timeout needs --wait");
   }
-  const { session, result, receipt, warnings } = await submit(context, action, { environmentId, ...extraInput }, parsed.options);
+  const input = { environmentId, ...extraInput };
+  const budget = parsed.options.timeout ?? DEFAULT_WAIT_MS;
+  const submitted = wait ? await submitForWait(context, action, input, parsed.options, budget) : await submit(context, action, input, parsed.options);
+  const { session, receipt, warnings } = submitted;
+  const result = submitted.result ?? receipt?.result;
   let finalReceipt = receipt;
   let environment;
   if (wait) {
-    const waited = await waitForEnvironment(context, session, environmentId, wait, receipt, parsed.options.timeout ?? DEFAULT_WAIT_MS);
+    const waited = await waitForEnvironment(context, session, environmentId, wait, receipt, remainingBudget(budget, "deadline" in submitted ? submitted.deadline : undefined));
     finalReceipt = waited.receipt ?? finalReceipt;
     environment = waited.environment;
   }
@@ -16713,14 +17150,18 @@ var environmentCommands = [
       if (options2["exit-code"] === true && options2.wait !== true) {
         throw new CliError("invalid-input", "--exit-code needs --wait");
       }
-      const { session, receipt, result, warnings } = await submit(context, "environment.exec", {
+      const input = {
         environmentId: parsed.positionals.environment,
         argv,
         ...options2.cwd !== undefined ? { cwd: options2.cwd } : {},
         ...Object.keys(env).length > 0 ? { env } : {},
         ...stdinBase64 !== undefined ? { stdinBase64 } : {},
         ...options2["exec-timeout"] !== undefined ? { timeoutMs: options2["exec-timeout"] } : {}
-      }, options2);
+      };
+      const budget = options2.timeout ?? DEFAULT_WAIT_MS;
+      const submitted = options2.wait === true ? await submitForWait(context, "environment.exec", input, options2, budget) : await submit(context, "environment.exec", input, options2);
+      const { session, receipt, warnings } = submitted;
+      const result = submitted.result ?? receipt?.result;
       if (!receipt)
         throw new CliError("response-invalid", "environment.exec returned no receipt");
       if (options2.wait !== true) {
@@ -16734,7 +17175,7 @@ var environmentCommands = [
           human: receiptLines(receipt)
         };
       }
-      const final = await waitForOperation(context, session, receipt, options2.timeout ?? DEFAULT_WAIT_MS);
+      const final = await waitForOperation(context, session, receipt, remainingBudget(budget, "deadline" in submitted ? submitted.deadline : undefined));
       const human = [];
       if (context.global.output === "human") {
         for (const stream of ["stdout", "stderr"]) {
@@ -17120,7 +17561,11 @@ var SCHEDULED_JOB_LIMITS = Object.freeze({
   busyRetryDelayMs: 30000,
   fireStaleMs: 90000,
   fireHeartbeatMs: 20000,
-  maxFireAttempts: 3
+  maxFireAttempts: 3,
+  maxSelfTimerDelayMs: 7 * 24 * 60 * 60000,
+  maxPendingSelfTimers: 20,
+  selfTimerGrantWindowMs: 2 * 60 * 60000,
+  userInstructionMaxChars: 500
 });
 function describeScheduleTrigger(trigger, timeZone) {
   switch (trigger.kind) {
@@ -17701,12 +18146,19 @@ var mailCommands = [
 ];
 
 // src/client/commands/service.ts
-import { spawnSync } from "child_process";
+import { randomUUID as randomUUID4 } from "crypto";
+import { spawnSync as spawnSync2 } from "child_process";
 import { existsSync as existsSync6 } from "fs";
-import { mkdir as mkdir2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir2, rm as rm2, stat as stat2, writeFile as writeFile2 } from "fs/promises";
+import { createServer } from "net";
 import path16 from "path";
 
+// ../../apps/backend/src/fixed-ports.ts
+var DEFAULT_GATEWAY_PORT = 34121;
+var DEFAULT_CONTROL_MCP_PORT = 34122;
+
 // src/client/service-connection.ts
+import { open } from "fs/promises";
 import path13 from "path";
 async function currentDescriptorGeneration(dataDir) {
   try {
@@ -17715,20 +18167,49 @@ async function currentDescriptorGeneration(dataDir) {
     return null;
   }
 }
+var LOG_EXCERPT_LINES = 20;
+var LOG_EXCERPT_MAX_LINE = 500;
+var LOG_EXCERPT_MAX_BYTES = 256 * 1024;
+async function startupLogExcerpt(logFile, offset, version) {
+  let text;
+  try {
+    const file = await open(logFile);
+    try {
+      const { size } = await file.stat();
+      const start = Math.max(offset, size - LOG_EXCERPT_MAX_BYTES);
+      const buffer = Buffer.alloc(Math.max(size - start, 0));
+      await file.read(buffer, 0, buffer.length, start);
+      text = buffer.toString("utf8");
+    } finally {
+      await file.close();
+    }
+  } catch {
+    return [];
+  }
+  const lines = text.split(`
+`);
+  const exit = lines.findLastIndex((line) => line.includes(` ${version} exited (`));
+  const rollback = lines.findIndex((line) => line.includes(` ${version} did not start after `) && line.includes("; rolling back to "));
+  const nextStart = lines.findIndex((line) => /^\[launcher\] \S+ starting /.test(line) && !line.endsWith(` starting ${version}`));
+  const end = exit >= 0 ? exit : Math.min(...[rollback, nextStart, lines.length].filter((index) => index >= 0));
+  return lines.slice(0, end).filter((line) => line.trim() !== "").slice(-LOG_EXCERPT_LINES).map((line) => line.slice(0, LOG_EXCERPT_MAX_LINE));
+}
 async function awaitServiceConnection(dataDir, previousGeneration, options2) {
   const file = path13.join(dataDir, BACKEND_INSTANCE_DESCRIPTOR_FILE);
   try {
     const descriptor = await observe(async () => {
       try {
         const value = await readDescriptor(file);
-        const fresh = value.generation !== previousGeneration && path13.resolve(value.dataDir) === path13.resolve(dataDir) && processIsAlive(value.pid);
-        return fresh ? { done: true, value } : { done: false };
-      } catch {
-        return { done: false };
-      }
+        const fresh = value.generation !== previousGeneration && path13.resolve(value.dataDir) === path13.resolve(dataDir) && (options2.expectedVersion === undefined || value.appVersion === options2.expectedVersion) && processIsAlive(value.pid);
+        if (fresh)
+          return { done: true, value };
+      } catch {}
+      await options2.assertStarting?.();
+      return { done: false };
     }, options2);
     const connection = {
       browserUrl: descriptor.browserUrl ?? (isLoopbackHost(new URL(descriptor.url).hostname) || descriptor.endpoints?.some((endpoint) => endpoint.url === descriptor.url) ? null : descriptor.url),
+      clientUrls: (descriptor.endpoints ?? []).filter((endpoint) => endpoint.role === "client").map((endpoint) => endpoint.url),
       authFile: descriptor.authFile,
       token: null
     };
@@ -17752,6 +18233,7 @@ async function awaitServiceConnection(dataDir, previousGeneration, options2) {
 }
 
 // src/client/service-setup.ts
+import { spawnSync } from "child_process";
 import { existsSync as existsSync4 } from "fs";
 import os6 from "os";
 var HOSTED_WEB_ORIGINS = "https://orkestrator.dev,https://www.orkestrator.dev";
@@ -17764,7 +18246,24 @@ var systemSetupProbe = {
       return MACOS_TAILSCALE_APP_CLI;
     }
     return typeof Bun === "undefined" ? null : Bun.which("tailscale");
-  }
+  },
+  tailscaleOperatorNeeded: (cli) => {
+    if (process.platform !== "linux")
+      return null;
+    const user = os6.userInfo();
+    if (user.uid === 0)
+      return null;
+    const prefs = spawnSync(cli, ["debug", "prefs"], { encoding: "utf8", timeout: 1e4 });
+    if (prefs.status !== 0)
+      return null;
+    try {
+      const { OperatorUser } = JSON.parse(prefs.stdout);
+      return OperatorUser === user.username ? null : user.username;
+    } catch {
+      return null;
+    }
+  },
+  grantTailscaleOperator: (cli, user) => spawnSync("sudo", [cli, "set", `--operator=${user}`], { stdio: "inherit" }).status === 0
 };
 function isTailscaleIPv4(address) {
   const [first, second] = address.split(".").map(Number);
@@ -17808,9 +18307,44 @@ async function confirm(io, prompt, fallback) {
 `);
   }
 }
+async function askGatewayPort(io) {
+  io.stderr(`
+This is not the default data directory, so ports ${DEFAULT_GATEWAY_PORT} and ${DEFAULT_CONTROL_MCP_PORT} stay with the main install. Without a port of its own, this backend takes a free one that changes on each start.
+`);
+  for (;; ) {
+    const answer = await ask(io, "Gateway port for a stable address (empty for a free one): ");
+    if (answer === "")
+      return null;
+    const port = Number(answer);
+    if (/^\d+$/.test(answer) && port >= 1 && port <= 65535 && port !== DEFAULT_GATEWAY_PORT && port !== DEFAULT_CONTROL_MCP_PORT) {
+      return String(port);
+    }
+    io.stderr(`Enter a port from 1 to 65535, other than ${DEFAULT_GATEWAY_PORT} and ${DEFAULT_CONTROL_MCP_PORT}.
+`);
+  }
+}
 function quote(arg) {
   return /^[\w@%+=:,./-]+$/.test(arg) ? arg : `'${arg.replaceAll("'", `'\\''`)}'`;
 }
+function operatorMessage(cli, user) {
+  return [
+    `
+Tailscale only lets root or its operator configure Serve, and ${user} is neither.`,
+    "The backend cannot start with --tailscale-serve until this has been run once:",
+    `  sudo ${quote(cli)} set --operator=${quote(user)}
+`
+  ].join(`
+`);
+}
+function warnIfTailscaleOperatorNeeded(io, serveArgs, probe = systemSetupProbe) {
+  if (!serveArgs.includes("--tailscale-serve"))
+    return;
+  const binFlag = serveArgs.indexOf("--tailscale-bin");
+  const cli = (binFlag >= 0 ? serveArgs[binFlag + 1] : undefined) ?? io.env.ORKESTRATOR_TAILSCALE_BIN ?? probe.findTailscaleCli();
+  const user = cli ? probe.tailscaleOperatorNeeded(cli) : null;
+  if (cli && user)
+    io.stderr(operatorMessage(cli, user));
+}
 async function askServeArguments(io, options2) {
   const source = io;
   io = {
@@ -17843,16 +18377,30 @@ async function askServeArguments(io, options2) {
 This machine has no Tailscale address yet. Connect Tailscale before the service starts, or it will not serve.
 `);
   }
+  if (access === "tailnet" && options2.secondBackend) {
+    const port = await askGatewayPort(io);
+    if (port)
+      args.push("--port", port);
+  }
   if (access === "serve") {
     args.push("--tailscale-serve");
-    if (!probe.findTailscaleCli()) {
+    let cli = probe.findTailscaleCli();
+    if (!cli) {
       io.stderr(`
 The Tailscale CLI was not found, and Tailscale Serve needs it.
 `);
-      const cli = await ask(io, "Path to the tailscale executable (empty to keep `tailscale`): ");
+      cli = await ask(io, "Path to the tailscale executable (empty to keep `tailscale`): ");
       if (cli !== "")
         args.push("--tailscale-bin", cli);
     }
+    const operator = cli ? probe.tailscaleOperatorNeeded(cli) : null;
+    if (cli && operator) {
+      io.stderr(operatorMessage(cli, operator));
+      const granted = !options2.dryRun && await confirm(io, "Run it now with sudo?", true) && probe.grantTailscaleOperator(cli, operator);
+      if (!granted && !options2.dryRun)
+        io.stderr(`Continuing without it.
+`);
+    }
     if (await confirm(io, `
 Allow the hosted web client at orkestrator.dev?`, true)) {
       args.push("--allowed-origins", HOSTED_WEB_ORIGINS);
@@ -17934,6 +18482,8 @@ ${args}
   }
   const name = `orkestrator-backend${tag}.service`;
   const configHome = options2.env.XDG_CONFIG_HOME ?? path14.join(home, ".config");
+  const xdgEnvironment = options2.env.XDG_CONFIG_HOME === undefined ? "" : `Environment=${systemdWord(`XDG_CONFIG_HOME=${options2.env.XDG_CONFIG_HOME}`)}
+`;
   return {
     manager: "systemd",
     name,
@@ -17947,7 +18497,7 @@ Type=simple
 ExecStart=${[options2.bun, options2.launcher, options2.dataDir].map(systemdWord).join(" ")}
 Environment=${systemdWord(`PATH=${pathValue}`)}
 Environment=NODE_ENV=production
-Restart=always
+${xdgEnvironment}Restart=always
 RestartSec=10
 StandardOutput=append:${options2.logFile}
 StandardError=append:${options2.logFile}
@@ -18032,8 +18582,43 @@ function unitFor(context, dataDir, bun) {
     };
   });
 }
+async function startupFailedError(version, failure, logFile, logOffset) {
+  const excerpt = await startupLogExcerpt(logFile, logOffset, version);
+  return new CliError("operation-failed", [
+    failure.restoredVersion ? `orkestrator@${version} did not start, so the service went back to ${failure.restoredVersion}.` : `orkestrator@${version} did not start, and the service keeps retrying it.`,
+    ...excerpt.length > 0 ? ["", ...excerpt, ""] : [],
+    `Fix the cause, then run this command again. Full log: ${logFile}`
+  ].join(`
+`), { retryable: true });
+}
+async function freeServicePort(allocate = probeServicePort) {
+  for (let attempt = 0;attempt < 32; attempt += 1) {
+    const port = await allocate();
+    if (validServicePort(String(port)))
+      return String(port);
+  }
+  throw new Error("Unable to allocate an unreserved service port");
+}
+function validServicePort(value) {
+  const port = Number(value);
+  return value !== undefined && String(port) === value && Number.isInteger(port) && port > 0 && port <= 65535 && port !== DEFAULT_GATEWAY_PORT && port !== DEFAULT_CONTROL_MCP_PORT ? value : undefined;
+}
+async function probeServicePort() {
+  return new Promise((resolve, reject) => {
+    const probe = createServer();
+    probe.once("error", reject);
+    probe.listen(0, "127.0.0.1", () => {
+      const address = probe.address();
+      probe.close(() => resolve(typeof address === "object" && address ? address.port : 0));
+    });
+  });
+}
+function portArgument(args) {
+  const index = args?.indexOf("--port") ?? -1;
+  return index >= 0 ? args?.[index + 1] : undefined;
+}
 function runManager(argv, allowFailure = false) {
-  const result = spawnSync(argv[0], argv.slice(1), { encoding: "utf8", timeout: 60000 });
+  const result = spawnSync2(argv[0], argv.slice(1), { encoding: "utf8", timeout: 60000 });
   const ok = result.status === 0;
   if (!ok && !allowFailure) {
     throw new CliError("operation-failed", `${argv.join(" ")} failed: ${(result.stderr || result.stdout || "").trim().slice(0, 300)}`);
@@ -18055,10 +18640,19 @@ var serviceCommands = [
       "With none, in a terminal, it asks how clients will connect (Tailscale Serve, the",
       "tailnet address or SSH) and prints the equivalent command; --yes skips the questions.",
       "The Bun running this command is the Bun the service uses; reinstall to change it.",
+      "",
+      "Only the default data directory's backend uses the fixed gateway port. With another",
+      "--data-dir and no `--port`, the backend takes a free port that changes on each start,",
+      "so pass `-- --port PORT` for a stable address. --tailscale-serve gets a free port",
+      "chosen once, here, with strict binding so it cannot move to a fallback port.",
       "On Linux, run `loginctl enable-linger $USER` so the service runs without a login.",
       "",
       "Once the service is running, the address it serves and its gateway token are printed.",
-      "The token is shown only in this terminal: never in --output json or the service log."
+      "The token is shown only in this terminal: never in --output json or the service log.",
+      "If the release cannot start, the command fails with what the service logged.",
+      "",
+      "On Linux, --tailscale-serve needs `sudo tailscale set --operator=$USER` once; the",
+      "questions offer to run it, and a scripted install warns when it is missing."
     ].join(`
 `),
     positionals: [],
@@ -18115,13 +18709,30 @@ var serviceCommands = [
       if (readyWaitMs > PUBLIC_API_LIMITS.waitMaxMs) {
         throw new CliError("invalid-input", "--timeout may be at most 24h");
       }
-      const serveArgs = interactive ? await askServeArguments(context.io, {
+      const secondBackend = !isDefaultDataDir(dataDir, process.platform, context.io.env);
+      const requestedArgs = interactive ? await askServeArguments(context.io, {
         installCommand: installCommandLine(parsed),
-        signal: context.signal
+        signal: context.signal,
+        dryRun: parsed.options["dry-run"] === true,
+        secondBackend
       }) : parsed.rest;
+      if (!interactive)
+        warnIfTailscaleOperatorNeeded(context.io, requestedArgs);
       const bun = process.execPath;
       const bunVersion = typeof Bun === "undefined" ? "" : Bun.version;
       const { service, layout, unit } = await unitFor(context, dataDir, bun);
+      const pinsPort = secondBackend && requestedArgs.includes("--tailscale-serve") && !requestedArgs.includes("--port");
+      const serveArgs = pinsPort && parsed.options["dry-run"] !== true ? [
+        ...requestedArgs,
+        "--port",
+        validServicePort(portArgument(service.readServiceConfig(layout)?.args)) ?? await freeServicePort(),
+        "--strict-gateway-port"
+      ] : requestedArgs;
+      const portNote = pinsPort ? [
+        "This is not the default data directory, so its gateway keeps a free port chosen at install instead of the fixed one."
+      ] : secondBackend && !requestedArgs.includes("--port") ? [
+        "This is not the default data directory, so its gateway takes a free port that changes on each start. For a stable address, reinstall with `-- --port PORT`."
+      ] : [];
       const summary = {
         dataDir,
         version,
@@ -18143,6 +18754,7 @@ var serviceCommands = [
               ["unit", `${unit.manager} ${unit.name} \u2192 ${unit.file}`],
               ["serve arguments", serveArgs.join(" ") || "(none)"]
             ]),
+            ...portNote,
             "",
             "Dry run: nothing was installed."
           ]
@@ -18158,13 +18770,17 @@ var serviceCommands = [
         throw new CliError("operation-failed", `Could not install orkestrator@${version}: ${error instanceof Error ? error.message : String(error)}`, { retryable: true });
       }
       await service.installLauncher(layout, releaseDir);
+      const rollbackTarget = service.nextRollbackTarget(layout, service.readServiceConfig(layout), service.linkedVersion(layout.current), version);
       await service.activateRelease(layout, version);
+      const installGeneration = randomUUID4();
       await service.writeServiceConfig(layout, {
+        installGeneration,
         version: 1,
         dataDir,
         bun,
         bunVersion,
         args: serveArgs,
+        ...rollbackTarget ? { rollbackTarget } : {},
         installedAt: new Date().toISOString()
       });
       await mkdir2(layout.logs, { recursive: true });
@@ -18175,6 +18791,8 @@ var serviceCommands = [
       let connection = null;
       if (started) {
         const previousGeneration = await currentDescriptorGeneration(dataDir);
+        const loadedAt = Date.now();
+        const logOffset = await stat2(logFile).then((file) => file.size, () => 0);
         const commands = serviceManagerCommands(unit);
         commands.load.forEach((argv, index) => runManager(argv, unit.manager === "launchd" && index === 0));
         if (readyWaitMs > 0) {
@@ -18182,7 +18800,13 @@ var serviceCommands = [
 `);
           connection = await awaitServiceConnection(dataDir, previousGeneration, {
             timeoutMs: readyWaitMs,
-            signal: context.signal
+            signal: context.signal,
+            expectedVersion: version,
+            assertStarting: async () => {
+              const failure = service.readStartupFailure(layout, version, loadedAt, installGeneration);
+              if (failure)
+                throw await startupFailedError(version, failure, logFile, logOffset);
+            }
           });
         }
       }
@@ -18193,6 +18817,7 @@ var serviceCommands = [
           started,
           ready: connection !== null,
           browserUrl: connection?.browserUrl ?? null,
+          clientUrls: connection?.clientUrls ?? [],
           authFile: connection?.authFile ?? null,
           ...connection?.credentialError ? { credentialError: connection.credentialError } : {},
           ...summary
@@ -18209,6 +18834,7 @@ var serviceCommands = [
             "",
             ...keyValues([
               ["address", connection.browserUrl ?? "(no browser listener; see the log)"],
+              ...connection.clientUrls.length > 0 ? [["local listeners", connection.clientUrls.join(", ")]] : [],
               ["auth file", connection.authFile],
               ...context.io.stdoutIsTty && context.global.output === "human" && connection.token ? [["token", connection.token]] : []
             ]),
@@ -18217,6 +18843,7 @@ var serviceCommands = [
             "",
             `The backend has not reported ready yet. Follow ${logFile}; its address and token file are logged there.`
           ] : [],
+          ...portNote,
           ...unit.manager === "systemd" ? ["Run `loginctl enable-linger $USER` so it keeps running after you log out."] : []
         ]
       };
@@ -18269,15 +18896,17 @@ var serviceCommands = [
       const state = service.readLauncherState(layout);
       const installed = existsSync6(unit.file);
       const running = installed ? runManager(serviceManagerCommands(unit).status, true).ok : false;
+      const current = service.linkedVersion(layout.current);
+      const previous = service.linkedVersion(layout.previous);
       const result = {
         dataDir,
         installed,
         running,
         unit: { manager: unit.manager, name: unit.name, file: unit.file },
-        current: service.linkedVersion(layout.current),
-        previous: service.linkedVersion(layout.previous),
+        current,
+        previous,
         bun: config?.bun ?? null,
-        args: config?.args ?? [],
+        args: service.effectiveServiceArguments(config, current, previous),
         lastReadyVersion: state.lastReadyVersion,
         rollback: state.rollback
       };
@@ -18850,6 +19479,345 @@ var runCommands = [
   }
 ];
 
+// src/client/commands/session-goal.ts
+var WAIT_OPTIONS2 = [
+  {
+    name: "wait",
+    kind: "boolean",
+    description: "Observe the goal until it stops. Exit 0 for complete, 10 claimed, 11 blocked, 12 limited, 13 paused, 14 cleared or replaced."
+  },
+  TIMEOUT_OPTION,
+  {
+    name: "continue-on-interaction",
+    kind: "boolean",
+    description: "While waiting, keep waiting when a turn needs an answer (another client may answer)."
+  }
+];
+var LIMIT_OPTIONS = [
+  {
+    name: "max-iterations",
+    kind: "integer",
+    valueName: "N",
+    description: `Turns the backend may send, at most ${NATIVE_AGENT_GOAL_LIMITS.maxIterationsLimit}.`
+  },
+  {
+    name: "budget",
+    kind: "integer",
+    valueName: "TOKENS",
+    description: "Tokens the goal may spend; refused where the provider reports no usage."
+  }
+];
+var LIMIT_FIELDS = { budget: "tokenBudget" };
+function limitsInput(options2) {
+  return {
+    ...options2["max-iterations"] !== undefined ? { maxIterations: options2["max-iterations"] } : {},
+    ...options2.budget !== undefined ? { tokenBudget: options2.budget } : {}
+  };
+}
+function goalLines(read) {
+  const goal = read.goal;
+  if (!goal)
+    return ["no goal"];
+  return keyValues([
+    ["goal", goal.goalId],
+    ["status", goal.status],
+    ["reason", read.description],
+    ["iterations", `${goal.iterations}/${goal.maxIterations}`],
+    [
+      "tokens",
+      goal.tokenBudget !== undefined ? `${goal.tokensUsed ?? 0}/${goal.tokenBudget}` : undefined
+    ],
+    ["check", goal.check],
+    [
+      "verifier",
+      goal.verifier ? `${goal.verifier.agent}${goal.verifier.model ? `:${goal.verifier.model}` : ""}` : undefined
+    ],
+    ["last check", goal.lastCheck ? goal.lastCheck.passed ? "passed" : "failed" : undefined],
+    ["objective", goal.objective]
+  ]);
+}
+function goalDetails(sessionId, goal) {
+  return {
+    sessionId,
+    goalId: goal.goalId,
+    status: goal.status,
+    ...goal.statusReason ? { statusReason: goal.statusReason } : {},
+    iterations: goal.iterations,
+    maxIterations: goal.maxIterations
+  };
+}
+var STOPPED_MESSAGES = {
+  "goal-claimed": "The agent says the goal is done, and nothing verified it",
+  "goal-blocked": "The goal is blocked: the agent says it needs a person",
+  "goal-limited": "The goal reached its iteration cap or token budget",
+  "goal-paused": "The goal is paused"
+};
+async function waitForGoal(context, session, sessionId, goalId, timeoutMs, options2) {
+  let latest;
+  const receiptOption = options2.receipt ? { receipt: options2.receipt } : {};
+  try {
+    return await observe(async () => {
+      const read = await session.read("session.goal.get", {
+        sessionId,
+        ...options2.includeCheckOutput ? { includeCheckOutput: true } : {}
+      });
+      const verdict = classifyGoalForWait(read, goalId, {
+        continueOnInteraction: options2.continueOnInteraction
+      });
+      if (verdict.kind === "pending") {
+        latest = verdict.goal;
+        return { done: false };
+      }
+      if (verdict.kind === "complete")
+        return {
+          done: true,
+          value: {
+            ...read,
+            goal: verdict.goal,
+            description: "Complete",
+            ...read.goal?.goalId !== goalId ? { checkOutput: undefined } : {}
+          }
+        };
+      if (verdict.kind === "interaction") {
+        throw new CliError("interaction-required", "The goal's turn is waiting for an answer to a pending interaction", {
+          ...receiptOption,
+          details: {
+            ...goalDetails(sessionId, verdict.goal),
+            pendingInteractionCount: read.pendingInteractionCount
+          }
+        });
+      }
+      if (verdict.kind === "gone") {
+        throw new CliError("goal-gone", "The goal was cleared or replaced before it ended", {
+          ...receiptOption,
+          details: {
+            sessionId,
+            goalId,
+            ...verdict.goal ? { status: verdict.goal.status } : {}
+          }
+        });
+      }
+      throw new CliError(verdict.code, STOPPED_MESSAGES[verdict.code], {
+        ...receiptOption,
+        details: goalDetails(sessionId, verdict.goal)
+      });
+    }, { timeoutMs, signal: context.signal });
+  } catch (error) {
+    if (!(error instanceof ObservationStopped))
+      throw error;
+    const details = { sessionId, goalId, ...latest ? goalDetails(sessionId, latest) : {} };
+    if (error.reason === "signal") {
+      throw new CliError("observation-interrupted", "Stopped observing the goal; it continues in the backend", { ...receiptOption, details: { ...details, signal: signalName(context.signal) } });
+    }
+    throw new CliError("deadline-exceeded", "Timed out observing the goal; it continues in the backend. `session goal get --wait` observes it again", { ...receiptOption, details });
+  }
+}
+function waitOutcome(base, read) {
+  return {
+    ...base,
+    result: read,
+    human: goalLines(read),
+    ids: read.goal ? [read.goal.goalId] : []
+  };
+}
+async function runLoopMutation(context, parsed, action, input) {
+  const options2 = parsed.options;
+  const sessionId = parsed.positionals.session;
+  validateWaitOptions(options2);
+  if (options2.wait !== true) {
+    const { session, result, receipt, warnings } = await submit(context, action, input, options2);
+    return {
+      action,
+      result,
+      receipt,
+      warnings,
+      connection: session.identity,
+      ids: result.goal ? [result.goal.goalId] : [],
+      human: result.goal ? keyValues([
+        ["goal", result.goal.goalId],
+        ["status", result.goal.status],
+        ["iterations", `${result.goal.iterations}/${result.goal.maxIterations}`]
+      ]) : receipt ? receiptLines(receipt) : []
+    };
+  }
+  const budget = options2.timeout ?? DEFAULT_WAIT_MS;
+  const started = Date.now();
+  const submitted = await submitForWait(context, action, input, options2, budget);
+  const { session, warnings } = submitted;
+  let receipt = submitted.receipt;
+  let mutation = submitted.result;
+  if (!mutation && receipt) {
+    receipt = await waitForOperation(context, session, receipt, budget - (Date.now() - started));
+    const failure = receiptFailure(receipt);
+    if (failure)
+      throw failure;
+    mutation = receipt.result;
+  }
+  const goalId = mutation?.goal?.goalId;
+  if (!goalId)
+    throw new CliError("response-invalid", `${action} returned no goal`);
+  const read = await waitForGoal(context, session, sessionId, goalId, Math.max(0, budget - (Date.now() - started)), {
+    continueOnInteraction: options2["continue-on-interaction"] === true,
+    ...receipt ? { receipt } : {}
+  });
+  return waitOutcome({ action, result: read, receipt, warnings, connection: session.identity }, read);
+}
+var sessionGoalCommands = [
+  {
+    path: ["session", "goal", "set"],
+    action: "session.goal.set",
+    summary: "Give a session a goal: the backend sends turns until a check proves it or it stops.",
+    description: "Pass the objective with --objective, --objective-file or --objective-stdin. Without --check or --verifier, a done report ends the goal as claimed: nothing verified it, and --wait exits 10. A session holds one goal, and a running goal is refused (exit 8) until it is cleared. A goal never changes the permission mode, so an approval still parks a turn (--wait exits 6).",
+    positionals: [{ name: "session", required: true }],
+    options: [
+      {
+        name: "objective-file",
+        kind: "string",
+        valueName: "PATH",
+        description: "Read the objective from a local file."
+      },
+      { name: "objective-stdin", kind: "boolean", description: "Read the objective from stdin." },
+      { name: "objective", kind: "string", valueName: "TEXT", description: "Inline objective." },
+      {
+        name: "check",
+        kind: "string",
+        valueName: "COMMAND",
+        description: "One-line shell command run in the workspace on a done report; exit 0 completes the goal."
+      },
+      {
+        name: "verifier",
+        kind: "string",
+        valueName: "AGENT[:MODEL]",
+        description: "A fresh read-only session on that agent judges the work on a done report; with --check, both must pass."
+      },
+      ...LIMIT_OPTIONS,
+      ...WAIT_OPTIONS2,
+      REQUEST_ID_OPTION
+    ],
+    inputFields: { ...LIMIT_FIELDS, "objective-file": "objective", "objective-stdin": "objective" },
+    idOutput: "goal ID",
+    examples: [
+      'orkestrator session goal set ses_\u2026 --objective "Make the tests pass" --check "bun test" --max-iterations 10 --wait --timeout 2h'
+    ],
+    async run(context, parsed) {
+      const options2 = parsed.options;
+      validateWaitOptions(options2);
+      const verifier = options2.verifier === undefined ? undefined : parseVerifierFlag(String(options2.verifier));
+      if (verifier && "error" in verifier)
+        throw new CliError("invalid-input", verifier.error);
+      const objective = await readTextSource(context.io, {
+        file: options2["objective-file"],
+        stdin: options2["objective-stdin"],
+        inline: options2.objective,
+        label: "Objective",
+        maxBytes: NATIVE_AGENT_GOAL_LIMITS.objectiveMaxChars * 4,
+        names: {
+          file: "--objective-file",
+          stdin: "--objective-stdin",
+          inline: "--objective"
+        },
+        required: true
+      });
+      return runLoopMutation(context, parsed, "session.goal.set", {
+        sessionId: parsed.positionals.session,
+        objective,
+        ...options2.check !== undefined ? { check: options2.check } : {},
+        ...verifier ? { verifier } : {},
+        ...limitsInput(options2)
+      });
+    }
+  },
+  {
+    path: ["session", "goal", "get"],
+    action: "session.goal.get",
+    summary: "Show a session's goal: status, iterations, limits and the last check.",
+    description: "Reads the session record and starts nothing. With no goal the result's goal is null and the exit is 0, unless --wait is given, which exits 14. --wait observes the goal the session holds now, so it picks up a goal after an earlier --wait timed out.",
+    positionals: [{ name: "session", required: true }],
+    options: [
+      {
+        name: "check-output",
+        kind: "boolean",
+        description: "Include the last check's output tail. It is untrusted command output."
+      },
+      ...WAIT_OPTIONS2
+    ],
+    inputFields: { "check-output": "includeCheckOutput" },
+    idOutput: "goal ID",
+    async run(context, parsed) {
+      const options2 = parsed.options;
+      validateWaitOptions(options2);
+      const sessionId = parsed.positionals.session;
+      const session = await context.session();
+      const first = await session.read("session.goal.get", {
+        sessionId,
+        ...options2["check-output"] === true ? { includeCheckOutput: true } : {}
+      });
+      const base = { action: "session.goal.get", connection: session.identity };
+      if (options2.wait !== true)
+        return waitOutcome({ ...base, result: first }, first);
+      const goalId = first.goal?.goalId;
+      if (!goalId) {
+        throw new CliError("goal-gone", "The session has no goal to wait for", {
+          details: { sessionId }
+        });
+      }
+      const read = await waitForGoal(context, session, sessionId, goalId, options2.timeout ?? DEFAULT_WAIT_MS, {
+        continueOnInteraction: options2["continue-on-interaction"] === true,
+        includeCheckOutput: options2["check-output"] === true
+      });
+      return waitOutcome({ ...base, result: read }, read);
+    }
+  },
+  {
+    path: ["session", "goal", "pause"],
+    action: "session.goal.pause",
+    summary: "Pause a running goal; no further turn starts until it is resumed.",
+    description: "A turn already running finishes. Use `session stop` to stop it too. Refused (exit 8) when no goal is running.",
+    positionals: [{ name: "session", required: true }],
+    options: [REQUEST_ID_OPTION],
+    idOutput: "goal ID",
+    run: (context, parsed) => runGoalControl(context, parsed, "session.goal.pause")
+  },
+  {
+    path: ["session", "goal", "resume"],
+    action: "session.goal.resume",
+    summary: "Resume a stopped goal, optionally with a higher limit.",
+    description: "A goal stopped by its limit needs a higher --max-iterations or --budget. An ended goal (claimed, complete) cannot resume; set a new one. Refused with exit 8.",
+    positionals: [{ name: "session", required: true }],
+    options: [...LIMIT_OPTIONS, ...WAIT_OPTIONS2, REQUEST_ID_OPTION],
+    inputFields: LIMIT_FIELDS,
+    idOutput: "goal ID",
+    run: (context, parsed) => runLoopMutation(context, parsed, "session.goal.resume", {
+      sessionId: parsed.positionals.session,
+      ...limitsInput(parsed.options)
+    })
+  },
+  {
+    path: ["session", "goal", "clear"],
+    action: "session.goal.clear",
+    summary: "Remove a session's goal, in any status.",
+    description: "What the agent did stays, and the goal stays readable in the goal history. A session with no goal stays that way and exits 0.",
+    positionals: [{ name: "session", required: true }],
+    options: [REQUEST_ID_OPTION],
+    idOutput: "goal ID",
+    run: (context, parsed) => runGoalControl(context, parsed, "session.goal.clear")
+  }
+];
+async function runGoalControl(context, parsed, action) {
+  const { session, result, receipt, warnings } = await submit(context, action, { sessionId: parsed.positionals.session }, parsed.options);
+  return {
+    action,
+    result,
+    receipt,
+    warnings,
+    connection: session.identity,
+    ids: result.goal ? [result.goal.goalId] : [],
+    human: action === "session.goal.clear" ? [result.cleared ? "cleared" : "no goal"] : [
+      `paused${result.goal ? ` at ${result.goal.iterations}/${result.goal.maxIterations}` : ""}`
+    ]
+  };
+}
+
 // src/client/commands/ticket.ts
 var STATUSES = ["backlog", "in-progress", "review", "done"];
 var KINDS3 = ["feature", "work-brief"];
@@ -19267,6 +20235,742 @@ var toolchainCommands = [
   }
 ];
 
+// ../protocol/src/public-api-inputs-pr.ts
+var PUBLIC_PR_BODY_MAX_CHARS = 65536;
+var PUBLIC_PR_REVIEW_COMMENTS_MAX = 200;
+var PUBLIC_PR_REVIEWERS_MAX = 100;
+var PUBLIC_PR_MERGE_METHODS = Object.freeze(["squash", "merge", "rebase"]);
+var PUBLIC_PR_LIST_FILTERS = Object.freeze([
+  "open",
+  "mine",
+  "review-requested",
+  "closed"
+]);
+var PUBLIC_PR_REVIEW_EVENTS = Object.freeze([
+  "APPROVE",
+  "REQUEST_CHANGES",
+  "COMMENT"
+]);
+var PUBLIC_PR_SIDES = Object.freeze(["LEFT", "RIGHT"]);
+function schema4(properties, required = []) {
+  return { type: "object", properties, required, additionalProperties: false };
+}
+var environmentId = {
+  type: "string",
+  minLength: 1,
+  maxLength: PUBLIC_API_LIMITS.idMaxChars,
+  description: "Environment ID, from environment.list. Its attached pull request is the target."
+};
+var projectId = {
+  type: "string",
+  minLength: 1,
+  maxLength: PUBLIC_API_LIMITS.idMaxChars,
+  description: "Project ID, from project.list."
+};
+var body = {
+  type: "string",
+  minLength: 1,
+  maxLength: PUBLIC_PR_BODY_MAX_CHARS,
+  description: "Markdown text, posted as the GitHub user configured in Settings."
+};
+var filePath = {
+  type: "string",
+  minLength: 1,
+  maxLength: PUBLIC_API_LIMITS.pathMaxChars,
+  description: "Repository-relative path of a changed file, from pr.files."
+};
+var threadId = {
+  type: "string",
+  minLength: 1,
+  maxLength: PUBLIC_API_LIMITS.idMaxChars,
+  description: "Review thread ID, from pr.files."
+};
+var commitSha = {
+  type: "string",
+  minLength: 40,
+  maxLength: 40
+};
+var line = {
+  type: "integer",
+  minimum: 1,
+  description: "Line in the new file (RIGHT) or the old file (LEFT)."
+};
+var side = {
+  type: "string",
+  enum: PUBLIC_PR_SIDES,
+  description: "RIGHT: the new file. LEFT: the old file."
+};
+var startLine = {
+  type: "integer",
+  minimum: 1,
+  description: "First line of a multi-line comment; below line."
+};
+var reviewerList = {
+  type: "array",
+  maxItems: PUBLIC_PR_REVIEWERS_MAX,
+  items: { type: "string", minLength: 1, maxLength: PUBLIC_API_LIMITS.nameMaxChars }
+};
+var environmentOnly = schema4({ environmentId }, ["environmentId"]);
+var environmentExamples = [{ environmentId: "env-1" }];
+var PR_ACTION_INPUTS = Object.freeze({
+  "pr.get": {
+    capability: "sessions.read",
+    confirmation: "never",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.list": {
+    capability: "sessions.read",
+    confirmation: "never",
+    input: schema4({
+      projectId,
+      filter: {
+        type: "string",
+        enum: PUBLIC_PR_LIST_FILTERS,
+        description: "Which pull requests (default open)."
+      },
+      query: {
+        type: "string",
+        minLength: 1,
+        maxLength: 256,
+        description: "Search text, as in the pull request list's search box."
+      }
+    }, ["projectId"]),
+    examples: [{ projectId: "project-1" }, { projectId: "project-1", filter: "closed" }]
+  },
+  "pr.timeline": {
+    capability: "sessions.read",
+    confirmation: "never",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.files": {
+    capability: "sessions.read",
+    confirmation: "never",
+    input: schema4({
+      environmentId,
+      path: {
+        ...filePath,
+        description: "Return only this file, with its diff hunks. Omitted: every file without hunks, to keep the result small."
+      }
+    }, ["environmentId"]),
+    examples: [{ environmentId: "env-1" }, { environmentId: "env-1", path: "src/index.ts" }]
+  },
+  "pr.options": {
+    capability: "sessions.read",
+    confirmation: "never",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.merge": {
+    capability: "environments.destructive",
+    confirmation: "always",
+    input: schema4({
+      environmentId,
+      method: {
+        type: "string",
+        enum: PUBLIC_PR_MERGE_METHODS,
+        description: "How to merge (default squash, as on the Merge button)."
+      },
+      deleteBranch: {
+        type: "boolean",
+        description: "Delete the head branch after merging (default true). A project's home checkout keeps its branch."
+      },
+      cleanup: {
+        type: "boolean",
+        description: "Merge and Cleanup: delete this environment and its worktree once the merge is confirmed. Cannot be combined with deleteBranch false."
+      },
+      expectedPrUrl: {
+        type: "string",
+        description: "Refuse if the attached PR or the explicit cleanup/branch effects changed since confirmation."
+      },
+      expectedHeadSha: {
+        ...commitSha,
+        description: "headSha from pr.get. The merge is refused if the branch has moved since, so what merges is what was read."
+      }
+    }, ["environmentId"]),
+    examples: [
+      { environmentId: "env-1" },
+      { environmentId: "env-1", method: "rebase", deleteBranch: false },
+      { environmentId: "env-1", cleanup: true },
+      { environmentId: "env-1", expectedHeadSha: "0123456789abcdef0123456789abcdef01234567" }
+    ]
+  },
+  "pr.close": {
+    capability: "sessions.control",
+    confirmation: "always",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.reopen": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.ready": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.draft": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: environmentOnly,
+    examples: environmentExamples
+  },
+  "pr.comment": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({ environmentId, body }, ["environmentId", "body"]),
+    examples: [{ environmentId: "env-1", body: "Merging once CI is green." }]
+  },
+  "pr.comment.edit": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({
+      environmentId,
+      commentId: {
+        type: "integer",
+        minimum: 1,
+        description: "Comment ID, from pr.get or a pr.comment result."
+      },
+      body
+    }, ["environmentId", "commentId", "body"]),
+    examples: [{ environmentId: "env-1", commentId: 123, body: "Merged after the fix." }]
+  },
+  "pr.review": {
+    capability: "sessions.control",
+    confirmation: "always",
+    input: schema4({
+      environmentId,
+      event: {
+        type: "string",
+        enum: PUBLIC_PR_REVIEW_EVENTS,
+        description: "The verdict. REQUEST_CHANGES needs body; COMMENT needs body or comments. GitHub refuses approving your own pull request."
+      },
+      body: { ...body, description: "Review summary." },
+      commitId: {
+        ...commitSha,
+        description: "The commit reviewed (headSha from pr.get). Omitted: the current head."
+      },
+      comments: {
+        type: "array",
+        maxItems: PUBLIC_PR_REVIEW_COMMENTS_MAX,
+        description: "Inline comments submitted with the review.",
+        items: {
+          type: "object",
+          properties: { path: filePath, line, side, startLine, body },
+          required: ["path", "line", "side", "body"],
+          additionalProperties: false
+        }
+      }
+    }, ["environmentId", "event"]),
+    examples: [
+      { environmentId: "env-1", event: "APPROVE" },
+      {
+        environmentId: "env-1",
+        event: "COMMENT",
+        comments: [{ path: "src/index.ts", line: 12, side: "RIGHT", body: "Is this bounded?" }]
+      }
+    ]
+  },
+  "pr.review.comment": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({
+      environmentId,
+      path: filePath,
+      line,
+      side,
+      startLine,
+      body,
+      commitId: {
+        ...commitSha,
+        description: "The commit commented on. Omitted: the pull request's current head."
+      }
+    }, ["environmentId", "path", "line", "side", "body"]),
+    examples: [
+      { environmentId: "env-1", path: "src/index.ts", line: 12, side: "RIGHT", body: "Why?" }
+    ]
+  },
+  "pr.thread.reply": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({ environmentId, threadId, body }, ["environmentId", "threadId", "body"]),
+    examples: [{ environmentId: "env-1", threadId: "PRRT_1", body: "Fixed." }]
+  },
+  "pr.thread.resolve": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({
+      environmentId,
+      threadId,
+      resolved: { type: "boolean", description: "False to unresolve (default true)." }
+    }, ["environmentId", "threadId"]),
+    examples: [
+      { environmentId: "env-1", threadId: "PRRT_1" },
+      { environmentId: "env-1", threadId: "PRRT_1", resolved: false }
+    ]
+  },
+  "pr.file.viewed": {
+    capability: "sessions.control",
+    confirmation: "never",
+    input: schema4({
+      environmentId,
+      path: filePath,
+      viewed: { type: "boolean", description: "False to clear it (default true)." }
+    }, ["environmentId", "path"]),
+    examples: [{ environmentId: "env-1", path: "src/index.ts" }]
+  },
+  "pr.reviewers": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({
+      environmentId,
+      add: {
+        ...reviewerList,
+        description: "Logins or org/team-slug entries to request a review from."
+      },
+      remove: {
+        ...reviewerList,
+        description: "Logins or org/team-slug entries whose request to remove."
+      }
+    }, ["environmentId"]),
+    examples: [{ environmentId: "env-1", add: ["octocat"] }]
+  },
+  "pr.label": {
+    capability: "sessions.control",
+    confirmation: "voice",
+    input: schema4({
+      environmentId,
+      name: {
+        type: "string",
+        minLength: 1,
+        maxLength: 100,
+        description: "Label name, from pr.options."
+      },
+      present: { type: "boolean", description: "False to remove the label (default true)." }
+    }, ["environmentId", "name"]),
+    examples: [{ environmentId: "env-1", name: "bug" }]
+  }
+});
+
+// src/client/commands/pull-requests.ts
+var ENVIRONMENT = { name: "environment", required: true, description: "Its pull request." };
+var YES_OPTION = {
+  name: "yes",
+  kind: "boolean",
+  description: "Confirm this change on GitHub. Required."
+};
+var BODY_OPTIONS = [
+  { name: "body", kind: "string", valueName: "TEXT", description: "Inline Markdown text." },
+  {
+    name: "body-file",
+    kind: "string",
+    valueName: "PATH",
+    description: "Read the text from a local file."
+  }
+];
+var INLINE_OPTIONS = [
+  { name: "path", kind: "string", valueName: "PATH", description: "Changed file." },
+  { name: "line", kind: "string", valueName: "N", description: "Line of the comment." },
+  { name: "side", kind: "string", valueName: "SIDE", description: "RIGHT (new) or LEFT (old)." },
+  { name: "start-line", kind: "string", valueName: "N", description: "First line of a range." }
+];
+function requireYes(parsed, what) {
+  if (parsed.options.yes !== true) {
+    throw new CliError("invalid-input", `${what}; pass --yes to confirm`);
+  }
+}
+function requiredOption(parsed, name) {
+  const value = stringOption(parsed.options, name);
+  if (!value)
+    throw new CliError("invalid-input", `--${name} is required`);
+  return value;
+}
+function integerOption(parsed, name) {
+  const value = stringOption(parsed.options, name);
+  if (value === undefined)
+    return;
+  const number = Number(value);
+  if (!Number.isSafeInteger(number) || number < 1) {
+    throw new CliError("invalid-input", `--${name} must be a positive integer`);
+  }
+  return number;
+}
+function requiredInteger(parsed, name) {
+  const number = integerOption(parsed, name);
+  if (number === undefined)
+    throw new CliError("invalid-input", `--${name} is required`);
+  return number;
+}
+async function bodyText(context, parsed, required) {
+  const body = await readTextSource(context.io, {
+    file: parsed.options["body-file"],
+    inline: parsed.options.body,
+    label: "Body",
+    maxBytes: PUBLIC_PR_BODY_MAX_CHARS * 4,
+    names: { file: "--body-file", stdin: "", inline: "--body" },
+    required
+  });
+  if (body !== undefined && body.length > PUBLIC_PR_BODY_MAX_CHARS) {
+    throw new CliError("input-too-large", `Body is longer than ${PUBLIC_PR_BODY_MAX_CHARS} characters`);
+  }
+  return body;
+}
+function repeatedList(value) {
+  return typeof value === "string" ? value.split(",").map((entry) => entry.trim()).filter(Boolean) : [];
+}
+function changeHuman(result) {
+  return keyValues(Object.entries(result).filter(([key, value]) => key !== "environmentId" && typeof value !== "object"));
+}
+function change(name, action, summary, options2, input, extras = {}) {
+  return {
+    path: ["pr", name],
+    action,
+    summary,
+    positionals: [ENVIRONMENT],
+    options: [...options2, REQUEST_ID_OPTION],
+    idOutput: "pull request URL",
+    async run(context, parsed) {
+      const environmentId = parsed.positionals.environment;
+      const { session, result, receipt, warnings } = await submit(context, action, { environmentId, ...await input(context, parsed) }, parsed.options);
+      return {
+        action,
+        result,
+        receipt,
+        warnings,
+        connection: session.identity,
+        ids: typeof result.url === "string" ? [result.url] : [],
+        human: changeHuman(result)
+      };
+    },
+    ...extras
+  };
+}
+function read(name, action, summary, options2, input, human) {
+  return {
+    path: ["pr", name],
+    action,
+    summary,
+    positionals: [ENVIRONMENT],
+    options: options2,
+    async run(context, parsed) {
+      const session = await context.session();
+      const result = await session.read(action, {
+        environmentId: parsed.positionals.environment,
+        ...input(parsed)
+      });
+      return { action, result, connection: session.identity, human: human(result) };
+    }
+  };
+}
+function pullRequestLines(result) {
+  const pullRequest = result.pullRequest;
+  if (!pullRequest) {
+    return keyValues([
+      ["attachment", result.attachment],
+      ["url", result.url],
+      ["error", result.error]
+    ]);
+  }
+  return keyValues([
+    ["attachment", result.attachment],
+    ["number", pullRequest.number],
+    ["title", pullRequest.title],
+    ["url", pullRequest.htmlUrl],
+    ["state", pullRequest.isDraft ? `${pullRequest.state} (draft)` : pullRequest.state],
+    ["branch", `${pullRequest.headRef} into ${pullRequest.baseRef}`],
+    ["head", pullRequest.headSha],
+    ["mergeability", pullRequest.mergeability],
+    ["checks", pullRequest.checksState]
+  ]);
+}
+function timelineLines(result) {
+  const items = result.items;
+  const lines = items.flatMap((item) => {
+    if (item.kind === "comment") {
+      return [
+        `comment \xB7 ${item.comment.author?.login ?? "unknown"} \xB7 ${item.comment.createdAt}`,
+        item.comment.body
+      ];
+    }
+    if (item.kind === "event") {
+      return [
+        `event \xB7 ${item.actor?.login ?? "unknown"} \xB7 ${item.createdAt}`,
+        `${item.event}${item.detail ? `: ${item.detail}` : ""}`
+      ];
+    }
+    return [
+      `${item.kind} \xB7 ${item.author?.login ?? (item.kind === "commit" ? item.authorName : undefined) ?? "unknown"} \xB7 ${item.createdAt}`,
+      item.kind === "commit" ? `${item.sha} ${item.message}` : `${item.state}${item.body ? `: ${item.body}` : ""}`
+    ];
+  });
+  if (!items.length)
+    lines.push("No timeline entries.");
+  if (result.truncated)
+    lines.push("Timeline truncated; more entries are available on GitHub.");
+  return lines;
+}
+function fileLines(result) {
+  const lines = keyValues([
+    ["number", result.number],
+    ["head", result.headSha]
+  ]);
+  if (Array.isArray(result.files)) {
+    lines.push(...table(["FILE", "STATUS", "+", "-"], result.files.map((file) => [
+      file.path,
+      file.status,
+      String(file.additions),
+      String(file.deletions)
+    ])));
+  } else {
+    const file = result.file;
+    lines.push(`${file.path} (${file.status}, +${file.additions} -${file.deletions})`);
+    if (!file.patchAvailable)
+      lines.push("Patch unavailable; view this file on GitHub.");
+    else
+      for (const hunk of file.hunks) {
+        lines.push(hunk.header, ...hunk.lines.map((line) => `${line.type === "add" ? "+" : line.type === "remove" ? "-" : line.type === "no-newline" ? "\\" : " "}${line.text}`));
+      }
+  }
+  for (const thread of result.threads ?? []) {
+    lines.push(`Thread ${thread.id} \xB7 ${thread.path}:${thread.line ?? "outdated"} \xB7 ${thread.isResolved ? "resolved" : "unresolved"}${thread.isOutdated ? " \xB7 outdated" : ""}`);
+    for (const comment of thread.comments)
+      lines.push(`${comment.author?.login ?? "unknown"} \xB7 ${comment.createdAt}: ${comment.body}`);
+    if (thread.commentsTruncated)
+      lines.push("Thread comments truncated; see GitHub for more.");
+  }
+  if (result.truncated)
+    lines.push("File list truncated; more files are available on GitHub.");
+  return lines;
+}
+async function reviewComments(context, parsed) {
+  const file = parsed.options["comments-file"];
+  if (file === undefined)
+    return;
+  const text = await readTextSource(context.io, {
+    file,
+    label: "Review comments",
+    maxBytes: PUBLIC_PR_BODY_MAX_CHARS * 4,
+    names: { file: "--comments-file", stdin: "" },
+    required: true
+  });
+  let comments;
+  try {
+    comments = JSON.parse(text);
+  } catch {
+    throw new CliError("invalid-input", "--comments-file must contain a JSON array of inline comments");
+  }
+  if (!Array.isArray(comments) || comments.length > PUBLIC_PR_REVIEW_COMMENTS_MAX)
+    throw new CliError("invalid-input", `--comments-file must contain at most ${PUBLIC_PR_REVIEW_COMMENTS_MAX} inline comments in a JSON array`);
+  return comments;
+}
+var pullRequestCommands = [
+  read("get", "pr.get", "Read the pull request attached to an environment's branch.", [], () => ({}), pullRequestLines),
+  {
+    path: ["pr", "list"],
+    action: "pr.list",
+    summary: "List a project's pull requests from GitHub.",
+    positionals: [{ name: "project", required: true }],
+    options: [
+      {
+        name: "filter",
+        kind: "string",
+        valueName: "FILTER",
+        description: "open (default), mine, review-requested or closed."
+      },
+      { name: "query", kind: "string", valueName: "TEXT", description: "Search text." }
+    ],
+    idOutput: "pull request URLs",
+    async run(context, parsed) {
+      const session = await context.session();
+      const filter = stringOption(parsed.options, "filter");
+      const query = stringOption(parsed.options, "query");
+      const result = await session.read("pr.list", {
+        projectId: parsed.positionals.project,
+        ...filter !== undefined ? { filter: oneOf(filter, PUBLIC_PR_LIST_FILTERS, "--filter") } : {},
+        ...query !== undefined ? { query } : {}
+      });
+      return {
+        action: "pr.list",
+        result,
+        connection: session.identity,
+        ids: result.pullRequests.map((pullRequest) => pullRequest.htmlUrl),
+        human: table(["NUMBER", "STATE", "TITLE"], result.pullRequests.map((pullRequest) => [
+          String(pullRequest.number),
+          pullRequest.state,
+          pullRequest.title
+        ]))
+      };
+    }
+  },
+  read("timeline", "pr.timeline", "Read a pull request's commits, comments, reviews and events.", [], () => ({}), timelineLines),
+  read("files", "pr.files", "Read a pull request's changed files and review threads; with --path, one file's diff.", [
+    {
+      name: "path",
+      kind: "string",
+      valueName: "PATH",
+      description: "Only this file, with hunks."
+    }
+  ], (parsed) => {
+    const path = stringOption(parsed.options, "path");
+    return path !== undefined ? { path } : {};
+  }, fileLines),
+  read("options", "pr.options", "Read the repository's labels and assignable users.", [], () => ({}), (result) => keyValues([
+    [
+      "labels",
+      result.labels.map((label) => label.name).join(", ")
+    ],
+    [
+      "assignable users",
+      result.assignableUsers.map((user) => user.login).join(", ")
+    ]
+  ])),
+  change("merge", "pr.merge", "Merge the environment's pull request into its target branch (squash by default).", [
+    {
+      name: "method",
+      kind: "string",
+      valueName: "METHOD",
+      description: "squash (default), merge or rebase."
+    },
+    { name: "keep-branch", kind: "boolean", description: "Keep the head branch." },
+    {
+      name: "cleanup",
+      kind: "boolean",
+      description: "Merge and Cleanup: also delete the environment once merged."
+    },
+    {
+      name: "expected-head-sha",
+      kind: "string",
+      valueName: "SHA",
+      description: "Refuse if the branch has moved from this commit."
+    },
+    YES_OPTION
+  ], (_context, parsed) => {
+    requireYes(parsed, "Merging cannot be undone");
+    const method = stringOption(parsed.options, "method");
+    const expectedHeadSha = stringOption(parsed.options, "expected-head-sha");
+    return {
+      ...method !== undefined ? { method: oneOf(method, PUBLIC_PR_MERGE_METHODS, "--method") } : {},
+      ...parsed.options["keep-branch"] === true ? { deleteBranch: false } : {},
+      ...parsed.options.cleanup === true ? { cleanup: true } : {},
+      ...expectedHeadSha !== undefined ? { expectedHeadSha } : {}
+    };
+  }, { inputFields: { "keep-branch": "deleteBranch", yes: null } }),
+  change("close", "pr.close", "Close the environment's pull request without merging.", [YES_OPTION], (_context, parsed) => {
+    requireYes(parsed, "This closes the pull request");
+    return {};
+  }, { inputFields: { yes: null } }),
+  change("reopen", "pr.reopen", "Reopen the environment's closed pull request.", [], () => ({})),
+  change("ready", "pr.ready", "Mark the environment's draft pull request ready.", [], () => ({})),
+  change("draft", "pr.draft", "Convert the environment's pull request to a draft.", [], () => ({})),
+  change("comment", "pr.comment", "Add a conversation comment to the environment's pull request.", BODY_OPTIONS, async (context, parsed) => ({ body: await bodyText(context, parsed, true) }), { inputFields: { "body-file": "body" } }),
+  change("comment-edit", "pr.comment.edit", "Edit a conversation comment on the environment's pull request.", [
+    { name: "comment-id", kind: "string", valueName: "ID", description: "From pr get." },
+    ...BODY_OPTIONS
+  ], async (context, parsed) => ({
+    commentId: requiredInteger(parsed, "comment-id"),
+    body: await bodyText(context, parsed, true)
+  }), { inputFields: { "body-file": "body" } }),
+  change("review", "pr.review", "Submit a review: approve, request changes or comment.", [
+    {
+      name: "event",
+      kind: "string",
+      valueName: "EVENT",
+      description: "APPROVE, REQUEST_CHANGES or COMMENT."
+    },
+    ...BODY_OPTIONS,
+    { name: "commit-id", kind: "string", valueName: "SHA", description: "The commit reviewed." },
+    {
+      name: "comments-file",
+      kind: "string",
+      valueName: "PATH",
+      description: "JSON array of inline comments (path, line, side, body and optional startLine)."
+    },
+    YES_OPTION
+  ], async (context, parsed) => {
+    requireYes(parsed, "This submits a review as your GitHub user");
+    const body = await bodyText(context, parsed, false);
+    const commitId = stringOption(parsed.options, "commit-id");
+    const comments = await reviewComments(context, parsed);
+    return {
+      ...comments !== undefined ? { comments } : {},
+      event: oneOf(parsed.options.event, PUBLIC_PR_REVIEW_EVENTS, "--event"),
+      ...body !== undefined ? { body } : {},
+      ...commitId !== undefined ? { commitId } : {}
+    };
+  }, { inputFields: { "body-file": "body", "comments-file": "comments", yes: null } }),
+  change("review-comment", "pr.review.comment", "Add one inline review comment to the environment's pull request.", [
+    ...INLINE_OPTIONS,
+    ...BODY_OPTIONS,
+    {
+      name: "commit-id",
+      kind: "string",
+      valueName: "SHA",
+      description: "Omitted: the current head."
+    }
+  ], async (context, parsed) => {
+    const startLine = integerOption(parsed, "start-line");
+    const commitId = stringOption(parsed.options, "commit-id");
+    return {
+      path: requiredOption(parsed, "path"),
+      line: requiredInteger(parsed, "line"),
+      side: oneOf(parsed.options.side, PUBLIC_PR_SIDES, "--side"),
+      ...startLine !== undefined ? { startLine } : {},
+      body: await bodyText(context, parsed, true),
+      ...commitId !== undefined ? { commitId } : {}
+    };
+  }, { inputFields: { "body-file": "body" } }),
+  change("thread-reply", "pr.thread.reply", "Reply to a review thread on the environment's pull request.", [
+    { name: "thread-id", kind: "string", valueName: "ID", description: "From pr files." },
+    ...BODY_OPTIONS
+  ], async (context, parsed) => ({
+    threadId: requiredOption(parsed, "thread-id"),
+    body: await bodyText(context, parsed, true)
+  }), { inputFields: { "body-file": "body" } }),
+  change("thread-resolve", "pr.thread.resolve", "Resolve a review thread on the environment's pull request.", [
+    { name: "thread-id", kind: "string", valueName: "ID", description: "From pr files." },
+    { name: "unresolve", kind: "boolean", description: "Unresolve it instead." }
+  ], (_context, parsed) => ({
+    threadId: requiredOption(parsed, "thread-id"),
+    ...parsed.options.unresolve === true ? { resolved: false } : {}
+  }), { inputFields: { unresolve: "resolved" } }),
+  change("file-viewed", "pr.file.viewed", "Mark a changed file as viewed on the environment's pull request.", [
+    { name: "path", kind: "string", valueName: "PATH", description: "Changed file." },
+    { name: "unviewed", kind: "boolean", description: "Clear it instead." }
+  ], (_context, parsed) => ({
+    path: requiredOption(parsed, "path"),
+    ...parsed.options.unviewed === true ? { viewed: false } : {}
+  }), { inputFields: { unviewed: "viewed" } }),
+  change("reviewers", "pr.reviewers", "Request or remove reviewers on the environment's pull request.", [
+    {
+      name: "add",
+      kind: "string",
+      valueName: "LIST",
+      description: "Comma-separated logins or org/team-slugs."
+    },
+    {
+      name: "remove",
+      kind: "string",
+      valueName: "LIST",
+      description: "Comma-separated logins or org/team-slugs."
+    }
+  ], (_context, parsed) => ({
+    add: repeatedList(parsed.options.add),
+    remove: repeatedList(parsed.options.remove)
+  })),
+  change("label", "pr.label", "Add or remove one label on the environment's pull request.", [
+    { name: "name", kind: "string", valueName: "LABEL", description: "Label name." },
+    { name: "remove", kind: "boolean", description: "Remove it instead." }
+  ], (_context, parsed) => ({
+    name: requiredOption(parsed, "name"),
+    ...parsed.options.remove === true ? { present: false } : {}
+  }), { inputFields: { remove: "present" } })
+];
+
 // src/client/help.ts
 var GROUP_SUMMARIES = {
   connection: "Select and verify the backend this client talks to.",
@@ -19628,8 +21332,10 @@ var CLIENT_COMMANDS = [
   ...projectCommands,
   ...environmentCommands,
   ...sessionCommands,
+  ...sessionGoalCommands,
   ...changesCommands,
   ...workflowCommands,
+  ...pullRequestCommands,
   ...buildCommands,
   ...graphCommands,
   ...attentionCommands,