@cmmd-center/forge 0.13.123 → 0.13.124

package/dist/bin.cjs

@@ -66337,7 +66337,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.13.123";
+var version$1 = "0.13.124";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -300407,7 +300407,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "36ad9a06120f61eef3931979fa6c199d3c862efb";
+	return "52e8c25f0de536143b44ff1ac86510aa93d35772";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -315066,9 +315066,17 @@ const RuntimeReplicationLive = require_Schema$1.effect(RuntimeReplication, requi
 		concurrency: 1,
 		discard: true
 	});
+	const retryStuckThreadStreams = (streamKeys) => runtimeId ? require_Schema$1.forEach(streamKeys, (streamKey) => outbox.resetStuckThreadGeneration({
+		runtimeId,
+		streamKey
+	}).pipe(require_Schema$1.flatMap((reset) => reset ? enqueueThread(threadIdFromStreamKey(streamKey)) : require_Schema$1.void_)), {
+		concurrency: 1,
+		discard: true
+	}) : require_Schema$1.void_;
 	return RuntimeReplication.of({
 		start,
-		retryReprojectionPending
+		retryReprojectionPending,
+		retryStuckThreadStreams
 	});
 }));
 //#endregion
@@ -315415,6 +315423,31 @@ const THREAD_STREAM_PAYLOAD_HASH_MISMATCH_CODE = "THREAD_STREAM_PAYLOAD_HASH_MIS
 */
 const THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE = "THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING";
 /**
+* Terminal park code for a thread-events reset `refusedResetIsStuck` judges
+* genuinely stuck: the exact canonical reset shape was already sent once
+* under this generation and CMMD refused it again with zero acknowledged
+* progress (forge#3635). Before this code existed, that case fell through to
+* `failGeneric`, which recorded the raw `THREAD_STREAM_PAYLOAD_CONFLICT` /
+* `THREAD_STREAM_HEAD_MISMATCH` code -- a code neither
+* `readReprojectionPendingThreadStreamKeys` nor
+* `MANUALLY_RECOVERABLE_BLOCKED_CODES` selects, so the manual retry endpoint
+* could never reach the row.
+*
+* Deliberately excluded from `CLAIMABLE_BLOCKED_CODES`,
+* `STARTUP_RECOVERABLE_BLOCKED_CODES`, and `MANUALLY_RECOVERABLE_BLOCKED_CODES`:
+* a plain status flip back to `pending` would resend the exact batch CMMD
+* already refused twice. `enqueueThread` also leaves a row parked under this
+* code alone on new domain events and the heartbeat (see the stuck check
+* inside `enqueueThread` below) instead of re-projecting it back to `pending`
+* the way it does for every other generation, so a stuck row only clears once
+* the operator retry endpoint calls `RuntimeReplicationOutboxShape`'s
+* `resetStuckThreadGeneration` (which mints a fresh, never-before-sent repair
+* generation before re-projecting) or
+* a genuinely new generation id supersedes it (e.g. the thread archives and
+* gets a `:final:` id).
+*/
+const THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE = "THREAD_STREAM_REMOTE_CONFLICT_STUCK";
+/**
 * Whether a refused batch is the exact canonical reset shape (`fromSequence
 * === 1`, empty previous head, deterministic content) under a generation the
 * local cursor already holds with zero acknowledged progress -- i.e. this
@@ -315692,6 +315725,23 @@ const readReprojectionPendingThreadStreamKeys = require_Schema$1.gen(function* (
       AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE}
   `).map((row) => row.streamKey);
 }).pipe(require_Schema$1.orDie);
+/**
+* Thread streams parked under THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE, for the
+* manual `/api/runtime-replication/retry` endpoint (forge#3635). Deliberately absent
+* from MANUALLY_RECOVERABLE_BLOCKED_CODES for the same reason
+* `readReprojectionPendingThreadStreamKeys` is: a plain status flip back to `pending`
+* would resend the exact reset CMMD already refused twice. `http.ts`'s retry handler
+* passes these to `RuntimeReplication`'s `retryStuckThreadStreams`, which calls
+* `resetStuckThreadGeneration` for each of these before re-projecting, so the retry
+* always sends a fresh, never-before-refused generation.
+*/
+const readStuckThreadStreamKeys = require_Schema$1.gen(function* () {
+	return (yield* (yield* require_SqlError.SqlClient)`
+    SELECT stream_key AS "streamKey" FROM runtime_replication_outbox
+    WHERE operation = 'thread-events' AND status = 'blocked'
+      AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE}
+  `).map((row) => row.streamKey);
+}).pipe(require_Schema$1.orDie);
 const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationOutbox, require_Schema$1.gen(function* () {
 	const sql = yield* require_SqlError.SqlClient;
 	const upsertPayload = (input) => {
@@ -315912,6 +315962,12 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
 			now
 		}).pipe(require_Schema$1.orDie);
 	};
+	const isThreadStreamParkedStuck = (input) => sql`
+        SELECT runtime_id AS "runtimeId" FROM runtime_replication_outbox
+        WHERE runtime_id = ${input.runtimeId} AND stream_key = ${input.streamKey}
+          AND operation = 'thread-events' AND status = 'blocked'
+          AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE}
+      `.pipe(require_Schema$1.map((rows) => rows.length === 1));
 	const enqueueThread = (input) => {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const baseGenerationId = runtimeThreadGenerationId(input.runtimeId, input.streamKey);
@@ -315920,6 +315976,7 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
 			const previousActiveGeneration = activeRuntimeThreadGenerationId(baseGenerationId, previousCursor?.generationId);
 			const generationId = input.historyFinalized ? runtimeThreadFinalGenerationId(input.runtimeId, input.streamKey, input.events) : previousActiveGeneration;
 			const replacesGeneration = previousCursor !== void 0 && previousCursor.generationId !== generationId;
+			if (!replacesGeneration && (yield* isThreadStreamParkedStuck(input))) return;
 			yield* initializeThreadCursor({
 				runtimeId: input.runtimeId,
 				streamKey: input.streamKey,
@@ -316221,12 +316278,16 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
 	})).pipe(require_Schema$1.orDie);
 	/**
 	* Recovers from a CMMD-reported thread stream conflict (see
-	* THREAD_STREAM_REMOTE_CONFLICT_CODES). Returns `null` when this item is
-	* not eligible (its payload does not decode, or `refusedResetIsStuck`
-	* says the exact reset shape already failed once -- in which case the
-	* caller falls back to blocking) and `false` when the row was superseded
-	* before this could apply, mirroring `fail`'s own supersession signal.
-	* Otherwise replaces the local cursor with a brand-new repair generation
+	* THREAD_STREAM_REMOTE_CONFLICT_CODES). Returns `null` only when this
+	* item's payload does not decode, in which case the caller falls back to
+	* `failGeneric`. When `refusedResetIsStuck` says the exact reset shape
+	* already failed once with zero progress, parks the row under
+	* `THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE` directly (see that code's
+	* doc comment) and returns `true`/`false` the same way the normal repair
+	* path below does -- never `null` -- so the caller never falls through to
+	* `failGeneric`'s raw conflict code (forge#3635). `false` means the row
+	* was superseded before this could apply, mirroring `fail`'s own
+	* supersession signal. Otherwise replaces the local cursor with a brand-new repair generation
 	* from sequence 1, empty previous head -- the shape CMMD's reset rule
 	* accepts unconditionally -- and parks the row blocked under
 	* `THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE`, deferring the
@@ -316245,13 +316306,30 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
 			runtimeId: item.runtimeId,
 			streamKey: item.streamKey
 		});
+		const now = (/* @__PURE__ */ new Date()).toISOString();
 		if (refusedResetIsStuck({
 			baseGenerationId,
 			refusedGenerationId: parsedBatch.generationId,
 			refusedFromSequence: parsedBatch.fromSequence,
 			cursor
-		})) return null;
-		const now = (/* @__PURE__ */ new Date()).toISOString();
+		})) {
+			if ((yield* sql`
+            UPDATE runtime_replication_outbox SET
+              status = 'blocked', next_attempt_at = '9999-12-31T23:59:59.999Z',
+              last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_STUCK"},
+              last_error = ${`Runtime replication conflict (${failure.code}) refused a thread-events reset that had already been refused once with zero acknowledged progress under this generation. Parked as stuck rather than resent; use the manual retry endpoint to reset it to a fresh generation.`}, updated_at = ${now}
+            WHERE runtime_id = ${item.runtimeId} AND stream_key = ${item.streamKey}
+              AND payload_hash = ${item.payloadHash}
+            RETURNING runtime_id AS "runtimeId"
+          `).length !== 1) return false;
+			yield* require_Schema$1.logWarning("Runtime replication parked a thread-stream repair as stuck after its reset was refused with zero progress.", {
+				runtimeId: item.runtimeId,
+				streamKey: item.streamKey,
+				errorCode: failure.code,
+				refusedGenerationId: parsedBatch.generationId
+			});
+			return true;
+		}
 		const repairGenerationId = `${baseGenerationId}:repair:${node_crypto.randomUUID()}`;
 		const message = `Runtime replication conflict (${failure.code}) refused a thread-events batch; deferring to a full-history re-projection under a new repair generation.`;
 		if (!(yield* sql.withTransaction(require_Schema$1.gen(function* () {
@@ -316319,6 +316397,30 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
             AND status = 'blocked'
             AND last_error_code = 'RUNTIME_REVOKED'
         `.pipe(require_Schema$1.asVoid, require_Schema$1.orDie);
+	const resetStuckThreadGeneration = (input) => {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const repairGenerationId = `${runtimeThreadGenerationId(input.runtimeId, input.streamKey)}:repair:${node_crypto.randomUUID()}`;
+		const message = "Runtime replication operator retry reset a stuck thread-stream repair to a new generation.";
+		return sql.withTransaction(require_Schema$1.gen(function* () {
+			if ((yield* sql`
+              UPDATE runtime_replication_outbox SET
+                status = 'blocked', next_attempt_at = '9999-12-31T23:59:59.999Z',
+                last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING"},
+                last_error = ${message}, updated_at = ${now}
+              WHERE runtime_id = ${input.runtimeId} AND stream_key = ${input.streamKey}
+                AND operation = 'thread-events'
+                AND last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_STUCK"}
+              RETURNING runtime_id AS "runtimeId"
+            `).length !== 1) return false;
+			yield* replaceThreadCursor({
+				runtimeId: input.runtimeId,
+				streamKey: input.streamKey,
+				generationId: repairGenerationId,
+				now
+			});
+			return true;
+		})).pipe(require_Schema$1.orDie);
+	};
 	const getStatus = () => readRuntimeReplicationOutboxStatus.pipe(require_Schema$1.provideService(require_SqlError.SqlClient, sql));
 	const getDiagnostics = () => require_Schema$1.gen(function* () {
 		const [diagnostics] = decodeDiagnostics(yield* sql`
@@ -316349,6 +316451,7 @@ const RuntimeReplicationOutboxLive = require_Schema$1.effect(RuntimeReplicationO
 		acknowledge,
 		fail,
 		retryBlocked,
+		resetStuckThreadGeneration,
 		recover,
 		recoverLegacyRevokedInventory,
 		getStatus,
@@ -316481,10 +316584,14 @@ const retryHandler = require_Schema$1.gen(function* () {
 	const replication = yield* require_Schema$1.serviceOption(RuntimeReplication);
 	const requeued = yield* retryBlockedRuntimeReplicationOutbox;
 	const reprojectionPendingStreamKeys = yield* readReprojectionPendingThreadStreamKeys;
-	if (require_Schema$1.isSome(replication)) yield* replication.value.retryReprojectionPending(reprojectionPendingStreamKeys);
+	const stuckStreamKeys = yield* readStuckThreadStreamKeys;
+	if (require_Schema$1.isSome(replication)) {
+		yield* replication.value.retryReprojectionPending(reprojectionPendingStreamKeys);
+		yield* replication.value.retryStuckThreadStreams(stuckStreamKeys);
+	}
 	const status = yield* readRuntimeReplicationOutboxStatus;
 	return require_HttpServer.jsonUnsafe({
-		requeued: requeued + (require_Schema$1.isSome(replication) ? reprojectionPendingStreamKeys.length : 0),
+		requeued: requeued + (require_Schema$1.isSome(replication) ? reprojectionPendingStreamKeys.length + stuckStreamKeys.length : 0),
 		...responseFromStatus(status)
 	});
 }).pipe(require_Schema$1.catchTag("AuthError", respondToAuthError));

package/dist/bin.mjs

@@ -23,7 +23,7 @@ import { createCipheriv, createDecipheriv, createHash, createHmac, createPublicK
 import * as FS$1 from "node:fs";
 import fs, { accessSync, chmodSync, constants, createReadStream, existsSync, mkdirSync, mkdtempSync, promises, readFile, readFileSync, readdir, readdirSync, realpathSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import * as NodeOS from "node:os";
-import os, { homedir, networkInterfaces, tmpdir } from "node:os";
+import $U, { homedir, networkInterfaces, tmpdir } from "node:os";
 import * as Path$1 from "node:path";
 import path, { basename, delimiter, dirname, extname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -50658,7 +50658,7 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
 	const min = forceColor || 0;
 	if (env.TERM === "dumb") return min;
 	if (process$1.platform === "win32") {
-		const osRelease = os.release().split(".");
+		const osRelease = $U.release().split(".");
 		if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) return Number(osRelease[2]) >= 14931 ? 3 : 2;
 		return 1;
 	}
@@ -53101,7 +53101,7 @@ var require_ProcessDetector = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.processDetector = void 0;
 	const api_1 = (init_esm$1(), __toCommonJS(esm_exports$1));
 	const semconv_1 = require_semconv$1();
-	const os$4 = __require("os");
+	const os$3 = __require("os");
 	/**
 	* ProcessDetector will be used to detect the resources related current process running
 	* and being instrumented from the NodeJS Process module.
@@ -53123,7 +53123,7 @@ var require_ProcessDetector = /* @__PURE__ */ __commonJSMin(((exports) => {
 			};
 			if (process.argv.length > 1) attributes[semconv_1.ATTR_PROCESS_COMMAND] = process.argv[1];
 			try {
-				const userInfo = os$4.userInfo();
+				const userInfo = os$3.userInfo();
 				attributes[semconv_1.ATTR_PROCESS_OWNER] = userInfo.username;
 			} catch (e) {
 				api_1.diag.debug(`error obtaining process owner: ${e}`);
@@ -66046,7 +66046,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.13.123";
+var version$1 = "0.13.124";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -76116,7 +76116,7 @@ var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	var fs$6 = __require("fs");
 	var path$5 = __require("path");
 	var url$1 = __require("url");
-	var os$3 = __require("os");
+	var os$2 = __require("os");
 	var runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
 	var vars = process.config && process.config.variables || {};
 	var prebuildsOnly = !!process.env.PREBUILDS_ONLY;
@@ -76124,8 +76124,8 @@ var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	var abi = versions.modules;
 	if (versions.deno || process.isBun) abi = "unsupported";
 	var runtime = isElectron() ? "electron" : isNwjs() ? "node-webkit" : "node";
-	var arch = process.env.npm_config_arch || os$3.arch();
-	var platform = process.env.npm_config_platform || os$3.platform();
+	var arch = process.env.npm_config_arch || os$2.arch();
+	var platform = process.env.npm_config_platform || os$2.platform();
 	var libc = process.env.LIBC || (isMusl(platform) ? "musl" : "glibc");
 	var armv = process.env.ARM_VERSION || (arch === "arm64" ? "8" : vars.arm_version) || "";
 	var uv = (versions.uv || "").split(".")[0];
@@ -93969,7 +93969,7 @@ const launchDetached = (launch) => gen(function* () {
 });
 const OpenLive = effect(Open, gen(function* () {
 	const open = yield* tryPromise({
-		try: () => import("./open-yHTUkd2Y.mjs"),
+		try: () => import("./open-2-reBrpv.mjs"),
 		catch: (cause) => new OpenError$1({
 			message: "failed to load browser opener",
 			cause
@@ -192255,7 +192255,7 @@ var Vce = {
 function Ve() {
 	return Vce;
 }
-var Us = os.homedir(), lk = os.tmpdir(), { env: Vc } = process$1, Yce = (e) => {
+var Us = $U.homedir(), lk = $U.tmpdir(), { env: Vc } = process$1, Yce = (e) => {
 	let t = path.join(Us, "Library");
 	return {
 		data: path.join(t, "Application Support", e),
@@ -202455,12 +202455,12 @@ function qZ(e, t) {
 	}
 	return n;
 }
-var os$2 = "https://code.claude.com/docs/en", kKe = [
+var os$1 = "https://code.claude.com/docs/en", kKe = [
 	{
 		matches: (e) => e.path === "permissions.defaultMode" && e.code === "invalid_value",
 		tip: {
 			suggestion: "Valid modes: \"acceptEdits\" (ask before file changes), \"plan\" (analysis only), \"bypassPermissions\" (auto-accept all), or \"default\" (standard behavior)",
-			docLink: `${os$2}/iam#permission-modes`
+			docLink: `${os$1}/iam#permission-modes`
 		}
 	},
 	{
@@ -202475,7 +202475,7 @@ var os$2 = "https://code.claude.com/docs/en", kKe = [
 		matches: (e) => e.path.startsWith("env.") && e.code === "invalid_type",
 		tip: {
 			suggestion: "Environment variables must be strings. Wrap numbers and booleans in quotes. Example: \"DEBUG\": \"true\", \"PORT\": \"3000\"",
-			docLink: `${os$2}/settings#environment-variables`
+			docLink: `${os$1}/settings#environment-variables`
 		}
 	},
 	{
@@ -202486,14 +202486,14 @@ var os$2 = "https://code.claude.com/docs/en", kKe = [
 		matches: (e) => e.path.startsWith("hooks.") && e.code === "invalid_key",
 		tip: {
 			suggestion: "Not a recognized hook event. Common events: PreToolUse, PostToolUse, UserPromptSubmit, SessionStart, SessionEnd, Stop. Check spelling and capitalization.",
-			docLink: `${os$2}/hooks`
+			docLink: `${os$1}/hooks`
 		}
 	},
 	{
 		matches: (e) => /\.hooks\.\d+\.command$/.test(e.path) && e.code === "invalid_type" && e.received === "undefined",
 		tip: {
 			suggestion: "Command hooks require `command`. For exec form (no shell), set `command` to the executable and `args` to its arguments: {\"type\": \"command\", \"command\": \"echo\", \"args\": [\"hi\"]}. For shell form, set `command` to the full shell string: {\"type\": \"command\", \"command\": \"echo hi\"}.",
-			docLink: `${os$2}/hooks#exec-form-and-shell-form`
+			docLink: `${os$1}/hooks#exec-form-and-shell-form`
 		}
 	},
 	{
@@ -202508,7 +202508,7 @@ var os$2 = "https://code.claude.com/docs/en", kKe = [
 		matches: (e) => e.code === "unrecognized_keys",
 		tip: {
 			suggestion: "Check for typos or refer to the documentation for valid fields",
-			docLink: `${os$2}/settings`
+			docLink: `${os$1}/settings`
 		}
 	},
 	{
@@ -202523,13 +202523,13 @@ var os$2 = "https://code.claude.com/docs/en", kKe = [
 		matches: (e) => e.path === "permissions.additionalDirectories" && e.code === "invalid_type",
 		tip: {
 			suggestion: "Must be an array of directory paths. Example: [\"~/projects\", \"/tmp/workspace\"]. You can also use --add-dir flag or /add-dir command",
-			docLink: `${os$2}/iam#working-directories`
+			docLink: `${os$1}/iam#working-directories`
 		}
 	}
 ], AKe = {
-	permissions: `${os$2}/iam#configuring-permissions`,
-	env: `${os$2}/settings#environment-variables`,
-	hooks: `${os$2}/hooks`
+	permissions: `${os$1}/iam#configuring-permissions`,
+	env: `${os$1}/settings#environment-variables`,
+	hooks: `${os$1}/hooks`
 };
 function GZ(e) {
 	let t = kKe.find((r) => r.matches(e));
@@ -271073,7 +271073,7 @@ var import_multicast_dns = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMi
 	var dgram = __require("dgram");
 	var thunky = require_thunky();
 	var events = __require("events");
-	var os$1 = __require("os");
+	var os = __require("os");
 	var noop = function() {};
 	module.exports = function(opts) {
 		if (!opts) opts = {};
@@ -271204,14 +271204,14 @@ var import_multicast_dns = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMi
 		return that;
 	};
 	function defaultInterface() {
-		var networks = os$1.networkInterfaces();
+		var networks = os.networkInterfaces();
 		var names = Object.keys(networks);
 		for (var i = 0; i < names.length; i++) {
 			var net = networks[names[i]];
 			for (var j = 0; j < net.length; j++) {
 				var iface = net[j];
 				if (isIPv4(iface.family) && !iface.internal) {
-					if (os$1.platform() === "darwin" && names[i] === "en0") return iface.address;
+					if (os.platform() === "darwin" && names[i] === "en0") return iface.address;
 					return "0.0.0.0";
 				}
 			}
@@ -271219,7 +271219,7 @@ var import_multicast_dns = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMi
 		return "127.0.0.1";
 	}
 	function allInterfaces() {
-		var networks = os$1.networkInterfaces();
+		var networks = os.networkInterfaces();
 		var names = Object.keys(networks);
 		var res = [];
 		for (var i = 0; i < names.length; i++) {
@@ -299854,7 +299854,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "36ad9a06120f61eef3931979fa6c199d3c862efb";
+	return "52e8c25f0de536143b44ff1ac86510aa93d35772";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;
@@ -314427,9 +314427,17 @@ const RuntimeReplicationLive = effect(RuntimeReplication, gen(function* () {
 		concurrency: 1,
 		discard: true
 	});
+	const retryStuckThreadStreams = (streamKeys) => runtimeId ? forEach(streamKeys, (streamKey) => outbox.resetStuckThreadGeneration({
+		runtimeId,
+		streamKey
+	}).pipe(flatMap((reset) => reset ? enqueueThread(threadIdFromStreamKey(streamKey)) : void_$1)), {
+		concurrency: 1,
+		discard: true
+	}) : void_$1;
 	return RuntimeReplication.of({
 		start,
-		retryReprojectionPending
+		retryReprojectionPending,
+		retryStuckThreadStreams
 	});
 }));
 //#endregion
@@ -314764,6 +314772,31 @@ const THREAD_STREAM_PAYLOAD_HASH_MISMATCH_CODE = "THREAD_STREAM_PAYLOAD_HASH_MIS
 */
 const THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE = "THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING";
 /**
+* Terminal park code for a thread-events reset `refusedResetIsStuck` judges
+* genuinely stuck: the exact canonical reset shape was already sent once
+* under this generation and CMMD refused it again with zero acknowledged
+* progress (forge#3635). Before this code existed, that case fell through to
+* `failGeneric`, which recorded the raw `THREAD_STREAM_PAYLOAD_CONFLICT` /
+* `THREAD_STREAM_HEAD_MISMATCH` code -- a code neither
+* `readReprojectionPendingThreadStreamKeys` nor
+* `MANUALLY_RECOVERABLE_BLOCKED_CODES` selects, so the manual retry endpoint
+* could never reach the row.
+*
+* Deliberately excluded from `CLAIMABLE_BLOCKED_CODES`,
+* `STARTUP_RECOVERABLE_BLOCKED_CODES`, and `MANUALLY_RECOVERABLE_BLOCKED_CODES`:
+* a plain status flip back to `pending` would resend the exact batch CMMD
+* already refused twice. `enqueueThread` also leaves a row parked under this
+* code alone on new domain events and the heartbeat (see the stuck check
+* inside `enqueueThread` below) instead of re-projecting it back to `pending`
+* the way it does for every other generation, so a stuck row only clears once
+* the operator retry endpoint calls `RuntimeReplicationOutboxShape`'s
+* `resetStuckThreadGeneration` (which mints a fresh, never-before-sent repair
+* generation before re-projecting) or
+* a genuinely new generation id supersedes it (e.g. the thread archives and
+* gets a `:final:` id).
+*/
+const THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE = "THREAD_STREAM_REMOTE_CONFLICT_STUCK";
+/**
 * Whether a refused batch is the exact canonical reset shape (`fromSequence
 * === 1`, empty previous head, deterministic content) under a generation the
 * local cursor already holds with zero acknowledged progress -- i.e. this
@@ -315041,6 +315074,23 @@ const readReprojectionPendingThreadStreamKeys = gen(function* () {
       AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE}
   `).map((row) => row.streamKey);
 }).pipe(orDie);
+/**
+* Thread streams parked under THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE, for the
+* manual `/api/runtime-replication/retry` endpoint (forge#3635). Deliberately absent
+* from MANUALLY_RECOVERABLE_BLOCKED_CODES for the same reason
+* `readReprojectionPendingThreadStreamKeys` is: a plain status flip back to `pending`
+* would resend the exact reset CMMD already refused twice. `http.ts`'s retry handler
+* passes these to `RuntimeReplication`'s `retryStuckThreadStreams`, which calls
+* `resetStuckThreadGeneration` for each of these before re-projecting, so the retry
+* always sends a fresh, never-before-refused generation.
+*/
+const readStuckThreadStreamKeys = gen(function* () {
+	return (yield* (yield* SqlClient)`
+    SELECT stream_key AS "streamKey" FROM runtime_replication_outbox
+    WHERE operation = 'thread-events' AND status = 'blocked'
+      AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE}
+  `).map((row) => row.streamKey);
+}).pipe(orDie);
 const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(function* () {
 	const sql = yield* SqlClient;
 	const upsertPayload = (input) => {
@@ -315261,6 +315311,12 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
 			now
 		}).pipe(orDie);
 	};
+	const isThreadStreamParkedStuck = (input) => sql`
+        SELECT runtime_id AS "runtimeId" FROM runtime_replication_outbox
+        WHERE runtime_id = ${input.runtimeId} AND stream_key = ${input.streamKey}
+          AND operation = 'thread-events' AND status = 'blocked'
+          AND last_error_code = ${THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE}
+      `.pipe(map$3((rows) => rows.length === 1));
 	const enqueueThread = (input) => {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const baseGenerationId = runtimeThreadGenerationId(input.runtimeId, input.streamKey);
@@ -315269,6 +315325,7 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
 			const previousActiveGeneration = activeRuntimeThreadGenerationId(baseGenerationId, previousCursor?.generationId);
 			const generationId = input.historyFinalized ? runtimeThreadFinalGenerationId(input.runtimeId, input.streamKey, input.events) : previousActiveGeneration;
 			const replacesGeneration = previousCursor !== void 0 && previousCursor.generationId !== generationId;
+			if (!replacesGeneration && (yield* isThreadStreamParkedStuck(input))) return;
 			yield* initializeThreadCursor({
 				runtimeId: input.runtimeId,
 				streamKey: input.streamKey,
@@ -315569,12 +315626,16 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
 	})).pipe(orDie);
 	/**
 	* Recovers from a CMMD-reported thread stream conflict (see
-	* THREAD_STREAM_REMOTE_CONFLICT_CODES). Returns `null` when this item is
-	* not eligible (its payload does not decode, or `refusedResetIsStuck`
-	* says the exact reset shape already failed once -- in which case the
-	* caller falls back to blocking) and `false` when the row was superseded
-	* before this could apply, mirroring `fail`'s own supersession signal.
-	* Otherwise replaces the local cursor with a brand-new repair generation
+	* THREAD_STREAM_REMOTE_CONFLICT_CODES). Returns `null` only when this
+	* item's payload does not decode, in which case the caller falls back to
+	* `failGeneric`. When `refusedResetIsStuck` says the exact reset shape
+	* already failed once with zero progress, parks the row under
+	* `THREAD_STREAM_REMOTE_CONFLICT_STUCK_CODE` directly (see that code's
+	* doc comment) and returns `true`/`false` the same way the normal repair
+	* path below does -- never `null` -- so the caller never falls through to
+	* `failGeneric`'s raw conflict code (forge#3635). `false` means the row
+	* was superseded before this could apply, mirroring `fail`'s own
+	* supersession signal. Otherwise replaces the local cursor with a brand-new repair generation
 	* from sequence 1, empty previous head -- the shape CMMD's reset rule
 	* accepts unconditionally -- and parks the row blocked under
 	* `THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING_CODE`, deferring the
@@ -315593,13 +315654,30 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
 			runtimeId: item.runtimeId,
 			streamKey: item.streamKey
 		});
+		const now = (/* @__PURE__ */ new Date()).toISOString();
 		if (refusedResetIsStuck({
 			baseGenerationId,
 			refusedGenerationId: parsedBatch.generationId,
 			refusedFromSequence: parsedBatch.fromSequence,
 			cursor
-		})) return null;
-		const now = (/* @__PURE__ */ new Date()).toISOString();
+		})) {
+			if ((yield* sql`
+            UPDATE runtime_replication_outbox SET
+              status = 'blocked', next_attempt_at = '9999-12-31T23:59:59.999Z',
+              last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_STUCK"},
+              last_error = ${`Runtime replication conflict (${failure.code}) refused a thread-events reset that had already been refused once with zero acknowledged progress under this generation. Parked as stuck rather than resent; use the manual retry endpoint to reset it to a fresh generation.`}, updated_at = ${now}
+            WHERE runtime_id = ${item.runtimeId} AND stream_key = ${item.streamKey}
+              AND payload_hash = ${item.payloadHash}
+            RETURNING runtime_id AS "runtimeId"
+          `).length !== 1) return false;
+			yield* logWarning$1("Runtime replication parked a thread-stream repair as stuck after its reset was refused with zero progress.", {
+				runtimeId: item.runtimeId,
+				streamKey: item.streamKey,
+				errorCode: failure.code,
+				refusedGenerationId: parsedBatch.generationId
+			});
+			return true;
+		}
 		const repairGenerationId = `${baseGenerationId}:repair:${Crypto.randomUUID()}`;
 		const message = `Runtime replication conflict (${failure.code}) refused a thread-events batch; deferring to a full-history re-projection under a new repair generation.`;
 		if (!(yield* sql.withTransaction(gen(function* () {
@@ -315667,6 +315745,30 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
             AND status = 'blocked'
             AND last_error_code = 'RUNTIME_REVOKED'
         `.pipe(asVoid, orDie);
+	const resetStuckThreadGeneration = (input) => {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const repairGenerationId = `${runtimeThreadGenerationId(input.runtimeId, input.streamKey)}:repair:${Crypto.randomUUID()}`;
+		const message = "Runtime replication operator retry reset a stuck thread-stream repair to a new generation.";
+		return sql.withTransaction(gen(function* () {
+			if ((yield* sql`
+              UPDATE runtime_replication_outbox SET
+                status = 'blocked', next_attempt_at = '9999-12-31T23:59:59.999Z',
+                last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_REPROJECTION_PENDING"},
+                last_error = ${message}, updated_at = ${now}
+              WHERE runtime_id = ${input.runtimeId} AND stream_key = ${input.streamKey}
+                AND operation = 'thread-events'
+                AND last_error_code = ${"THREAD_STREAM_REMOTE_CONFLICT_STUCK"}
+              RETURNING runtime_id AS "runtimeId"
+            `).length !== 1) return false;
+			yield* replaceThreadCursor({
+				runtimeId: input.runtimeId,
+				streamKey: input.streamKey,
+				generationId: repairGenerationId,
+				now
+			});
+			return true;
+		})).pipe(orDie);
+	};
 	const getStatus = () => readRuntimeReplicationOutboxStatus.pipe(provideService(SqlClient, sql));
 	const getDiagnostics = () => gen(function* () {
 		const [diagnostics] = decodeDiagnostics(yield* sql`
@@ -315697,6 +315799,7 @@ const RuntimeReplicationOutboxLive = effect(RuntimeReplicationOutbox, gen(functi
 		acknowledge,
 		fail,
 		retryBlocked,
+		resetStuckThreadGeneration,
 		recover,
 		recoverLegacyRevokedInventory,
 		getStatus,
@@ -315828,10 +315931,14 @@ const retryHandler = gen(function* () {
 	const replication = yield* serviceOption(RuntimeReplication);
 	const requeued = yield* retryBlockedRuntimeReplicationOutbox;
 	const reprojectionPendingStreamKeys = yield* readReprojectionPendingThreadStreamKeys;
-	if (isSome(replication)) yield* replication.value.retryReprojectionPending(reprojectionPendingStreamKeys);
+	const stuckStreamKeys = yield* readStuckThreadStreamKeys;
+	if (isSome(replication)) {
+		yield* replication.value.retryReprojectionPending(reprojectionPendingStreamKeys);
+		yield* replication.value.retryStuckThreadStreams(stuckStreamKeys);
+	}
 	const status = yield* readRuntimeReplicationOutboxStatus;
 	return jsonUnsafe({
-		requeued: requeued + (isSome(replication) ? reprojectionPendingStreamKeys.length : 0),
+		requeued: requeued + (isSome(replication) ? reprojectionPendingStreamKeys.length + stuckStreamKeys.length : 0),
 		...responseFromStatus(status)
 	});
 }).pipe(catchTag("AuthError", respondToAuthError));
@@ -325104,7 +325211,7 @@ const connectLoginCommand = make$33("login", {
 			})).json();
 		},
 		openBrowser: async (url) => {
-			const open = (await import("./open-yHTUkd2Y.mjs")).default;
+			const open = (await import("./open-2-reBrpv.mjs")).default;
 			await open(url);
 			return true;
 		},