Refactor worktree metadata inventory lookup (#774)

* Refactor worktree metadata inventory lookup

* fix: prepare inventory metadata lookup

---------

Co-authored-by: homeboy-ci[bot] <266378653+homeboy-ci[bot]@users.noreply.github.com>

Author: chubes4

inc/Storage/WorktreeInventoryRepository.php

@@ -129,6 +129,37 @@ public function delete( string $handle ): bool {
 		return false !== $result;
 	}
 
+	/**
+	 * Fetch one inventory row by handle.
+	 *
+	 * @return array<string,mixed>|null
+	 */
+	public function get( string $handle ): ?array {
+		global $wpdb;
+
+		$handle = trim($handle);
+		if ( '' === $handle || ! isset($wpdb) ) {
+			return null;
+		}
+
+		if ( method_exists($wpdb, 'get_row') && method_exists($wpdb, 'prepare') ) {
+			$table = self::table_name();
+			$row   = $wpdb->get_row(
+				$wpdb->prepare('SELECT * FROM %i WHERE handle = %s LIMIT 1', $table, $handle),
+				ARRAY_A
+			);
+			return is_array($row) ? $this->decode_row($row) : null;
+		}
+
+		foreach ( $this->list() as $row ) {
+			if ( (string) ( $row['handle'] ?? '' ) === $handle ) {
+				return $row;
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Mark a known row as missing on disk instead of dropping it silently.
 	 */

inc/Workspace/WorktreeContextInjector.php

@@ -73,6 +73,8 @@
 
 defined('ABSPATH') || exit;
 
+require_once __DIR__ . '/WorkspaceHandle.php';
+
 class WorktreeContextInjector {
 
 
@@ -1862,18 +1864,18 @@ private static function upsert_inventory_metadata( string $handle, array $metada
 			return;
 		}
 
-		$handle_parts = explode('@', $handle, 2);
-		$task         = is_array($metadata['origin_task'] ?? null) ? (array) $metadata['origin_task'] : array();
-		$session      = is_array($metadata['origin_session'] ?? null) ? self::summarize_session($metadata) : array();
+		$workspace_handle = WorkspaceHandle::parse($handle);
+		$task             = is_array($metadata['origin_task'] ?? null) ? (array) $metadata['origin_task'] : array();
+		$session          = is_array($metadata['origin_session'] ?? null) ? self::summarize_session($metadata) : array();
 
 		$repository->upsert(
 			array(
 				'handle'          => $handle,
-				'repo'            => (string) ( $metadata['repo'] ?? $handle_parts[0] ),
-				'branch'          => $metadata['branch'] ?? ( $handle_parts[1] ?? null ),
+				'repo'            => (string) ( $metadata['repo'] ?? $workspace_handle->repo() ),
+				'branch'          => $metadata['branch'] ?? $workspace_handle->branch_slug(),
 				'path'            => (string) ( $metadata['path'] ?? '' ),
 				'primary_path'    => $metadata['primary_path'] ?? null,
-				'is_primary'      => ! str_contains($handle, '@'),
+				'is_primary'      => ! $workspace_handle->is_worktree(),
 				'lifecycle_state' => $metadata['lifecycle_state'] ?? null,
 				'origin_site'     => $metadata['origin_site'] ?? null,
 				'origin_agent'    => $metadata['origin_agent'] ?? null,
@@ -1901,10 +1903,9 @@ private static function get_inventory_metadata( string $handle ): ?array {
 			return null;
 		}
 
-		foreach ( $repository->list() as $row ) {
-			if ( (string) ( $row['handle'] ?? '' ) === $handle && is_array($row['metadata'] ?? null) ) {
-				return (array) $row['metadata'];
-			}
+		$row = $repository->get($handle);
+		if ( is_array($row) && is_array($row['metadata'] ?? null) ) {
+			return (array) $row['metadata'];
 		}
 
 		return null;

tests/worktree-add-lifecycle.php

@@ -82,6 +82,7 @@ final class Datamachine_Code_Test_Wpdb {
 	public string $last_error = '';
 	public int $insert_id = 0;
 	public int $rows_affected = 0;
+	public int $get_row_calls = 0;
 
 	/** @var array<string,array<string,mixed>> */
 	public array $rows = array();
@@ -132,6 +133,17 @@ public function get_results( string $sql, string $output = ARRAY_A ): array {
 		return array_values($this->rows);
 	}
 
+	public function get_row( string $sql, string $output = ARRAY_A ): ?array {
+		++$this->get_row_calls;
+		foreach ( $this->rows as $handle => $row ) {
+			if ( str_contains($sql, (string) $handle) ) {
+				return $row;
+			}
+		}
+
+		return null;
+	}
+
 	public function prepare( string $query, mixed ...$args ): string {
 		foreach ( $args as $arg ) {
 			$query = preg_replace('/%s/', addslashes((string) $arg), $query, 1) ?? $query;
@@ -225,6 +237,7 @@ function create_primary_checkout( string $workspace_root ): void {
 
 	$show = $workspace->show_repo('homeboy@audit-primitives-20260616');
 	assert_true(! is_wp_error($show), 'persisted worktree is not visible to show_repo');
+	assert_true(0 < $wpdb->get_row_calls, 'persisted worktree metadata did not use direct inventory lookup');
 
 	$list    = $workspace->worktree_list('homeboy', null, array( 'include_status' => false, 'include_disk' => false ));
 	$handles = array_map(static fn( array $row ): string => (string) $row['handle'], $list['worktrees'] ?? array());