refactor: route lock owner-context runtime IDs through signatures registry (#482)

WorkspaceLockStore::default_owner_context() hardcoded kimaki_session_id /
opencode_session_id env-var literals in DMC generic core, violating the
RULES.md layer-purity law. Re-point it at the existing
datamachine_code_worktree_runtime_signatures filter (the same registry
WorktreeContextInjector already reads), projecting runtime session IDs into a
generic runtime-keyed `runtime_ids` envelope. DMCs own DATAMACHINE_* keys stay
(DMC namespace, not a vendor leak).

WorkspaceCommand::render_workspace_error() no longer special-cases
kimaki_session_id; it renders runtime session IDs generically from the
runtime_ids envelope (prefers session_id, falls back to any subkey, scanning
runtimes in registration order).

Adding a new runtime is now a filter/config change, never a DMC core edit.

Closes #481

Author: chubes4

inc/Cli/Commands/WorkspaceCommand.php

@@ -2789,14 +2789,50 @@ private function render_workspace_error( \WP_Error $error ): void {
 			if ( ! empty($owner_context['wp_cli_args']) ) {
 				WP_CLI::log(sprintf('Command:    %s', (string) $owner_context['wp_cli_args']));
 			}
-			if ( ! empty($owner_context['kimaki_session_id']) || ! empty($owner_context['opencode_session_id']) ) {
-				WP_CLI::log(sprintf('Session:    %s', (string) ( $owner_context['kimaki_session_id'] ?? $owner_context['opencode_session_id'] ?? '' )));
+			$session_id = $this->resolve_owner_context_session_id($owner_context);
+			if ( '' !== $session_id ) {
+				WP_CLI::log(sprintf('Session:    %s', $session_id));
 			}
 		}
 
 		WP_CLI::error($error->get_error_message());
 	}
 
+	/**
+	 * Resolve a displayable runtime session identifier from a lock owner context.
+	 *
+	 * Runtime-specific session IDs live under the generic `runtime_ids` envelope
+	 * (runtime-id => { subkey => value }) populated by WorkspaceLockStore from the
+	 * `datamachine_code_worktree_runtime_signatures` registry. DMC names no
+	 * runtimes here: it prefers a `session_id` subkey, then falls back to the
+	 * first available subkey value, scanning runtimes in registration order.
+	 *
+	 * @param  array $owner_context Decoded lock owner context.
+	 * @return string Session identifier, or '' when none is available.
+	 */
+	private function resolve_owner_context_session_id( array $owner_context ): string {
+		$runtime_ids = (array) ( $owner_context['runtime_ids'] ?? array() );
+
+		foreach ( $runtime_ids as $entry ) {
+			if ( is_array($entry) && '' !== trim( (string) ( $entry['session_id'] ?? '' )) ) {
+				return (string) $entry['session_id'];
+			}
+		}
+
+		foreach ( $runtime_ids as $entry ) {
+			if ( ! is_array($entry) ) {
+				continue;
+			}
+			foreach ( $entry as $value ) {
+				if ( '' !== trim( (string) $value) ) {
+					return (string) $value;
+				}
+			}
+		}
+
+		return '';
+	}
+
 	/**
 	 * Render workspace hygiene report output.
 	 *

inc/Workspace/WorkspaceLockStore.php

@@ -343,9 +343,8 @@ public static function default_owner_context(): array {
 			'host' => function_exists('gethostname') ? (string) gethostname() : 'unknown-host',
 			'pid'  => function_exists('getmypid') ? (string) getmypid() : 'unknown-pid',
 		);
+		// DMC's own namespace — these are not vendor leaks.
 		$env_map = array(
-			'kimaki_session_id'      => 'KIMAKI_SESSION_ID',
-			'opencode_session_id'    => 'OPENCODE_SESSION_ID',
 			'datamachine_task_url'   => 'DATAMACHINE_TASK_URL',
 			'datamachine_task_ref'   => 'DATAMACHINE_TASK_REF',
 			'datamachine_agent'      => 'DATAMACHINE_AGENT',
@@ -358,13 +357,74 @@ public static function default_owner_context(): array {
 			}
 		}
 
+		// Runtime-specific session identifiers are NOT hardcoded here. Integration
+		// layers (e.g. wp-coding-agents) declare which env vars to sniff and how to
+		// project them into a runtime-keyed envelope via the
+		// `datamachine_code_worktree_runtime_signatures` filter — the same registry
+		// WorktreeContextInjector reads. DMC enumerates no runtime IDs and no
+		// vendor-specific env-var names.
+		$runtime_ids = self::resolve_runtime_ids();
+		if ( ! empty($runtime_ids) ) {
+			$context['runtime_ids'] = $runtime_ids;
+		}
+
 		if ( isset($_SERVER['argv']) && is_array($_SERVER['argv']) ) {
 			$context['wp_cli_args'] = self::bounded_string(self::redact_secret_values(implode(' ', array_map('strval', $_SERVER['argv']))), 1000);
 		}
 
 		return $context;
 	}
 
+	/**
+	 * Resolve runtime-specific session identifiers from registered signatures.
+	 *
+	 * Reads the `datamachine_code_worktree_runtime_signatures` filter (the same
+	 * public contract WorktreeContextInjector consumes) and projects any env
+	 * vars the surrounding runtime exposes into a runtime-keyed envelope:
+	 *
+	 *   array(
+	 *       '<runtime-id>' => array( '<subkey>' => '<value>', ... ),
+	 *   )
+	 *
+	 * DMC enumerates no runtime IDs and no vendor-specific env-var names; the
+	 * integration layer declares both. Missing fields stay missing.
+	 *
+	 * @return array<string,array<string,string>>
+	 */
+	private static function resolve_runtime_ids(): array {
+		if ( ! function_exists('apply_filters') ) {
+			return array();
+		}
+
+		$signatures = apply_filters('datamachine_code_worktree_runtime_signatures', array());
+		if ( ! is_array($signatures) ) {
+			return array();
+		}
+
+		$runtime_ids = array();
+		foreach ( $signatures as $runtime_id => $entry ) {
+			if ( ! is_string($runtime_id) || '' === $runtime_id || ! is_array($entry) ) {
+				continue;
+			}
+			$resolved = array();
+			foreach ( $entry as $subkey => $env_var ) {
+				if ( ! is_string($subkey) || '' === $subkey || ! is_string($env_var) || '' === $env_var ) {
+					continue;
+				}
+				$value = getenv($env_var);
+				if ( false === $value || '' === trim( (string) $value) ) {
+					continue;
+				}
+				$resolved[ $subkey ] = self::bounded_string( (string) $value, 300);
+			}
+			if ( ! empty($resolved) ) {
+				$runtime_ids[ $runtime_id ] = $resolved;
+			}
+		}
+
+		return $runtime_ids;
+	}
+
 	private static function default_owner(): string {
 		$context = self::default_owner_context();
 		$host    = (string) ( $context['host'] ?? 'unknown-host' );