@llblab/pi-kit 0.26.0 → 0.27.0

package/node_modules/@llblab/pi-telegram/lib/threads.ts

@@ -229,6 +229,7 @@ export interface TelegramThreadPendingProvision {
   owner: "leader" | "manual-follower";
   instanceId: string;
   profileKey?: string;
+  workspaceBindingKey?: string;
   status?: "in-flight" | "ambiguous";
   threadName?: string;
   displayTitle?: string;
@@ -1528,6 +1529,9 @@ function normalizePendingProvision(
     ...(record.status === "in-flight" || record.status === "ambiguous"
       ? { status: record.status }
       : {}),
+    ...(typeof record.workspaceBindingKey === "string"
+      ? { workspaceBindingKey: record.workspaceBindingKey }
+      : {}),
     ...(typeof record.threadName === "string"
       ? { threadName: record.threadName }
       : {}),
@@ -4919,6 +4923,13 @@ export function createTelegramTopicTargetProvisioner(
         pending.profileKey === request.profileKey ||
         pending.instanceId === request.instanceId,
       );
+    const pendingTarget = pendingForRequest?.target;
+    if (pendingForRequest && request.workspaceBindingKey &&
+        pendingForRequest.workspaceBindingKey !== request.workspaceBindingKey &&
+        !(pendingTarget && deps.store.listWorkspaceBindings().some((binding) =>
+          binding.bindingKey === request.workspaceBindingKey && targetMatches(binding.target, pendingTarget)))) {
+      throw new Error("Telegram unfinished Thread creation does not match this session binding.");
+    }
     if (pendingForRequest?.target) {
       const target = pendingForRequest.target;
       const observation = deps.store.listSyncObservations().find((entry) =>
@@ -4933,8 +4944,13 @@ export function createTelegramTopicTargetProvisioner(
         pendingForRequest = undefined;
       }
     }
+    const matchesWorkspace = (target: TelegramTarget): boolean =>
+      !request.workspaceBindingKey ||
+      deps.store.listWorkspaceBindings().some((binding) =>
+        binding.bindingKey === request.workspaceBindingKey && targetMatches(binding.target, target)) ||
+      (!!pendingForRequest?.target && targetMatches(pendingForRequest.target, target));
     const existing = deps.store.getByProfileKey(request.profileKey);
-    if (existing && isCurrentThreadRecord(existing)) {
+    if (existing && isCurrentThreadRecord(existing) && matchesWorkspace(existing.target)) {
       const slot = existing.slot ?? deps.store.allocateSlot(request.profileKey);
       if (!slot) {
         throw new TelegramWorkspaceSlotUnavailableError();
@@ -5017,7 +5033,7 @@ export function createTelegramTopicTargetProvisioner(
     const activeForInstance = deps.store.getActiveByInstanceId(
       request.instanceId,
     );
-    if (activeForInstance) {
+    if (activeForInstance && matchesWorkspace(activeForInstance.target)) {
       if (!activeForInstance.slot) {
         throw new Error("Telegram Workspace slot reservation is unavailable.");
       }
@@ -5055,7 +5071,7 @@ export function createTelegramTopicTargetProvisioner(
       getNextTelegramThreadNamePaletteSlot(deps.store.list(), undefined) ??
       request.preferredSlot;
     const slot =
-      existing?.slot ??
+      (existing && matchesWorkspace(existing.target) ? existing.slot : undefined) ??
       deps.store.allocateSlot(
         request.profileKey,
         isManualFollowerRequest
@@ -5064,6 +5080,7 @@ export function createTelegramTopicTargetProvisioner(
             (candidateThreadName ? undefined : identity?.slot) ??
             preferredNameSlot),
         request.workspaceBindingKey,
+        { excludeCurrentRecord: !!existing && !matchesWorkspace(existing.target) },
       );
     if (!slot) {
       throw new TelegramWorkspaceSlotUnavailableError();
@@ -5107,6 +5124,7 @@ export function createTelegramTopicTargetProvisioner(
       owner: pendingOwner,
       instanceId: request.instanceId,
       profileKey: request.profileKey,
+      ...(request.workspaceBindingKey ? { workspaceBindingKey: request.workspaceBindingKey } : {}),
       threadName: requestThreadName,
       ...(displayTitle ? { displayTitle } : {}),
       slot,

package/node_modules/@llblab/pi-telegram/lib/workspace-retirement.ts

@@ -884,6 +884,7 @@ export async function executeTelegramWorkspaceRetirement(input: {
     | "listWorkspaceRetirementIntents"
     | "commitWorkspaceRetirement"
     | "removeWorkspaceRetirementIntent"
+    | "markStaleByTarget"
     | "persist"
   >;
   admission: Pick<
@@ -971,6 +972,12 @@ export async function executeTelegramWorkspaceRetirement(input: {
       }
       return { kind: "retained", reason: "stale-intent" };
     }
+    if (fence?.phase === "commit-ready") {
+      // Exact confirmed absence retires any same-target routing record that
+      // survived the deletion attempt. The fence prevents replacement target
+      // publication while this stale local projection is removed.
+      input.store.markStaleByTarget(binding.target, "deleted");
+    }
     const eligible = () => input.store.captureWorkspaceSlotOccupancy(
       input.getExternalProtection,
       { expectedRetirement: input.intent },
@@ -1040,6 +1047,9 @@ export async function executeTelegramWorkspaceRetirement(input: {
       fence = input.admission.confirmRetirementAbsence(fence);
     }
     if (!isCurrent()) return { kind: "retained", reason: "authority-changed" };
+    if (fence.phase === "commit-ready") {
+      input.store.markStaleByTarget(binding.target, "deleted");
+    }
     if (!eligible()) return { kind: "retained", reason: "protection-changed" };
     if (!await input.store.commitWorkspaceRetirement(input.intent, isCurrent)) {
       return { kind: "retained", reason: "commit-rejected" };
@@ -1212,7 +1222,7 @@ export type TelegramWorkspaceRetirementLifecycleResult =
 export async function runTelegramWorkspaceRetirementLifecycle(input: {
   store: TelegramWorkspaceRetirementPreparationDeps["store"] & Pick<
     TelegramTopicTargetStore,
-    "replaceWorkspaceRetirementIntent" | "commitWorkspaceRetirement"
+    "replaceWorkspaceRetirementIntent" | "commitWorkspaceRetirement" | "markStaleByTarget"
   >;
   getExternalProtection: (
     binding: TelegramWorkspaceThreadBinding,
@@ -1257,19 +1267,42 @@ export async function runTelegramWorkspaceRetirementLifecycle(input: {
     });
   }
   if (intent) {
-    const adoption = await adoptTelegramWorkspaceRetirementIntent({
-      store: input.store,
-      intent,
-      getExternalProtection: input.getExternalProtection,
-      getLeaderEpoch: input.getLeaderEpoch,
-      getProfileKey: input.getProfileKey,
-      isCurrent: input.isCurrent,
-      runExclusive: input.runExclusive,
-    });
-    if (adoption.kind !== "adopted") {
-      return { kind: "blocked", stage: "adoption", reason: adoption.reason };
+    if (retainedFence && isTelegramWorkspaceRetirementFence(retainedFence) &&
+        retainedFence.phase === "commit-ready" &&
+        matchesTelegramWorkspaceRetirementFence(retainedFence, intent)) {
+      const resumed = await input.runExclusive(async () => {
+        const epoch = input.getLeaderEpoch();
+        const profileKey = input.getProfileKey();
+        const isCurrent = () => epoch !== undefined && input.getLeaderEpoch() === epoch &&
+          input.getProfileKey() === profileKey && input.isCurrent?.() !== false;
+        if (!isCurrent() || intent!.profileKey !== profileKey) return undefined;
+        const intents = input.store.listWorkspaceRetirementIntents();
+        const binding = input.store.listWorkspaceBindings().find(candidate =>
+          candidate.bindingKey === intent!.binding.bindingKey);
+        if (intents.length !== 1 || !isDeepStrictEqual(intents[0], intent) ||
+            !binding || !isDeepStrictEqual(binding, intent.binding)) return undefined;
+        if (intent!.leaderEpoch === epoch) return intent;
+        const replacement = { ...intent!, leaderEpoch: epoch! };
+        return await input.store.replaceWorkspaceRetirementIntent(intent!, replacement, isCurrent)
+          ? replacement : undefined;
+      });
+      if (!resumed) return { kind: "blocked", stage: "adoption", reason: "commit-rejected" };
+      intent = resumed;
+    } else {
+      const adoption = await adoptTelegramWorkspaceRetirementIntent({
+        store: input.store,
+        intent,
+        getExternalProtection: input.getExternalProtection,
+        getLeaderEpoch: input.getLeaderEpoch,
+        getProfileKey: input.getProfileKey,
+        isCurrent: input.isCurrent,
+        runExclusive: input.runExclusive,
+      });
+      if (adoption.kind !== "adopted") {
+        return { kind: "blocked", stage: "adoption", reason: adoption.reason };
+      }
+      intent = adoption.intent;
     }
-    intent = adoption.intent;
   } else {
     const preparation = await prepareTelegramWorkspaceRetirement(
       {

package/node_modules/@llblab/pi-telegram/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-telegram",
-  "version": "0.51.5",
+  "version": "0.51.6",
   "private": false,
   "publishConfig": {
     "access": "public"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-kit",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -46,8 +46,8 @@
     "@llblab/pi-clean-room": "0.3.0",
     "@llblab/pi-codex-usage": "0.12.0",
     "@llblab/pi-grow-loop": "0.9.0",
-    "@llblab/pi-state-flow": "0.24.0",
-    "@llblab/pi-telegram": "0.51.5",
+    "@llblab/pi-state-flow": "0.25.0",
+    "@llblab/pi-telegram": "0.51.6",
     "@llblab/skills": "1.15.0"
   },
   "bundledDependencies": [