@aryacode/dsh-aryacode-polish 0.3.9 → 0.5.0

package/lib/client.js

@@ -19,11 +19,23 @@ window.__ModuleLoader__.load({
         "label": "Account balance",
         "description": "Show the remaining account balance in the sidebar foot, above the account row.",
         "defaultOn": true
+      },
+      {
+        "key": "openWorkspaceFolder",
+        "label": "Open workspace folder",
+        "description": "Add an “Open workspace folder” row to a Session’s menu that opens its workspace in the file browser.",
+        "defaultOn": true
+      },
+      {
+        "key": "githubWorkspace",
+        "label": "Add a workspace from GitHub",
+        "description": "Sign in with the GitHub CLI, browse your repositories, and clone one as a workspace.",
+        "defaultOn": true
       }
     ]
     const ROW_ID = "polish"
     const ROW_KEY = "@aryacode/dsh-aryacode-polish" + '#' + ROW_ID
-    const CLIENT_VERSION = "0.3.9"
+    const CLIENT_VERSION = "0.5.0"
 
     /**
      * The two pure decisions behind the balance line: which wallet to show, and how
@@ -166,6 +178,19 @@ window.__ModuleLoader__.load({
     const React = require('react')
     const ReactDOM = require('react-dom')
 
+    /**
+     * The Shell's own UI primitives. Guarded because the menu row degrades to a plain
+     * button when a Shell answers no primitives, and a bundle that throws on load
+     * would take every other surface down with it.
+     */
+    const primitives = (() => {
+      try {
+        return require('@deepseek-ai/dsh-client-ui-primitives')
+      } catch {
+        return undefined
+      }
+    })()
+
     /** Shared spacing for the page's prose. */
     const SPACING = { margin: '0 0 10px', opacity: 0.85, lineHeight: '1.5' }
 
@@ -666,22 +691,391 @@ window.__ModuleLoader__.load({
         return React.createElement('div', { 'data-polish-balance': 'empty', style: { display: 'none' } })
       }
       const money = formatBalance(wallet)
+      // The foot is a single row shared with the GitHub entry, so the amount stays
+      // bare: a tooltip names it, and nothing here competes for width.
       return React.createElement('div', {
         title: 'Remaining account balance',
+        'data-polish-balance': 'ready',
         style: {
           display: 'flex',
           alignItems: 'center',
           gap: '6px',
-          padding: '2px 8px 4px',
+          padding: '2px 4px 4px 8px',
           fontSize: '12px',
           lineHeight: '16px',
-          minWidth: 0,
-          overflow: 'hidden',
+          flex: '0 0 auto',
           whiteSpace: 'nowrap',
-          textOverflow: 'ellipsis',
           opacity: 0.75,
+          fontVariantNumeric: 'tabular-nums',
+        },
+      }, money)
+    }
+
+    /**
+     * The workspace a Session belongs to.
+     *
+     * Occupants of `sidebar.workspaces.session.menu.item` address their data by
+     * Session id and must not bind or retain the Session, so the workspace is read
+     * from the Workspace snapshot at render time and never memoized.
+     *
+     * @param workspaces - the Shell's Workspace service, when it is loaded.
+     * @param sessionId - the row's Session.
+     * @returns the owning workspace, or undefined when it cannot be resolved.
+     */
+    function workspaceOf(workspaces, sessionId) {
+      if (workspaces === undefined || workspaces === null || sessionId === undefined) return undefined
+      let items
+      try {
+        items = workspaces.list.getSnapshot().items
+      } catch {
+        return undefined
+      }
+      if (!Array.isArray(items)) return undefined
+      return items.find(item => Array.isArray(item.sessionIds)
+        && item.sessionIds.indexOf(sessionId) !== -1
+        && typeof item.path === 'string'
+        && item.path !== '')
+    }
+
+    /**
+     * "Open workspace folder": one row in a Session's "…" menu.
+     *
+     * It renders nothing when the switch is off or the Session has no workspace the
+     * Host could open, because a menu row that cannot act is worse than no row.
+     *
+     * @param props - the row's Session id, our lazy `configForms`/`workspaces`, the
+     *   opener, and the slot's injected `useMenuOpenState` hook.
+     * @returns the menu row, or null.
+     */
+    function OpenFolderMenuItem(props) {
+      const enabled = useSwitch(props.configForms, 'openWorkspaceFolder', true)
+      // Hooks run unconditionally; the row simply renders nothing when it cannot act.
+      const menu = typeof props.useMenuOpenState === 'function' ? props.useMenuOpenState() : undefined
+      const closeMenu = Array.isArray(menu) && typeof menu[1] === 'function' ? menu[1] : undefined
+      const workspace = enabled ? workspaceOf(props.workspaces, props.sessionId) : undefined
+      if (!enabled || workspace === undefined) return null
+      const label = 'Open workspace folder'
+      const onSelect = () => {
+        if (closeMenu !== undefined) closeMenu(false)
+        const open = props.openFolder
+        if (typeof open !== 'function') return
+        void Promise.resolve()
+          .then(() => open(workspace))
+          .catch(error => {
+            // A menu row that silently does nothing is unfixable in the field, so the
+            // failure is reported instead of dropped. This is the only diagnostic the
+            // bundle writes.
+            if (typeof console !== 'undefined' && typeof console.warn === 'function') {
+              console.warn('[aryacode-polish] open workspace folder failed:', error && error.message ? error.message : error)
+            }
+          })
+      }
+      if (primitives !== undefined && typeof primitives.MenuItemButton === 'function') {
+        const icon = typeof primitives.IconFolderOpenRegular === 'function'
+          ? React.createElement(primitives.IconFolderOpenRegular)
+          : undefined
+        return React.createElement(primitives.MenuItemButton, { icon, onSelect }, label)
+      }
+      return React.createElement('button', { type: 'button', role: 'menuitem', onClick: onSelect }, label)
+    }
+
+    /** The Host route the GitHub halves talk over. Document-relative, like every app route. */
+    const GITHUB_ROUTE = 'api/polish.github'
+
+    /**
+     * Whether the GitHub panel is open. One store for the whole bundle: the footer
+     * row opens it, and the overlay panel is the only reader.
+     */
+    const githubStore = (() => {
+      let open = false
+      const listeners = new Set()
+      return {
+        isOpen: () => open,
+        subscribe(listener) {
+          listeners.add(listener)
+          return () => { listeners.delete(listener) }
+        },
+        set(next) {
+          if (open === next) return
+          open = next
+          for (const listener of listeners) listener()
+        },
+      }
+    })()
+
+    /**
+     * Post one action to the GitHub route.
+     * @param action - `status`, `repos` or `clone`.
+     * @param extra - fields the action needs.
+     * @returns the route's `value`, or throws with its own message.
+     */
+    async function githubCall(action, extra) {
+      const response = await fetch(GITHUB_ROUTE, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ action, ...(extra ?? {}) }),
+      })
+      const payload = await response.json().catch(() => undefined)
+      if (payload === undefined || typeof payload !== 'object') {
+        throw new Error(`the Host answered ${String(response.status)}`)
+      }
+      if (payload.ok !== true) throw new Error(payload.error || 'GitHub request failed')
+      return payload.value
+    }
+
+    /** Modal backdrop and panel skin, matching the Shell's own dialogs. */
+    const GITHUB_BACKDROP_STYLE = {
+      position: 'fixed',
+      inset: 0,
+      zIndex: 1200,
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      background: 'rgba(16, 18, 22, 0.32)',
+    }
+
+    const GITHUB_CARD_STYLE = {
+      ...PANEL_STYLE,
+      position: 'static',
+      width: 'min(560px, calc(100vw - 32px))',
+      maxHeight: 'min(560px, calc(100vh - 64px))',
+      display: 'flex',
+      flexDirection: 'column',
+      overflow: 'hidden',
+    }
+
+    const GITHUB_LIST_STYLE = {
+      marginTop: '10px',
+      overflowY: 'auto',
+      borderTop: '0.5px solid var(--dsw-alias-border-l2, rgba(0,0,0,0.12))',
+    }
+
+    const GITHUB_ROW_STYLE = {
+      display: 'flex',
+      alignItems: 'center',
+      gap: '8px',
+      width: '100%',
+      padding: '8px 4px',
+      border: 'none',
+      background: 'transparent',
+      color: 'inherit',
+      font: 'inherit',
+      textAlign: 'left',
+      cursor: 'pointer',
+      borderBottom: '0.5px solid var(--dsw-alias-border-l2, rgba(0,0,0,0.08))',
+    }
+
+    const GITHUB_INPUT_STYLE = {
+      width: '100%',
+      boxSizing: 'border-box',
+      padding: '6px 8px',
+      font: 'inherit',
+      color: 'inherit',
+      background: 'transparent',
+      border: '0.5px solid var(--dsw-alias-border-l2, rgba(0,0,0,0.2))',
+      borderRadius: 'var(--dsw-radius-sm, 6px)',
+    }
+
+    /**
+     * The add-a-workspace-from-GitHub dialog.
+     *
+     * Sign-in is the GitHub CLI's own session: the Host asks `gh` for the token it
+     * already holds, so this dialog never collects a credential. A clone becomes a
+     * workspace through the Workspace Remote, which is the same call the "+" menu
+     * makes after its folder picker returns a path.
+     *
+     * @param props - our lazy `configForms` and the `createWorkspace` opener.
+     * @returns the dialog, or null while it is closed or switched off.
+     */
+    function GitHubPanel(props) {
+      const open = React.useSyncExternalStore(githubStore.subscribe, githubStore.isOpen)
+      const enabled = useSwitch(props.configForms, 'githubWorkspace', true)
+      const [phase, setPhase] = React.useState('idle')
+      const [account, setAccount] = React.useState(undefined)
+      const [repos, setRepos] = React.useState([])
+      const [query, setQuery] = React.useState('')
+      const [error, setError] = React.useState('')
+      const [busy, setBusy] = React.useState('')
+
+      React.useEffect(() => {
+        if (!open || !enabled) return undefined
+        let live = true
+        setPhase('loading')
+        setError('')
+        setBusy('')
+        setQuery('')
+        Promise.resolve()
+          .then(() => githubCall('status'))
+          .then(status => {
+            if (!live) return undefined
+            setAccount(status)
+            if (status.signedIn !== true) return undefined
+            return githubCall('repos').then(list => {
+              if (!live) return
+              setRepos(Array.isArray(list.repos) ? list.repos : [])
+            })
+          })
+          .then(() => { if (live) setPhase('ready') })
+          .catch(reason => {
+            if (!live) return
+            setError(reason instanceof Error ? reason.message : String(reason))
+            setPhase('ready')
+          })
+        return () => { live = false }
+      }, [open, enabled])
+
+      React.useEffect(() => {
+        if (!open) return undefined
+        const onKey = event => { if (event.key === 'Escape') githubStore.set(false) }
+        document.addEventListener('keydown', onKey)
+        return () => document.removeEventListener('keydown', onKey)
+      }, [open])
+
+      if (!open || !enabled) return null
+
+      const signedIn = account !== undefined && account.signedIn === true
+      const needle = query.trim().toLowerCase()
+      const visible = needle === ''
+        ? repos
+        : repos.filter(repo => `${repo.fullName} ${repo.description}`.toLowerCase().includes(needle))
+      const root = account !== undefined && typeof account.root === 'string' ? account.root : ''
+
+      const clone = repo => {
+        if (busy !== '') return
+        setBusy(repo.fullName)
+        setError('')
+        Promise.resolve()
+          .then(() => githubCall('clone', { owner: repo.owner, name: repo.name }))
+          .then(result => Promise.resolve(props.createWorkspace(result.path)).then(() => result))
+          .then(result => {
+            setBusy('')
+            githubStore.set(false)
+            if (typeof console !== 'undefined' && typeof console.info === 'function') {
+              console.info('[aryacode-polish] workspace ready:', result.path)
+            }
+          })
+          .catch(reason => {
+            setBusy('')
+            setError(reason instanceof Error ? reason.message : String(reason))
+          })
+      }
+
+      const rows = visible.slice(0, 200).map(repo => React.createElement('button', {
+        key: repo.fullName,
+        type: 'button',
+        style: GITHUB_ROW_STYLE,
+        disabled: busy !== '',
+        onClick: () => clone(repo),
+        title: repo.description === '' ? repo.fullName : `${repo.fullName} — ${repo.description}`,
+        'data-polish-github-row': repo.fullName,
+      },
+      React.createElement('span', { style: { flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } },
+        repo.fullName,
+        repo.isPrivate ? React.createElement('span', { style: { marginLeft: '6px', opacity: 0.6 } }, 'private') : null,
+        repo.isFork ? React.createElement('span', { style: { marginLeft: '6px', opacity: 0.6 } }, 'fork') : null),
+      repo.cloned === true
+        ? React.createElement('span', { style: { opacity: 0.6 } }, 'cloned')
+        : null,
+      busy === repo.fullName ? React.createElement('span', { style: { opacity: 0.7 } }, 'cloning…') : null))
+
+      return ReactDOM.createPortal(
+        React.createElement('div', {
+          style: GITHUB_BACKDROP_STYLE,
+          'data-polish-github': 'dialog',
+          onPointerDown: event => { if (event.target === event.currentTarget) githubStore.set(false) },
         },
-      }, props.wide === false ? money : 'Balance ' + money)
+        React.createElement('div', { style: GITHUB_CARD_STYLE, role: 'dialog', 'aria-label': 'Add a workspace from GitHub' },
+          React.createElement('div', { style: { ...PANEL_TITLE_STYLE, marginBottom: '4px' } },
+            React.createElement('span', null, 'Add a workspace from GitHub'),
+            React.createElement('button', {
+              type: 'button',
+              onClick: () => githubStore.set(false),
+              style: { border: 'none', background: 'transparent', color: 'inherit', font: 'inherit', cursor: 'pointer', opacity: 0.7 },
+              'aria-label': 'Close',
+            }, '×')),
+          React.createElement('div', { style: { opacity: 0.75, minHeight: '18px' } },
+            phase === 'loading' && !signedIn ? 'Checking the GitHub CLI session…' : null,
+            signedIn ? `Signed in as ${String(account.login)} · cloning into ${root}` : null,
+            !signedIn && phase !== 'loading'
+              ? 'The GitHub CLI is not signed in. Run `gh auth login` in a terminal, then reopen this dialog.'
+              : null),
+          signedIn
+            ? React.createElement('input', {
+              style: { ...GITHUB_INPUT_STYLE, marginTop: '10px' },
+              value: query,
+              placeholder: 'Search your repositories',
+              'aria-label': 'Search your repositories',
+              autoFocus: true,
+              onChange: event => setQuery(event.target.value),
+            })
+            : null,
+          error !== ''
+            ? React.createElement('div', { style: { marginTop: '10px', color: 'var(--dsw-alias-label-error, #b42318)' } }, error)
+            : null,
+          signedIn
+            ? React.createElement('div', { style: GITHUB_LIST_STYLE, 'data-polish-github-list': String(visible.length) },
+              phase === 'loading' && visible.length === 0 ? React.createElement('div', { style: { padding: '10px 4px', opacity: 0.7 } }, 'Loading repositories…') : null,
+              phase === 'ready' && visible.length === 0 ? React.createElement('div', { style: { padding: '10px 4px', opacity: 0.7 } }, 'No repository matches that search.') : null,
+              ...rows)
+            : null,
+          React.createElement('p', { style: { margin: '10px 0 0', color: 'var(--dsw-alias-label-tertiary, inherit)' } },
+            'The clone is added as a workspace. Sign-in comes from the GitHub CLI, so this plugin stores no token.')))
+        , document.body)
+    }
+
+    /**
+     * The footer row that opens the GitHub dialog.
+     * @param props - our lazy `configForms`.
+     * @returns the row, or null when the feature is switched off.
+     */
+    function GithubEntry(props) {
+      const enabled = useSwitch(props.configForms, 'githubWorkspace', true)
+      if (!enabled) return null
+      return React.createElement('div', { style: { padding: '2px 8px 4px', 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),
+          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',
+          },
+          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'))
     }
 
     return {
@@ -720,6 +1114,55 @@ window.__ModuleLoader__.load({
             inject: () => ({ configForms, loadBalance }),
           }, BalanceLine))
         })
+        // The Workspace service and the Session Remote are both required for the menu
+        // row: it reads the folder from the first and opens it through the second.
+        // They are declared on the inject list because a Remote namespace may not be
+        // read through `ctx.get` — the Shell's guard refuses it.
+        ctx.inject(['workspaces', 'remote', 'remote.session'], (workspaceCtx) => {
+          const openFolder = async (workspace) => {
+            const remote = workspaceCtx.remote.session
+            // A Remote method answers an envelope (`{ ok, value }`), not the bare
+            // return value; a Shell that answered a plain boolean is tolerated too.
+            const answer = await remote.canOpenWorkspacePath()
+            const available = answer !== null && typeof answer === 'object'
+              ? answer.ok === true && answer.value === true
+              : answer === true
+            if (!available) throw new Error('this Host cannot open a folder')
+            const result = await remote.openWorkspacePath({ path: workspace.path })
+            if (result !== null && typeof result === 'object' && 'ok' in result && result.ok !== true) {
+              throw new Error('the Host refused to open the folder')
+            }
+          }
+          workspaceCtx.slots.inject('sidebar.workspaces.session.menu.item', () => workspaceCtx.slots.register({
+            name: 'sidebar.workspaces.session.menu.item',
+            id: 'polish-open-folder',
+            order: 460,
+            inject: () => ({ configForms, openFolder, workspaces: workspaceCtx.get('workspaces') }),
+          }, OpenFolderMenuItem))
+        })
+        // Adding a workspace from GitHub goes through the Workspace service's own
+        // create call — the same one the "+" menu makes once its folder picker
+        // returns a path — so a clone lands in the sidebar exactly like a picked
+        // folder does, with no Harness change anywhere. The service takes the plain
+        // path and throws on refusal; the Remote namespace underneath it is
+        // `ctx.remote.workspace` (singular), which is why this injects the service.
+        ctx.inject(['workspaces'], (githubCtx) => {
+          const createWorkspace = async (path) => {
+            const workspace = await githubCtx.workspaces.create({ path })
+            return workspace
+          }
+          githubCtx.slots.inject('shell.overlay', () => githubCtx.slots.register({
+            name: 'shell.overlay',
+            id: 'polish-github',
+            inject: () => ({ configForms, createWorkspace }),
+          }, GitHubPanel))
+          githubCtx.slots.inject('sidebar.footer.action', () => githubCtx.slots.register({
+            name: 'sidebar.footer.action',
+            id: 'polish-github-entry',
+            order: 4,
+            inject: () => ({ configForms }),
+          }, GithubEntry))
+        })
       },
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aryacode/dsh-aryacode-polish",
-  "version": "0.3.9",
+  "version": "0.5.0",
   "description": "AryaCode Polish: one install for the small things that make AryaCode feel finished. One Plugins row, one switch per quality-of-life feature.",
   "keywords": [
     "dsh",
@@ -51,7 +51,7 @@
   "scripts": {
     "build:client": "node scripts/build-client.mjs",
     "prepack": "node scripts/build-client.mjs",
-    "test": "node --test test/patch.spec.mjs test/config.spec.mjs test/registry.spec.mjs test/cost.spec.mjs test/money.spec.mjs test/account.spec.mjs test/docs.spec.mjs test/manifests.spec.mjs test/client-face.spec.mjs"
+    "test": "node --test test/patch.spec.mjs test/config.spec.mjs test/registry.spec.mjs test/cost.spec.mjs test/money.spec.mjs test/account.spec.mjs test/github.spec.mjs test/docs.spec.mjs test/manifests.spec.mjs test/client-face.spec.mjs"
   },
   "dependencies": {
     "zod": "^4.4.3"