[cross-repo from server#271] Conformance blocker: add namespaces host runner (#651)

Author: durable-workflow-ops

src/V2/Contracts/WorkflowControlPlane.php

@@ -63,6 +63,7 @@ public function start(string $workflowType, ?string $instanceId = null, array $o
      *
      * Options:
      * - arguments: array<int, mixed> — positional signal arguments
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
@@ -95,6 +96,7 @@ public function signal(string $instanceId, string $name, array $options = []): a
      *
      * Options:
      * - arguments: array<int|string, mixed> — positional or named query arguments
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
      * @return array{
@@ -120,6 +122,7 @@ public function query(string $instanceId, string $name, array $options = []): ar
      *
      * Options:
      * - arguments: array<int|string, mixed> — positional or named update arguments
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - wait_for: 'accepted'|'completed'|null — accepted-only submit or completion wait
      * - wait_timeout_seconds: int|null — completion wait timeout
@@ -159,6 +162,7 @@ public function update(string $instanceId, string $name, array $options = []): a
      *
      * Options:
      * - reason: string|null — cancellation reason
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
@@ -186,6 +190,7 @@ public function cancel(string $instanceId, array $options = []): array;
      *
      * Options:
      * - reason: string|null — termination reason
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
@@ -216,6 +221,7 @@ public function terminate(string $instanceId, array $options = []): array;
      * Only the current run of an open workflow instance may be repaired.
      *
      * Options:
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
@@ -248,6 +254,7 @@ public function repair(string $instanceId, array $options = []): array;
      *
      * Options:
      * - reason: string|null — archive reason
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      * - command_context: \Workflow\V2\CommandContext|null — recorded command attribution/context
      * - strict_configured_type_validation: bool — fail closed when a configured workflow type mapping is now invalid
      *
@@ -280,6 +287,7 @@ public function archive(string $instanceId, array $options = []): array;
      *
      * Options:
      * - run_id: string|null — describe a specific run instead of current
+     * - namespace: string|null — require the workflow instance to belong to this namespace
      *
      * @return array{
      *     found: bool,

src/V2/Support/DefaultWorkflowControlPlane.php

@@ -676,6 +676,7 @@ public function archive(string $instanceId, array $options = []): array
     public function describe(string $instanceId, array $options = []): array
     {
         $runId = $options['run_id'] ?? null;
+        $namespace = $this->namespaceOption($options);
 
         $notFound = [
             'found' => false,
@@ -698,10 +699,15 @@ public function describe(string $instanceId, array $options = []): array
         ];
 
         try {
+            $query = $this->instanceQuery()
+                ->with('currentRun');
+
+            if ($namespace !== null) {
+                $query->where('namespace', $namespace);
+            }
+
             /** @var \Workflow\V2\Models\WorkflowInstance $instance */
-            $instance = $this->instanceQuery()
-                ->with('currentRun')
-                ->findOrFail($instanceId);
+            $instance = $query->findOrFail($instanceId);
         } catch (ModelNotFoundException) {
             return $notFound;
         }
@@ -871,9 +877,7 @@ private function commandAttributes(CommandContext $commandContext, array $attrib
      */
     private function loadControlPlaneWorkflow(string $instanceId, array $options): array
     {
-        $namespace = isset($options['namespace']) && is_string($options['namespace'])
-            ? $options['namespace']
-            : null;
+        $namespace = $this->namespaceOption($options);
 
         try {
             $query = $this->instanceQuery();
@@ -983,6 +987,15 @@ private function resolveNamespace(array $options): ?string
             : null;
     }
 
+    private function namespaceOption(array $options): ?string
+    {
+        $namespace = $options['namespace'] ?? null;
+
+        return is_string($namespace) && trim($namespace) !== ''
+            ? trim($namespace)
+            : null;
+    }
+
     private function notFoundControlPlaneResult(string $instanceId, string $idField): array
     {
         return [

tests/Feature/V2/V2WorkflowControlPlaneTest.php

@@ -651,6 +651,34 @@ public function testDescribeActiveWorkflow(): void
         $this->assertTrue($result['actions']['can_terminate']);
     }
 
+    public function testDescribeCanBeScopedByNamespace(): void
+    {
+        $start = $this->controlPlane->start('remote-workflow-type', 'ctrl-plane-desc-ns-1', [
+            'connection' => 'redis',
+            'queue' => 'default',
+            'namespace' => 'tenant-a',
+        ]);
+
+        $this->assertTrue($start['started']);
+
+        $visible = $this->controlPlane->describe('ctrl-plane-desc-ns-1', [
+            'namespace' => 'tenant-a',
+        ]);
+
+        $this->assertTrue($visible['found']);
+        $this->assertSame('tenant-a', $visible['namespace']);
+        $this->assertIsArray($visible['run']);
+        $this->assertSame($start['workflow_run_id'], $visible['run']['workflow_run_id']);
+
+        $hidden = $this->controlPlane->describe('ctrl-plane-desc-ns-1', [
+            'namespace' => 'tenant-b',
+        ]);
+
+        $this->assertFalse($hidden['found']);
+        $this->assertNull($hidden['run']);
+        $this->assertSame('instance_not_found', $hidden['reason']);
+    }
+
     public function testDescribeTerminatedWorkflow(): void
     {
         $this->controlPlane->start('remote-workflow-type', 'ctrl-plane-desc-term-1', [