Merge branch 'feature/workspace-star' into predev

# Conflicts:
#	packages/provider-concurrency/src/concurrency-manager.ts
#	packages/provider-concurrency/src/extension.ts

1 files changed, 5 insertions, 0 deletions

diff --git a/packages/session-orchestrator/src/orchestrator.ts b/packages/session-orchestrator/src/orchestrator.ts
index 8cc0a97..aaf418a 100644
--- a/packages/session-orchestrator/src/orchestrator.ts
+++ b/packages/session-orchestrator/src/orchestrator.ts
@@ -747,6 +747,7 @@ export function createSessionOrchestrator(
             provider,
             limiter,
             conversationId,
+            workspaceId,
             promptStartedAt,
             () => emitStatus("queued"),
             () => emitStatus("active"),
@@ -1219,10 +1220,12 @@ export function createWarmService(
       // Wrap with concurrency limiting (same as the main turn path).
       const warmLimiter = deps.resolveConcurrencyLimiter?.();
       if (warmLimiter !== undefined) {
+        const warmWorkspaceId = await deps.conversationStore.getWorkspaceId(conversationId);
         provider = wrapProviderWithConcurrency(
           provider,
           warmLimiter,
           conversationId,
+          warmWorkspaceId,
           deps.now?.() ?? Date.now(),
         );
       }
@@ -1376,10 +1379,12 @@ export function createCompactionService(
       // Wrap with concurrency limiting (same as the main turn path).
       const compactionLimiter = deps.resolveConcurrencyLimiter?.();
       if (compactionLimiter !== undefined) {
+        const compactionWorkspaceId = await deps.conversationStore.getWorkspaceId(conversationId);
         provider = wrapProviderWithConcurrency(
           provider,
           compactionLimiter,
           conversationId,
+          compactionWorkspaceId,
           deps.now?.() ?? Date.now(),
         );
       }