chore: 全体レビュー後の follow-up (cache prefix 修正 + コメント改善)

apps/desktop/src/lib/trpc/routers/workspaces/utils/github/cache.ts

@@ -349,7 +349,10 @@ export function readCachedGitHubCommitAuthor(
 }
 
 export function clearGitHubCachesForWorktree(worktreePath: string): void {
-	githubStatusResource.invalidatePrefix(worktreePath);
+	// githubStatusResource is keyed by the exact worktreePath (no suffix), so
+	// invalidate() rather than invalidatePrefix() avoids matching sibling
+	// worktrees whose paths share this prefix (e.g. /foo/bar vs /foo/bar-2).
+	githubStatusResource.invalidate(worktreePath);
 	repoContextResource.invalidate(worktreePath);
 	recordGitHubCacheMetric({
 		kind: "status",

packages/host-service/src/trpc/router/workspace-creation/utils/ai-workspace-names.ts

@@ -195,9 +195,12 @@ export async function applyAiWorkspaceRename(
 		throw err;
 	}
 
-	// No-op detection: if the cloud row's name still equals oldWorkspaceName,
-	// the expected-name guard fired (user renamed in the meantime). Revert
-	// the git rename and skip local DB update so all three stay in lockstep.
+	// No-op detection: when the cloud's atomic WHERE guard fires (user raced
+	// a rename ahead of us), updateNameFromHost returns the pre-update row
+	// unchanged, so `cloudResult.branch` still equals the old branch and not
+	// the `deduped` value we asked for. That mismatch is the signal to roll
+	// back the git rename and skip the local DB update, keeping git, cloud,
+	// and host-local DB in lockstep.
 	if (gitRenamed && cloudResult.branch !== deduped) {
 		await ctx
 			.git(worktreePath)

packages/trpc/src/router/v2-workspace/v2-workspace.ts

@@ -250,9 +250,12 @@ export const v2WorkspaceRouter = {
 				.where(and(...conditions))
 				.returning();
 			if (!updated) {
-				// Row still exists but name raced — return the current row so
-				// `applyAiWorkspaceRename` sees `branch !== deduped` and rolls
-				// back the git rename.
+				// WHERE guard matched zero rows: the row still exists (we just
+				// fetched it above) but the user's rename raced ahead of ours.
+				// Return the pre-update `workspace` row (NOT a fresh read) —
+				// the caller `applyAiWorkspaceRename` checks `cloudResult.branch
+				// !== deduped` and uses that mismatch as the signal to roll back
+				// the git rename.
 				return workspace;
 			}
 			return updated;