fix: scope project Skiller browser picker

Author: skulidropek

docs/integrations/skiller.md

@@ -58,6 +58,8 @@ The latest Playwright proof screenshots are checked in under `docs/screenshots/i
 - `pr238-proof-28-skiller-session-scoped-ui.png` shows the real Skiller UI opened from that button.
 - `pr238-proof-29-skiller-codex-container-skill.png` shows a Codex skill discovered from the selected container's `/home/dev/.codex/skills` tree.
 - `pr238-proof-30-skiller-add-project-folder-browser-picker.png` shows the browser-visible project folder picker opened from `Add project folder...` with selected-container paths.
+- `pr238-proof-31-skiller-project-scoped-folder-picker-working.png` shows `/api/skiller/app/` opened from a project-scoped Skiller process with `Add project folder...` resolving to the selected container paths.
+- `pr238-proof-32-docker-git-browser-live-command.png` shows the live `docker-git browser` frontend served through the same controller used for the proof.
 
 ## Updating the Pin
 

docs/screenshots/issue-237/proof/pr238-proof-31-skiller-project-scoped-folder-picker-working.png

@@ -31,7 +31,7 @@ export type SkillerBrowserScope = {
   readonly currentProject: SkillerBrowserPathRoot
   readonly projectKey: string
   readonly roots: ReadonlyArray<SkillerBrowserPathRoot>
-  readonly sessionId: string
+  readonly sessionId: string | null
 }
 
 export const parseDockerMountLines = (output: string): ReadonlyArray<DockerContainerMount> =>
@@ -142,7 +142,7 @@ const rootDepth = (root: Pick<SkillerBrowserPathRoot, "containerPath" | "hostPat
 
 export const skillerBrowserScopeForContainer = (
   scope: SkillerContainerScope,
-  sessionId: string
+  sessionId: string | null
 ): SkillerBrowserScope => {
   const roots = skillerBrowserRoots(scope)
   return {

docs/screenshots/issue-237/proof/pr238-proof-32-docker-git-browser-live-command.png

@@ -53,10 +53,15 @@ type SkillerProcessUser = {
   readonly uid: number
 }
 
-type SkillerRoute =
+export type SkillerRoute =
   | { readonly _tag: "App"; readonly relativePath: string; readonly sessionId: string | null }
   | { readonly _tag: "Trpc"; readonly sessionId: string | null; readonly upstreamPath: string }
 
+type SkillerBrowserScopeSelection = {
+  readonly scope: SkillerContainerScope
+  readonly sessionId: string | null
+}
+
 const submoduleRelativePath = join("third_party", "skiller-desktop-skills-manager")
 const launchLogPath = join(homedir(), ".docker-git", "logs", "skiller.log")
 const skillerAppPath = "/api/skiller/app/"
@@ -586,19 +591,39 @@ const browserTrpcBaseBootstrap = [
 const scriptJson = (value: unknown): string =>
   JSON.stringify(value).replaceAll("<", "\\u003c")
 
+export const resolveSkillerBrowserScopeSelection = (
+  route: Extract<SkillerRoute, { readonly _tag: "App" }>,
+  currentScope: SkillerContainerScope | null,
+  sessionScopeForId: (sessionId: string) => SkillerContainerScope | null | undefined
+): SkillerBrowserScopeSelection | null => {
+  if (route.sessionId === null) {
+    return currentScope === null
+      ? null
+      : { scope: currentScope, sessionId: null }
+  }
+  const sessionScope = sessionScopeForId(route.sessionId)
+  return sessionScope === undefined || sessionScope === null
+    ? null
+    : { scope: sessionScope, sessionId: route.sessionId }
+}
+
 const browserDockerGitScopeBootstrap = (
   route: Extract<SkillerRoute, { readonly _tag: "App" }>
 ): string => {
-  if (route.sessionId === null) {
-    return ""
-  }
-  const scope = sessionScopes.get(route.sessionId)
-  if (scope === undefined || scope === null) {
+  const currentScope = currentProcess !== null && isRunning(currentProcess.process)
+    ? currentProcess.scope
+    : null
+  const selection = resolveSkillerBrowserScopeSelection(
+    route,
+    currentScope,
+    (sessionId) => sessionScopes.get(sessionId)
+  )
+  if (selection === null) {
     return ""
   }
   return [
     "<script>",
-    `window.__DOCKER_GIT_SKILLER_SCOPE__=${scriptJson(skillerBrowserScopeForContainer(scope, route.sessionId))};`,
+    `window.__DOCKER_GIT_SKILLER_SCOPE__=${scriptJson(skillerBrowserScopeForContainer(selection.scope, selection.sessionId))};`,
     "</script>"
   ].join("")
 }

packages/api/src/services/skiller-core.ts

@@ -68,6 +68,18 @@ describe("skiller container filesystem mapping", () => {
       sshUser: "dev"
     }, "terminal-session")
 
+    expect(skillerBrowserScopeForContainer({
+      containerCodexSkillsPath: "/home/dev/.codex/skills",
+      containerHomePath: "/home/dev",
+      containerName: "dg-project",
+      containerProjectPath: "/home/dev/app",
+      hostCodexSkillsPath: "/var/lib/docker/volumes/project-home/_data/.codex/skills",
+      hostHomePath: "/var/lib/docker/volumes/project-home/_data",
+      hostProjectPath: "/var/lib/docker/volumes/project-home/_data/app",
+      projectId: "/home/dev/.docker-git/project",
+      projectKey: "abc123",
+      sshUser: "dev"
+    }, null).sessionId).toBeNull()
     expect(browserScope.currentProject.containerPath).toBe("/home/dev/app")
     expect(remapSkillerBrowserContainerPath(browserScope, "/home/dev/app/packages")).toBe(
       "/var/lib/docker/volumes/project-home/_data/app/packages"

packages/api/src/services/skiller.ts

@@ -1,6 +1,32 @@
 import { describe, expect, it } from "@effect/vitest"
 
-import { parseSkillerRoute } from "../src/services/skiller.js"
+import {
+  parseSkillerRoute,
+  resolveSkillerBrowserScopeSelection,
+  type SkillerRoute
+} from "../src/services/skiller.js"
+import type { SkillerContainerScope } from "../src/services/skiller-core.js"
+
+const appRoute = (path: string): Extract<SkillerRoute, { readonly _tag: "App" }> => {
+  const route = parseSkillerRoute(path)
+  if (route === null || route._tag !== "App") {
+    throw new Error(`Expected app route for ${path}.`)
+  }
+  return route
+}
+
+const scope = (projectKey: string): SkillerContainerScope => ({
+  containerCodexSkillsPath: "/home/dev/.codex/skills",
+  containerHomePath: "/home/dev",
+  containerName: `dg-${projectKey}`,
+  containerProjectPath: "/home/dev/app",
+  hostCodexSkillsPath: `/var/lib/docker/volumes/${projectKey}-home/_data/.codex/skills`,
+  hostHomePath: `/var/lib/docker/volumes/${projectKey}-home/_data`,
+  hostProjectPath: `/var/lib/docker/volumes/${projectKey}-home/_data/app`,
+  projectId: `/home/dev/.docker-git/${projectKey}`,
+  projectKey,
+  sshUser: "dev"
+})
 
 describe("skiller routes", () => {
   it("keeps the terminal session id on session-scoped app routes", () => {
@@ -20,4 +46,39 @@ describe("skiller routes", () => {
       sessionId: null
     })
   })
+
+  it("uses the current project scope for non-session app routes", () => {
+    const currentScope = scope("project-scope")
+
+    expect(resolveSkillerBrowserScopeSelection(
+      appRoute("/api/skiller/app/"),
+      currentScope,
+      () => null
+    )).toEqual({
+      scope: currentScope,
+      sessionId: null
+    })
+  })
+
+  it("uses the registered terminal scope for session app routes", () => {
+    const currentScope = scope("current-scope")
+    const terminalScope = scope("terminal-scope")
+
+    expect(resolveSkillerBrowserScopeSelection(
+      appRoute("/api/ssh/session/terminal-proof/skiller/app/"),
+      currentScope,
+      (sessionId) => sessionId === "terminal-proof" ? terminalScope : null
+    )).toEqual({
+      scope: terminalScope,
+      sessionId: "terminal-proof"
+    })
+  })
+
+  it("does not inject a browser scope for unscoped Skiller app routes", () => {
+    expect(resolveSkillerBrowserScopeSelection(
+      appRoute("/api/skiller/app/"),
+      null,
+      () => null
+    )).toBeNull()
+  })
 })