@aryacode/dsh-aryacode-polish 0.5.0 → 0.6.2

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## [0.6.2] - 2026-10-28
+
+### Fixed
+
+- **The "+" menu and the GitHub dialog are opaque again in the desktop app.**
+  Both are portaled to `document.body`, which puts them outside the themed tree,
+  and they painted themselves with the harness menu fill `--dsw-specific-menu`
+  (`#f8f9fa94`, 58% alpha) relying on `backdrop-filter` to make that read solid.
+  The AryaCode desktop build does not composite that blur, so the page showed
+  through the panel. Every portaled surface now lays that fill over an opaque
+  `Canvas` base and keeps the blur only where the platform honours it.
+
+## [0.6.1] - 2026-10-28
+
+### Fixed
+
+- **"On this PC" opens the real Windows folder dialog in the desktop app again.**
+  The desktop preload exposes the OS chooser as `__DSH_DIRECTORY_PICKER__.pick()`
+  — the same bridge the shipped native picker uses — and the flow now calls it
+  directly, so picking a folder behaves exactly like the picker it stands in for.
+  The in-app folder list is now only the browser fallback, where no such bridge
+  exists and the composed picker's `pick` would wait on a dialog that cannot open.
+
+## [0.6.0] - 2026-10-28
+
+### Changed
+
+- **Adding a workspace moved into the Workspaces "+" menu.** A new switch
+  (`workspaceSources`) occupies `sidebar.workspaces.directoryFlow`, which is what
+  makes the Shell's **Add workspace…** row appear at all, and stands in for the
+  folder picker with the source menu the owner asked for: **On this PC** (a folder
+  browser driven by this bundle's own `api/polish.folders` route) and **GitHub
+  repository…** (the existing dialog). A finished clone hands its path to the
+  flow's `onPicked`, so the Shell creates the workspace exactly as it does for a
+  picked folder.
+
+### Added
+
+- The sidebar foot now carries the GitHub sign-in state next to the balance
+  (`GitHub · <login>` / `GitHub · signed out`); clicking it opens the repository
+  dialog. It replaced the foot's add-workspace row, which the "+" menu supersedes.
+
+### Fixed
+
+- "On this PC" lists folders instead of waiting on a chooser that cannot open. A
+  composed directory picker serves one capability, `browse` or `native`, and the
+  browser build composes the one with no chooser to show, so the previous
+  `directoryPicker.pick()` call simply never settled. The flow now walks folders
+  through its own route: roots, a `..` row for going back, directories only, and
+  hidden or system entries filtered out.
+
 ## [0.5.0] - 2026-10-27
 
 ### Added

package/README.md

@@ -7,7 +7,7 @@ installed into and patches nothing. It is one package, one Plugins row, and one
 switch per feature, so a refinement that turns out to be wrong for a machine can
 be turned off without uninstalling anything.
 
-Status: **four features shipped.** The version is the package's, and the card
+Status: **five features shipped.** The version is the package's, and the card
 header already shows it.
 
 ## What it is
@@ -33,7 +33,8 @@ Configure page automatically.
 | **Estimated session cost** (`sessionCost`) | On | A `≈$0.39` pill in the composer dock that opens a breakdown card — cache hit, uncached input, cached input, output, requests, and the estimate — priced from the session's recorded usage at the published DeepSeek rates. |
 | **Account balance** (`accountBalance`) | On | The account's remaining wallet (`$17.33`) in the sidebar foot, above the account row. Renders nothing when the Host exposes no wallet, so it never shows a number nobody gave it. |
 | **Open workspace folder** (`openWorkspaceFolder`) | On | An **Open workspace folder** row in a Session's "…" menu that opens the Session's workspace in Explorer/Finder. Renders nothing when the Session has no workspace or the Host cannot open a path. See [Open a workspace folder](docs/workspace-folder.md) for why the request had to land here instead of on the workspace row itself. |
-| **Add a workspace from GitHub** (`githubWorkspace`) | On | **Add workspace from GitHub** in the sidebar foot: the dialog lists the repositories your GitHub CLI session can clone, and cloning one creates the workspace. The token never enters the browser — it is read on the Host, used only as git's http auth header, and never stored. See [GitHub workspaces](docs/github-workspaces.md). |
+| **Add a workspace from GitHub** (`githubWorkspace`) | On | Adds the GitHub half of the workspace sources: the dialog lists the repositories your GitHub CLI session can clone, and cloning one creates the workspace. The token never enters the browser — it is read on the Host, used only as git's http auth header, and never stored. The sidebar foot carries the sign-in state (`GitHub · <login>`). See [GitHub workspaces](docs/github-workspaces.md). |
+| **Add a workspace from this PC or GitHub** (`workspaceSources`) | On | The Workspaces **+** button gets a source menu: **On this PC** (the Host's OS chooser, or a folder list when the composition has no native chooser) and **GitHub repository…**. Off, the **+** button goes back to the shipped folder picker. |
 
 ### How the cost is computed
 

package/client/face.js

@@ -252,6 +252,24 @@ const PILL_STYLE = {
 /** The label half of the pill, cut with an ellipsis rather than wrapped. */
 const PILL_LABEL_STYLE = { minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }
 
+/**
+ * The menu skin of the harness, made opaque on purpose.
+ *
+ * `--dsw-specific-menu` is a translucent fill (`#f8f9fa94`) that only reads as a
+ * solid surface because the harness pairs it with `backdrop-filter`. A plugin
+ * face has to portal its panels to `document.body`, and in the AryaCode desktop
+ * build that blur does not composite: the panel then showed the page behind it
+ * through a 58% fill. So the token stays as a tint over an opaque backdrop
+ * colour, and the blur is kept only where the platform actually honours it.
+ */
+const PANEL_SURFACE = {
+  backgroundColor: 'Canvas',
+  backgroundImage:
+    'linear-gradient(var(--dsw-specific-menu, rgba(248, 249, 250, 0.94)), var(--dsw-specific-menu, rgba(248, 249, 250, 0.94)))',
+  backdropFilter: 'var(--dsw-menu-backdrop-filter, none)',
+  border: '0.5px solid var(--dsw-alias-border-l2, rgba(0, 0, 0, 0.12))',
+}
+
 /** The dialog surface, copied from the harness `stat-dialog.module.css` skin. */
 const PANEL_STYLE = {
   position: 'fixed',
@@ -261,10 +279,8 @@ const PANEL_STYLE = {
   minWidth: 'min(300px, calc(100vw - 24px))',
   maxWidth: 'min(440px, calc(100vw - 24px))',
   padding: '16px',
-  border: 0,
   borderRadius: 'var(--dsw-radius-lg, 12px)',
-  background: 'var(--dsw-specific-menu, Canvas)',
-  backdropFilter: 'var(--dsw-menu-backdrop-filter, none)',
+  ...PANEL_SURFACE,
   boxShadow: 'var(--dsw-elevation-prominent, 0 10px 30px rgba(0, 0, 0, 0.18))',
   fontSize: '12px',
   lineHeight: '18px',
@@ -466,6 +482,7 @@ function CostPill(props) {
  */
 const BALANCE_RETRY_DELAYS = [1500, 5000, 15000, 30000]
 
+
 /**
  * The remaining-balance line in the sidebar foot.
  *
@@ -627,7 +644,12 @@ const GITHUB_ROUTE = 'api/polish.github'
  */
 const githubStore = (() => {
   let open = false
+  // Set when the dialog was opened from the add-workspace flow: the flow owns
+  // workspace creation through `onPicked`, so a clone hands it the path rather
+  // than calling the Workspace service itself.
+  let picker
   const listeners = new Set()
+  const publish = () => { for (const listener of listeners) listener() }
   return {
     isOpen: () => open,
     subscribe(listener) {
@@ -637,7 +659,21 @@ const githubStore = (() => {
     set(next) {
       if (open === next) return
       open = next
-      for (const listener of listeners) listener()
+      if (!next) picker = undefined
+      publish()
+    },
+    /** Open the dialog, optionally on behalf of the add-workspace flow. */
+    open(onPicked) {
+      picker = onPicked
+      if (open) return
+      open = true
+      publish()
+    },
+    /** Take the flow's `onPicked` once, so a second clone cannot reuse it. */
+    takePicker() {
+      const current = picker
+      picker = undefined
+      return current
     },
   }
 })()
@@ -662,6 +698,28 @@ async function githubCall(action, extra) {
   return payload.value
 }
 
+/** The Host route the folder browser talks over. Document-relative, like every app route. */
+const FOLDERS_ROUTE = 'api/polish.folders'
+
+/**
+ * Post one action to the folder route.
+ * @param body - `{ action: 'roots' }` or `{ action: 'ls', path }`.
+ * @returns the route's listing, or throws with its own message.
+ */
+async function foldersCall(body) {
+  const response = await fetch(FOLDERS_ROUTE, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify(body),
+  })
+  const payload = await response.json().catch(() => undefined)
+  if (payload === undefined || typeof payload !== 'object') {
+    throw new Error(`the Host answered ${String(response.status)}`)
+  }
+  if (payload.error !== undefined) throw new Error(String(payload.error))
+  return payload
+}
+
 /** Modal backdrop and panel skin, matching the Shell's own dialogs. */
 const GITHUB_BACKDROP_STYLE = {
   position: 'fixed',
@@ -785,7 +843,15 @@ function GitHubPanel(props) {
     setError('')
     Promise.resolve()
       .then(() => githubCall('clone', { owner: repo.owner, name: repo.name }))
-      .then(result => Promise.resolve(props.createWorkspace(result.path)).then(() => result))
+      // The add-workspace flow owns creation when it opened this dialog; a
+      // dialog opened from the footer creates the workspace itself.
+      .then(result => {
+        const onPicked = githubStore.takePicker()
+        const land = onPicked === undefined
+          ? Promise.resolve(props.createWorkspace(result.path))
+          : Promise.resolve(onPicked(result.path))
+        return land.then(() => result)
+      })
       .then(result => {
         setBusy('')
         githubStore.set(false)
@@ -862,59 +928,326 @@ function GitHubPanel(props) {
     , document.body)
 }
 
+/** The compact footer-row skin shared by the status line. */
+const FOOT_ROW_STYLE = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: '6px',
+  maxWidth: '100%',
+  minWidth: 0,
+  padding: '2px 6px',
+  border: 'none',
+  borderRadius: 'var(--dsw-radius-sm, 6px)',
+  background: 'transparent',
+  color: 'var(--dsw-alias-label-tertiary, inherit)',
+  font: 'inherit',
+  fontSize: '12px',
+  lineHeight: '18px',
+  fontVariantNumeric: 'tabular-nums',
+  whiteSpace: 'nowrap',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  cursor: 'pointer',
+}
+
 /**
- * The footer row that opens the GitHub dialog.
+ * The footer status line: which GitHub session the "+" menu will clone with.
+ *
+ * It reads the same `status` action the dialog does, so it costs one request
+ * when the Shell loads and one whenever the window regains focus.
+ *
  * @param props - our lazy `configForms`.
  * @returns the row, or null when the feature is switched off.
  */
-function GithubEntry(props) {
+function GithubStatus(props) {
   const enabled = useSwitch(props.configForms, 'githubWorkspace', true)
+  const [status, setStatus] = React.useState(undefined)
+  React.useEffect(() => {
+    if (!enabled) return undefined
+    let live = true
+    const read = () => {
+      Promise.resolve()
+        .then(() => githubCall('status'))
+        .then(next => { if (live) setStatus(next) })
+        .catch(() => { if (live) setStatus({ signedIn: false }) })
+    }
+    read()
+    const onFocus = () => { read() }
+    window.addEventListener('focus', onFocus)
+    return () => {
+      live = false
+      window.removeEventListener('focus', onFocus)
+    }
+  }, [enabled])
   if (!enabled) return null
-  return React.createElement('div', { style: { padding: '2px 8px 4px', minWidth: 0 } },
+  const signedIn = status !== undefined && status.signedIn === true
+  const label = status === undefined
+    ? 'GitHub · checking…'
+    : signedIn ? `GitHub · ${String(status.login)}` : 'GitHub · signed out'
+  return React.createElement('div', { style: { padding: '2px 8px 0', minWidth: 0 } },
     React.createElement('button', {
       type: 'button',
-      'data-polish-github': 'entry',
-      title: 'Add a workspace from GitHub',
-      'aria-label': 'Add a workspace from GitHub',
-      onClick: () => githubStore.set(true),
+      'data-polish-github': 'status',
+      'data-polish-github-state': signedIn ? 'in' : status === undefined ? 'checking' : 'out',
+      title: signedIn
+        ? 'Add a workspace from GitHub'
+        : 'Sign in with the GitHub CLI (gh auth login), then add a repository as a workspace',
+      'aria-label': label,
+      onClick: () => githubStore.open(),
+      style: FOOT_ROW_STYLE,
+      onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+      onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
+    }, label))
+}
+
+/** One row of the add-workspace source menu. */
+const SOURCE_ROW_STYLE = {
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'flex-start',
+  gap: '2px',
+  width: '100%',
+  padding: '8px 10px',
+  border: 'none',
+  borderRadius: 'var(--dsw-radius-sm, 6px)',
+  background: 'transparent',
+  color: 'inherit',
+  font: 'inherit',
+  textAlign: 'left',
+  cursor: 'pointer',
+}
+
+/**
+ * The "+" add-workspace flow: choose where the workspace comes from.
+ *
+ * The Harness shows its own `Add workspace…` row only while this slot is
+ * occupied, and a single-owner slot means this dialog stands in for the folder
+ * picker. It therefore offers both sources: the machine (the Host's own OS
+ * chooser when the composition serves the `native` capability, otherwise a
+ * folder list driven by the browse primitives) and GitHub.
+ *
+ * @param props - the slot owner's `open`/`busy`/`onPicked`/`onCancel`/`onError`,
+ *   our lazy `configForms`, and the directory-picker calls.
+ * @returns the flow, or null while it is closed or switched off.
+ */
+function WorkspaceSourceFlow(props) {
+  const enabled = useSwitch(props.configForms, 'workspaceSources', true)
+  const [step, setStep] = React.useState('menu')
+  const [listing, setListing] = React.useState(undefined)
+  const [error, setError] = React.useState('')
+  const [busy, setBusy] = React.useState(false)
+
+  const cancel = () => {
+    if (typeof props.onCancel === 'function') props.onCancel()
+  }
+
+  // Escape closes the flow. Declared with the other hooks, before the early
+  // return, so the hook order stays fixed while the flow opens and closes.
+  React.useEffect(() => {
+    if (!enabled || props.open !== true) return undefined
+    const onKey = event => { if (event.key === 'Escape') cancel() }
+    document.addEventListener('keydown', onKey)
+    return () => document.removeEventListener('keydown', onKey)
+  }, [enabled, props.open])
+
+  if (!enabled || props.open !== true) return null
+
+  const fail = message => {
+    setBusy(false)
+    setError(message)
+  }
+  const messageOf = reason => (reason instanceof Error ? reason.message : String(reason))
+
+  const land = path => {
+    setBusy(true)
+    setError('')
+    Promise.resolve()
+      .then(() => props.onPicked(path))
+      .catch(reason => fail(messageOf(reason)))
+  }
+
+  const browse = path => {
+    setBusy(true)
+    setError('')
+    Promise.resolve()
+      .then(() => foldersCall({ action: 'ls', path }))
+      .then(level => {
+        setListing(level)
+        setBusy(false)
+        setStep('browse')
+      })
+      .catch(reason => fail(messageOf(reason)))
+  }
+
+  /**
+   * Hand folder choice to the Host.
+   *
+   * In the desktop app the preload exposes the real OS chooser as
+   * `__DSH_DIRECTORY_PICKER__.pick()` — the same bridge the shipped native
+   * picker uses — so the flow opens the Windows folder dialog and behaves like
+   * the stock picker it stands in for. In a browser there is no such bridge, and
+   * the composed picker's `pick` waits on a dialog that cannot open, so the flow
+   * lists folders itself instead of hanging.
+   */
+  const chooseOnPc = () => {
+    if (busy) return
+    const bridge = typeof globalThis === 'undefined' ? undefined : globalThis.__DSH_DIRECTORY_PICKER__
+    if (bridge !== undefined && typeof bridge.pick === 'function') {
+      setBusy(true)
+      setError('')
+      Promise.resolve()
+        .then(() => bridge.pick())
+        .then(path => {
+          if (typeof path === 'string' && path !== '') {
+            land(path)
+            return
+          }
+          setBusy(false)
+        })
+        .catch(reason => fail(messageOf(reason)))
+      return
+    }
+    setBusy(true)
+    setError('')
+    Promise.resolve()
+      .then(() => foldersCall({ action: 'roots' }))
+      .then(payload => {
+        const roots = Array.isArray(payload.roots) ? payload.roots : []
+        setListing({
+          path: '',
+          parent: null,
+          entries: roots.map(root => ({ name: root.label, path: root.path })),
+        })
+        setBusy(false)
+        setStep('browse')
+      })
+      .catch(reason => fail(messageOf(reason)))
+  }
+
+  const openGithub = () => {
+    githubStore.open(path => props.onPicked(path))
+    cancel()
+  }
+
+  const rows = step === 'menu'
+    ? [
+      React.createElement('button', {
+        key: 'pc',
+        type: 'button',
+        'data-polish-source': 'machine',
+        disabled: busy,
+        onClick: chooseOnPc,
+        style: SOURCE_ROW_STYLE,
+        onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+        onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
+      },
+      React.createElement('span', { style: { fontWeight: 500 } }, 'On this PC'),
+      React.createElement('span', { style: { opacity: 0.7 } }, 'Choose a folder on this machine')),
+      React.createElement('button', {
+        key: 'github',
+        type: 'button',
+        'data-polish-source': 'github',
+        disabled: busy,
+        onClick: openGithub,
+        style: SOURCE_ROW_STYLE,
+        onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+        onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
+      },
+      React.createElement('span', { style: { fontWeight: 500 } }, 'GitHub repository…'),
+      React.createElement('span', { style: { opacity: 0.7 } }, 'Clone one of your repositories as a workspace')),
+    ]
+    : [
+      React.createElement('div', {
+        key: 'head',
+        style: { display: 'flex', alignItems: 'center', gap: '8px', padding: '2px 4px 6px', minWidth: 0 },
+      },
+      React.createElement('span', {
+        style: { flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' },
+        title: listing !== undefined ? listing.path : '',
+      }, listing === undefined || listing.path === '' ? 'This PC' : listing.path),
+      listing === undefined || listing.path === ''
+        ? null
+        : React.createElement('button', {
+          type: 'button',
+          'data-polish-pick': 'here',
+          disabled: busy,
+          onClick: () => { if (listing !== undefined) land(listing.path) },
+          style: { ...FOOT_ROW_STYLE, color: 'var(--dsw-alias-label-primary, inherit)', background: 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+        }, 'Use this folder')),
+      ...(listing === undefined || listing.parent === null || listing.parent === undefined
+        ? []
+        : [React.createElement('button', {
+          key: 'up',
+          type: 'button',
+          'data-polish-folder': '..',
+          disabled: busy,
+          onClick: () => browse(listing.parent),
+          style: SOURCE_ROW_STYLE,
+          onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+          onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
+        }, React.createElement('span', { title: listing.parent }, '..'))]),
+      ...(listing === undefined
+        ? []
+        : listing.entries.map(entry => React.createElement('button', {
+          key: entry.path,
+          type: 'button',
+          'data-polish-folder': entry.name,
+          disabled: busy,
+          onClick: () => browse(entry.path),
+          style: SOURCE_ROW_STYLE,
+          onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
+          onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
+        }, React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }, title: entry.path }, entry.name)))),
+    ]
+
+  // The flow is rendered inside the Shell's add-workspace popover, which is
+  // narrow and sits under the sidebar's own stacking order. A portal to the body
+  // puts it above everything and keeps the rows readable at their own width.
+  return ReactDOM.createPortal(
+    React.createElement('div', {
+      style: GITHUB_BACKDROP_STYLE,
+      'data-polish-flow-backdrop': step,
+      onPointerDown: event => { if (event.target === event.currentTarget) cancel() },
+    },
+    React.createElement('div', {
+      'data-polish-flow': step,
+      role: 'dialog',
+      'aria-label': 'Add a workspace',
       style: {
         display: 'flex',
-        alignItems: 'center',
-        gap: '6px',
-        maxWidth: '100%',
-        minWidth: 0,
-        padding: '2px 6px',
-        border: 'none',
-        borderRadius: 'var(--dsw-radius-sm, 6px)',
-        background: 'transparent',
-        color: 'var(--dsw-alias-label-tertiary, inherit)',
-        font: 'inherit',
+        flexDirection: 'column',
+        gap: '2px',
+        width: 'min(360px, calc(100vw - 32px))',
+        maxHeight: 'min(420px, calc(100vh - 96px))',
+        padding: '6px',
+        overflowY: 'auto',
+        borderRadius: 'var(--dsw-radius-lg, 12px)',
+        ...PANEL_SURFACE,
+        boxShadow: 'var(--dsw-elevation-prominent, 0 8px 24px rgba(0,0,0,0.18))',
         fontSize: '12px',
         lineHeight: '18px',
-        fontVariantNumeric: 'tabular-nums',
-        whiteSpace: 'nowrap',
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
-        cursor: 'pointer',
+        color: 'var(--dsw-alias-label-secondary, inherit)',
       },
-      onMouseEnter: event => { event.currentTarget.style.background = 'var(--dsw-alias-interactive-bg-hover, rgba(0,0,0,0.06))' },
-      onMouseLeave: event => { event.currentTarget.style.background = 'transparent' },
-    },
-    React.createElement('svg', {
-      width: 14,
-      height: 14,
-      viewBox: '0 0 16 16',
-      fill: 'none',
-      stroke: 'currentColor',
-      strokeWidth: 1.2,
-      strokeLinecap: 'round',
-      strokeLinejoin: 'round',
-      'aria-hidden': 'true',
-      style: { flex: 'none' },
     },
-    React.createElement('path', { d: 'M2.5 5.5h4l1.2 1.5h5.8v6.5h-11z' }),
-    React.createElement('path', { d: 'M8 9.8v3.4M6.3 11.5h3.4' })),
-    'Add from GitHub'))
+    error !== ''
+      ? React.createElement('div', { style: { padding: '4px 6px', color: 'var(--dsw-alias-label-error, #b42318)' } }, error)
+      : null,
+    ...rows,
+    step === 'menu'
+      ? null
+      : React.createElement('button', {
+        type: 'button',
+        'data-polish-pick': 'back',
+        onClick: () => { setStep('menu'); setListing(undefined); setError('') },
+        style: { ...FOOT_ROW_STYLE, justifyContent: 'flex-start' },
+      }, 'Back'),
+    React.createElement('button', {
+      type: 'button',
+      'data-polish-pick': 'cancel',
+      onClick: cancel,
+      style: { ...FOOT_ROW_STYLE, justifyContent: 'flex-start' },
+    }, 'Cancel'))),
+  document.body)
 }
 
 return {
@@ -995,12 +1328,29 @@ return {
         id: 'polish-github',
         inject: () => ({ configForms, createWorkspace }),
       }, GitHubPanel))
+      // The footer keeps the sign-in state, not an add button: adding a
+      // workspace belongs in the "+" menu, where the Shell says it does.
       githubCtx.slots.inject('sidebar.footer.action', () => githubCtx.slots.register({
         name: 'sidebar.footer.action',
-        id: 'polish-github-entry',
+        id: 'polish-github-status',
         order: 4,
         inject: () => ({ configForms }),
-      }, GithubEntry))
+      }, GithubStatus))
     })
+    // The "+" menu's `Add workspace…` row exists only while a plugin occupies
+    // this single-owner hole, so occupying it means standing in for the folder
+    // picker: the flow offers the machine and GitHub as sources. It needs no
+    // Remote injection: the folder list and the clone both come from this
+    // bundle's own Host routes, which is what makes the flow behave the same in
+    // the browser and in the app.
+    ctx.slots.inject('sidebar.workspaces.directoryFlow', () => ctx.slots.register({
+      name: 'sidebar.workspaces.directoryFlow',
+      // A single slot clashes only at the exact priority; another priority
+      // shadows it and the LOWEST priority renders. The shipped pickers
+      // register at 0, so -1 is what puts this flow in front of them without
+      // making their own activation throw.
+      priority: -1,
+      inject: () => ({ configForms }),
+    }, WorkspaceSourceFlow))
   },
 }

package/client/switches.json

@@ -24,6 +24,12 @@
       "label": "Add a workspace from GitHub",
       "description": "Sign in with the GitHub CLI, browse your repositories, and clone one as a workspace.",
       "defaultOn": true
+    },
+    {
+      "key": "workspaceSources",
+      "label": "Add a workspace from this PC or GitHub",
+      "description": "Put an On this PC / GitHub repository source menu behind the Workspaces + button.",
+      "defaultOn": true
     }
   ]
 }

package/docs/github-workspaces.md

@@ -31,16 +31,37 @@ server rejects a bearer token for clone, which is why the header carries
 `x-access-token` basic auth. Every line of git output is scrubbed of the token
 before it can reach the browser, and the route answers `cache-control: no-store`.
 
-## Why the entry point is the sidebar foot
-
-The "+" menu's **Add workspace** entry only appears when something occupies
-`sidebar.workspaces.directoryFlow`, and that slot is `kind: 'single'`: it already
-holds the folder picker, so occupying it would mean re-implementing folder
-choosing (browse *and* the native desktop picker) just to add a second source.
-Rather than replace the shipped picker, the feature adds its own entry in the
-sidebar foot next to it. If a multi-source workspace socket ever lands in the
-harness, only the registration moves; the route, the clone rules and the tests
-stay as they are.
+## How the entry point works
+
+The "+" menu's **Add workspace…** entry only appears when something occupies
+`sidebar.workspaces.directoryFlow`, and that slot is `kind: 'single'` — whoever
+takes it stands in for the folder picker. This bundle takes it and offers the
+two sources the owner asked for:
+
+- **On this PC** — the OS folder dialog. The desktop preload exposes it as
+  `window.__DSH_DIRECTORY_PICKER__.pick()`, the same bridge the shipped native
+  picker uses, so the flow calls it directly and behaves exactly like the picker
+  it stands in for. Where that bridge is absent (the web build) the flow falls
+  back to a folder browser driven by this bundle's own route
+  (`api/polish.folders`, actions `roots` and `ls`): roots, a `..` row for going
+  back, directories only, hidden and system entries filtered out, and **Use this
+  folder** hands the current path to the flow's `onPicked`.
+- **GitHub repository…** — the dialog described above. It opens on behalf of the
+  flow, so a finished clone hands its path back through the flow's `onPicked`,
+  and the Shell creates the workspace exactly as it does for a picked folder.
+
+### Why the fallback exists at all
+
+A composed directory picker serves exactly one capability: `browse` answers
+`list` and `createDirectory`, `native` answers `pick`. The web profile composes
+the picker whose chooser cannot open there, so `directoryPicker.pick()` waits on
+a dialog that never appears — an earlier build of this flow did exactly that and
+the row spun forever. The preload bridge is the reliable door in the app; the
+listing is what a browser gets instead of a spinner.
+
+The tray of the foot keeps the sign-in state (`GitHub · <login>`, or
+`GitHub · signed out`) next to the balance, so the account is visible without
+opening a dialog; clicking it opens the repository dialog directly.
 
 ## Not used from the AryaAI-era plugin