device-center 0.2.0-beta.4 → 0.2.0-beta.6

package/server/index.mjs

@@ -1,6 +1,7 @@
 import { createServer as createHttpServer } from 'node:http';
+import { readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-import { extname, resolve } from 'node:path';
+import { extname, resolve, sep } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { openDatabase } from './database.mjs';
 import { currentPrincipal } from './adapters/identity/localDemo.mjs';
@@ -14,6 +15,14 @@ import { createRemoteAgent, createRemoteClient } from './drivers/remote.mjs';
 const PROJECT_ROOT = resolve(fileURLToPath(new URL('..', import.meta.url)));
 const MIME_TYPES = { '.html': 'text/html; charset=utf-8', '.js': 'text/javascript; charset=utf-8', '.css': 'text/css; charset=utf-8', '.svg': 'image/svg+xml', '.png': 'image/png' };
 const PUBLIC_GUIDES = Object.freeze({ '/install/agent.md': 'docs/agent-install.md', '/install/trial.md': 'docs/friend-trial.md', '/install/remote-access.md': 'docs/remote-access.md', '/install/device-profiles.md': 'docs/device-profiles.md', '/install/troubleshooting.md': 'docs/troubleshooting.md' });
+// Deployed archives carry release.json; npm and source installs report only the package version.
+function deployedVersion(releaseFile) {
+  const version = JSON.parse(readFileSync(resolve(PROJECT_ROOT, 'package.json'), 'utf8')).version;
+  let manifest = null;
+  try { manifest = JSON.parse(readFileSync(releaseFile, 'utf8')); } catch { /* not a deployed archive */ }
+  const matches = manifest?.kind === 'device-center-web' && manifest.version === version && /^[a-f0-9]{40}$/.test(manifest.sourceSha ?? '');
+  return { version, sourceSha: matches ? manifest.sourceSha : null };
+}
 function sendJson(response, status, payload, headers = {}) {
   response.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store', 'x-content-type-options': 'nosniff', ...headers });
   response.end(JSON.stringify(payload));
@@ -44,11 +53,11 @@ async function serveStatic(pathname, response) {
   if (pathname === '/' || pathname === '/index.html') filePath = resolve(PROJECT_ROOT, 'index.html');
   else if (pathname === '/favicon.svg') filePath = resolve(PROJECT_ROOT, 'favicon.svg');
   else if (pathname === '/login') filePath = resolve(PROJECT_ROOT, 'login.html');
-  else if (pathname === '/pair') filePath = resolve(PROJECT_ROOT, 'login.html');
+  else if (pathname === '/pair' || pathname === '/cli') filePath = resolve(PROJECT_ROOT, 'login.html');
   else if (pathname === '/start' || pathname === '/start.html') filePath = resolve(PROJECT_ROOT, 'start.html');
   else if (pathname.startsWith('/src/')) {
     filePath = resolve(PROJECT_ROOT, `.${pathname}`);
-    if (!filePath.startsWith(resolve(PROJECT_ROOT, 'src') + '/')) return sendJson(response, 404, { error: 'not_found' });
+    if (!filePath.startsWith(resolve(PROJECT_ROOT, 'src') + sep)) return sendJson(response, 404, { error: 'not_found' });
   } else return sendJson(response, 404, { error: 'not_found' });
   try {
     const body = await readFile(filePath);
@@ -61,10 +70,11 @@ async function serveStatic(pathname, response) {
   } catch { sendJson(response, 404, { error: 'not_found' }); }
 }
 
-export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite', web = true, runtime = 'native', sshHome, sshProbe, publicOrigin, authFile, authFetch, cloudLinkFile, driverFetch, driverBundlePath = resolve(PROJECT_ROOT, 'driver-source.tar.gz') } = {}) {
+export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite', web = true, runtime = 'native', sshHome, sshProbe, publicOrigin, authFile, authFetch, cloudLinkFile, driverFetch, driverBundlePath = resolve(PROJECT_ROOT, 'driver-source.tar.gz'), releaseFile = resolve(PROJECT_ROOT, 'release.json') } = {}) {
   const cloudAccess = createCloudAccess({ publicOrigin, authFile, fetchImpl: authFetch });
   if (runtime === 'cloud' && !cloudAccess) throw new Error('cloud_authentication_required');
   const cloud = Boolean(cloudAccess);
+  const health = Object.freeze({ ok: true, mode: cloud ? 'cloud' : 'local', runtime: cloud ? 'cloud' : runtime, ...deployedVersion(releaseFile) });
   const absoluteDbPath = resolve(dbPath);
   const db = openDatabase(absoluteDbPath);
   const startedAt = Date.now();
@@ -83,7 +93,10 @@ export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite
       const origin = cloudAccess ? cloudAccess.validate(request) : validateLocalRequest(request);
       const url = new URL(request.url ?? '/', origin);
       const path = url.pathname;
+      // Public liveness and deployed version only; no account, device or configuration data.
+      if (path === '/api/health' && request.method === 'GET') return sendJson(response, 200, health);
       if (['/pair', '/src/pair.js', '/src/pair.css', '/src/pairing-handoff.js', '/src/api.js'].includes(path) && request.method === 'GET') return await serveStatic(path, response);
+      if (['/cli', '/src/cli-approval.js', '/src/cli-handoff.js'].includes(path) && request.method === 'GET') return await serveStatic(path, response);
       // Public static installation reference only. No identity, configuration or owner API.
       if (['/start', '/start.html', '/favicon.svg', '/src/start.js', '/src/start.css', '/src/onboarding.js', '/src/i18n.js', '/src/i18n.css', '/src/messages.js', '/src/install-prompt.js', '/src/install-walkthrough.js'].includes(path) && request.method === 'GET') return await serveStatic(path, response);
       if (Object.hasOwn(PUBLIC_GUIDES, path) && request.method === 'GET') {
@@ -95,8 +108,9 @@ export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite
       if (cloud) {
         const machineActions = { '/api/driver/pair/start': 'start', '/api/driver/pair/poll': 'poll', '/api/driver/report': 'report', '/api/driver/disconnect': 'disconnect' };
         if (Object.hasOwn(machineActions, path) && request.method === 'POST') return sendJson(response, 200, registry[machineActions[path]](await readJson(request)));
-        if (['control','certificate','peers','relay/open','relay/accept','relay/exchange','relay/close'].some(action => path === `/api/driver/${action}`) && request.method === 'POST') return sendJson(response, 200, registry.machine(path.slice('/api/driver/'.length), await readJson(request)));
-        if (['/login', '/src/login.js', '/src/login.css'].includes(path) && request.method === 'GET') return await serveStatic(path, response);
+        if (['control','certificate','peers','relay/open','relay/accept','relay/exchange','relay/close',
+          'cli/start','cli/poll','cli/cancel','cli/status','cli/logout','cli/list','cli/show','cli/profile','cli/collect'].some(action => path === `/api/driver/${action}`) && request.method === 'POST') return sendJson(response, 200, registry.machine(path.slice('/api/driver/'.length), await readJson(request)));
+        if (['/login', '/src/login.js', '/src/login-flow.js', '/src/login.css'].includes(path) && request.method === 'GET') return await serveStatic(path, response);
         if (path === '/api/auth/options' && request.method === 'GET') return sendJson(response, 200, cloudAccess.options(request));
         if (path === '/api/auth/continue' && request.method === 'POST') {
           if (request.headers.origin !== origin) return sendJson(response, 403, { error: 'same_origin_required' });
@@ -116,13 +130,28 @@ export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite
           if (request.headers.origin !== origin) return sendJson(response, 403, { error: 'same_origin_required' });
           return sendJson(response, 200, { ok: true }, { 'set-cookie': cloudAccess.logout(request) });
         }
-        const principal = await cloudAccess.resolvePrincipal(request);
+        let principal;
+        try { principal = await cloudAccess.resolvePrincipal(request); }
+        catch (cause) {
+          // An identity-provider outage is recoverable in the login UI, not another trip to the account homepage.
+          if (path !== '/' || request.method !== 'GET' || cause.statusCode !== 503) throw cause;
+          const query = new URLSearchParams({ reason: 'unavailable' });
+          if (/^(zh-CN|zh-TW|en|ja|ko|es|fr|de|pt-BR)$/.test(url.searchParams.get('lang') ?? '')) query.set('lang', url.searchParams.get('lang'));
+          response.writeHead(303, { location: `/login?${query}`, 'cache-control': 'no-store' }); return response.end();
+        }
         if (!principal) {
           if (path === '/' && request.method === 'GET') { response.writeHead(303, { location: `/login${/^(zh-CN|zh-TW|en|ja|ko|es|fr|de|pt-BR)$/.test(url.searchParams.get('lang') ?? '') ? '?lang=' + url.searchParams.get('lang') : ''}`, 'cache-control': 'no-store' }); return response.end(); }
           return sendJson(response, 401, { error: 'authentication_required' });
         }
         accountRegistry = registry.forTenant(principal.tenantId);
+        if (path === '/api/auth/session' && request.method === 'GET') return sendJson(response, 200, { authenticated: true });
         if (path === '/api/drivers' && request.method === 'GET') return sendJson(response, 200, { drivers: accountRegistry.bindings() });
+        if (path === '/api/cli/grants' && request.method === 'GET') return sendJson(response, 200, accountRegistry.cli.grants());
+        const cliOwnerActions = { '/api/cli/lookup': 'lookup', '/api/cli/approve': 'approve', '/api/cli/deny': 'deny', '/api/cli/revoke': 'revoke' };
+        if (Object.hasOwn(cliOwnerActions, path) && request.method === 'POST') {
+          if (request.headers.origin !== origin) return sendJson(response, 403, { error: 'same_origin_required' });
+          return sendJson(response, 200, accountRegistry.cli[cliOwnerActions[path]](await readJson(request)));
+        }
         const ownerActions = { '/api/devices/profile': 'saveProfile', '/api/devices/collect': 'collect', '/api/drivers/pairing/lookup': 'lookup', '/api/drivers/pairing/approve': 'approve', '/api/drivers/revoke': 'revoke' };
         if (Object.hasOwn(ownerActions, path) && request.method === 'POST') {
           if (request.headers.origin !== origin) return sendJson(response, 403, { error: 'same_origin_required' });
@@ -193,7 +222,6 @@ export function createDeviceCenterServer({ dbPath = './data/device-center.sqlite
       }
       if (path === '/api/ssh/candidates') return sendJson(response, 200, inventory.discovery());
       if (path === '/api/ssh/initialization') return sendJson(response, 200, inventory.initialization());
-      if (path === '/api/health') return sendJson(response, 200, { ok: true, mode: cloud ? 'cloud' : 'local', runtime: cloud ? 'cloud' : runtime });
       if (path === '/api/connector/setup') return sendJson(response, 200, {
         ...(cloud ? { name: 'device-center-connector', dataMode: 'cloud', available: false, url: null, setupCommand: null, reason: 'cloud_driver_not_bound', tools: [] } : {
         name: 'device-center-connector', transport: 'Streamable HTTP', accessMode: 'read-only', dataMode: 'local-inventory',

package/server/unifiedAccess.mjs

@@ -4,6 +4,7 @@ const COOKIE = '__Host-device-center';
 const SIGNED_OUT = '__Host-device-center-signed-out';
 const SESSION_AGE = 8 * 60 * 60 * 1000;
 const PROFILE_AGE = 10_000;
+const PROFILE_TIMEOUT = 8_000;
 const digest = (value) => createHash('sha256').update(value).digest('hex');
 const failure = (message, statusCode) => Object.assign(new Error(message), { statusCode });
 const cookie = (name, value, age) => `${name}=${value}; Path=/; Secure; HttpOnly; SameSite=Strict; Max-Age=${age}`;
@@ -29,7 +30,7 @@ export function createUnifiedAccess({ config, publicOrigin, now = Date.now, fetc
   const ownerEmail = typeof config.ownerEmail === 'string' ? config.ownerEmail.toLowerCase() : undefined;
   const validId = id => typeof id === 'string' && id.length > 0 && id.length <= 256 && !/[\x00-\x1f\x7f]/.test(id);
   if (config.legacyOwnerId !== undefined && (accountMode !== 'multi-user' || !validId(config.legacyOwnerId))) throw new Error('unified_legacy_owner_invalid');
-  const sessions = new Map(), profiles = new Map(), attempts = new Map();
+  const sessions = new Map(), profiles = new Map(), attempts = new Map(), verifying = new Map();
   let active = 0;
   const tokenFrom = (request) => {
     const token = readCookie(request, 'sessionToken');
@@ -40,15 +41,34 @@ export function createUnifiedAccess({ config, publicOrigin, now = Date.now, fetc
     for (const [id, profile] of profiles) if (profile.expires <= now()) profiles.delete(id);
     for (const [id, times] of attempts) if (!times.some((time) => time > now() - 60_000)) attempts.delete(id);
   };
-  async function verifyProfile(token) {
+  async function requestProfile(token) {
+    for (let attempt = 0; attempt < 2; attempt++) {
+      try {
+        const response = await fetchImpl(new URL('/v1/me', backend), { headers: { authorization: `Bearer ${token}`, accept: 'application/json' }, redirect: 'error', signal: AbortSignal.timeout(PROFILE_TIMEOUT) });
+        if (attempt === 0 && [502, 503, 504].includes(response.status)) { await response.body?.cancel(); continue; }
+        return response;
+      } catch (cause) {
+        // Retry only transport failures, never an invalid identity, body or TLS redirect.
+        const transient = ['TimeoutError', 'AbortError'].includes(cause.name) || ['ETIMEDOUT', 'ECONNRESET', 'EHOSTUNREACH', 'ENETUNREACH', 'EAI_AGAIN', 'UND_ERR_CONNECT_TIMEOUT', 'UND_ERR_SOCKET'].includes(cause.code ?? cause.cause?.code);
+        if (attempt || !transient) throw cause;
+      }
+    }
+  }
+  function verifyProfile(token) {
     expire();
     const key = digest(token), cached = profiles.get(key);
-    if (cached) return cached.profile;
+    if (cached) return Promise.resolve(cached.profile);
+    if (verifying.has(key)) return verifying.get(key);
+    const pending = loadProfile(token, key).finally(() => verifying.delete(key));
+    verifying.set(key, pending);
+    return pending;
+  }
+  async function loadProfile(token, key) {
     if (active >= 8) throw failure('unified_service_busy', 503);
     active++;
     let phase = 'request', upstreamStatus;
     try {
-      const response = await fetchImpl(new URL('/v1/me', backend), { headers: { authorization: `Bearer ${token}`, accept: 'application/json' }, redirect: 'error', signal: AbortSignal.timeout(5000) });
+      const response = await requestProfile(token);
       phase = 'response'; upstreamStatus = response.status;
       if ([401, 403].includes(response.status)) throw failure('unified_sign_in_required', 401);
       if (!response.ok || !/^application\/json(?:;|$)/i.test(response.headers.get('content-type') ?? '')) throw failure('unified_service_unavailable', 503);

package/src/api.js

@@ -1,9 +1,11 @@
 import { getLocale } from './i18n.js';
+import { clearLoginNavigation } from './login-flow.js';
 async function request(path, { timeoutMs = 12000, ...options } = {}) {
   const response = await fetch(path, { ...options, cache: 'no-store', signal: AbortSignal.timeout(timeoutMs) });
   const payload = await response.json().catch(() => ({}));
   if (response.status === 401) { location.replace('/login?lang=' + getLocale()); throw new Error('authentication_required'); }
   if (!response.ok) throw new Error(payload.error ?? `http_${response.status}`);
+  clearLoginNavigation();
   return payload;
 }
 export const api = {

package/src/cli-approval.js

@@ -0,0 +1,49 @@
+import { captureCli, clearCli } from './cli-handoff.js';
+import { initLanguage, getLocale, h } from './i18n.js';
+const escape = value => String(value).replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c]);
+let handoff = captureCli(), request, phase = handoff ? 'loading' : 'missing', timer;
+document.querySelector('link[href="/src/login.css"]').href = '/src/pair.css';
+document.body.innerHTML = `<header><a class="brand" href="/start" data-language-link><img src="/favicon.svg" alt="" width="26" height="26">Device Center</a><div class="language-picker" data-language-picker></div></header><main id="cli-root" aria-live="polite"></main><footer data-i18n="cli.boundary"></footer>`;
+document.querySelector('title').dataset.i18n = 'cli.title';
+const root = document.querySelector('#cli-root');
+async function api(path, input) {
+  const response = await fetch(path, { method: input === undefined ? 'GET' : 'POST', headers: input === undefined ? {} : { 'content-type': 'application/json' },
+    ...(input === undefined ? {} : { body: JSON.stringify(input) }), cache: 'no-store', redirect: 'error', signal: AbortSignal.timeout(12_000) });
+  if (response.status === 401) { location.replace(`/login?lang=${getLocale()}&continue=cli`); throw new Error('authentication_required'); }
+  if (!response.ok) throw new Error('request_failed');
+  return response.json();
+}
+function render() {
+  root.setAttribute('aria-busy', String(phase === 'loading' || phase === 'saving'));
+  let body = '';
+  if (phase === 'ready') body = `<p>${h('cli.intro')}</p><div class="device"><strong>${escape(request.name)}</strong><p>${escape(request.platform)} · ${h('cli.duration', { minutes: request.minutes })}</p></div><p>${h('pair.fingerprint')}</p><code class="fingerprint">${escape(request.fingerprint)}</code><ul><li>${h('cli.read')}</li><li>${h('cli.profile')}</li><li>${h('cli.collect')}</li></ul><p>${h('cli.boundary')}</p><button id="approve">${h('cli.approve')}</button><button id="deny" class="secondary">${h('pair.cancel')}</button>`;
+  else if (phase === 'done') body = `<div class="status-mark" aria-hidden="true">✓</div><p>${h('cli.done')}</p><p>${h('pair.noReply')}</p><a class="primary" href="/cli?lang=${getLocale()}">${h('cli.manage')}</a>`;
+  else if (phase === 'manage') body = `<p>${h('cli.manageBody')}</p>${request.grants.map(grant => `<div class="device"><strong>${escape(grant.name)}</strong><p>${escape(new Date(grant.expiresAt).toLocaleString(getLocale()))} · ${h(grant.authorized ? 'cli.active' : 'cli.inactive')}</p><code class="fingerprint">${escape(grant.fingerprint)}</code>${grant.authorized ? `<button data-revoke="${escape(grant.driverId)}" class="secondary">${h('cli.revoke')}</button>` : ''}</div>`).join('') || `<p>${h('cli.empty')}</p>`}`;
+  else body = `<p>${h(['loading', 'saving'].includes(phase) ? 'pair.wait' : phase === 'cancelled' ? 'pair.cancelledBody' : 'cli.missing')}</p>`;
+  root.innerHTML = `<p class="eyebrow">DEVICE CENTER / CLI</p><h1>${h(phase === 'manage' ? 'cli.manage' : 'cli.title')}</h1>${body}<p><a href="/?lang=${getLocale()}">${h('pair.dashboard')}</a></p>`;
+}
+root.addEventListener('click', async event => {
+  const action = event.target.id, revoke = event.target.dataset.revoke;
+  if (revoke && phase === 'manage') {
+    phase = 'saving'; render();
+    try { await api('/api/cli/revoke', { driverId: revoke }); request = await api('/api/cli/grants'); phase = 'manage'; }
+    catch (error) { if (error.message === 'authentication_required') return; phase = 'missing'; }
+    render(); return;
+  }
+  if (!['approve', 'deny'].includes(action) || phase !== 'ready' || !handoff) return;
+  phase = 'saving'; render();
+  try {
+    await api(action === 'approve' ? '/api/cli/approve' : '/api/cli/deny', { ticket: handoff.ticket, ...(action === 'approve' ? { fingerprint: request.fingerprint } : {}) });
+    phase = action === 'approve' ? 'done' : 'cancelled';
+  } catch (error) { if (error.message === 'authentication_required') return; phase = 'missing'; }
+  clearTimeout(timer); clearCli(); handoff = null; render();
+});
+initLanguage({ onChange: render }); render();
+try {
+  if (handoff) {
+    request = await api('/api/cli/lookup', { ticket: handoff.ticket }); phase = 'ready';
+    timer = setTimeout(() => { if (phase === 'ready') { clearCli(); handoff = null; phase = 'missing'; render(); } }, Math.max(0, request.expiresAt - Date.now()));
+  } else { request = await api('/api/cli/grants'); phase = 'manage'; }
+  render();
+} catch (error) { if (error.message !== 'authentication_required') { clearCli(); handoff = null; phase = 'missing'; render(); } }
+window.addEventListener('pagehide', () => clearTimeout(timer));

package/src/cli-handoff.js

@@ -0,0 +1,19 @@
+const KEY = 'device-center-cli-v1';
+const safeStorage = () => { try { return window.sessionStorage; } catch { return null; } };
+const valid = (value, now) => value && /^[a-f0-9]{64}$/.test(value.ticket ?? '') && Number.isSafeInteger(value.expiresAt) && value.expiresAt > now && value.expiresAt <= now + 330_000;
+export function pendingCli({ storage = safeStorage(), now = Date.now() } = {}) {
+  try { const value = JSON.parse(storage.getItem(KEY)); if (valid(value, now)) return value; storage.removeItem(KEY); } catch { /* no credentials in errors */ }
+  return null;
+}
+export function clearCli({ storage = safeStorage() } = {}) { try { storage.removeItem(KEY); } catch { /* memory remains with caller */ } }
+export function captureCli({ location = window.location, history = window.history, storage = safeStorage(), now = Date.now() } = {}) {
+  if (!location.hash) return pendingCli({ storage, now });
+  const fragment = new URLSearchParams(location.hash.slice(1));
+  history.replaceState(null, '', location.pathname + location.search); clearCli({ storage });
+  if ([...fragment.keys()].sort().join(',') !== 'expires,ticket') return null;
+  const value = { ticket: fragment.get('ticket'), expiresAt: Number(fragment.get('expires')) };
+  if (!valid(value, now)) return null;
+  try { storage.removeItem('device-center-pairing-v1'); } catch { /* handoffs stay in memory */ }
+  try { storage.setItem(KEY, JSON.stringify(value)); } catch { /* signed-in use remains in memory */ }
+  return value;
+}

package/src/install-prompt.js

@@ -7,10 +7,10 @@ export function localizedInstallPrompt(plan, locale) {
     tr('prompt.intro'),
     tr('prompt.choice', { mode: tr(plan.mode === 'local' ? 'guide.local' : plan.mode === 'official' ? 'guide.hosted' : 'guide.custom'), version: plan.version, run: tr(plan.background ? 'prompt.background' : 'prompt.foreground') }),
     plan.controlOrigin ? tr('prompt.private', { origin: plan.controlOrigin }) : '',
-    `1. ${tr('prompt.environment')}`,
+    `1. ${tr(plan.os === 'windows' ? 'prompt.windowsEnvironment' : 'prompt.environment')}`,
     `2. ${tr('prompt.existing', { url: plan.url, status: c.bindingStatus, service: c.serviceStatus })}`,
     `3. ${tr('prompt.userInstall')}\n   ${c.install}\n   ${c.version}\n   ${tr('prompt.config')}`,
-    `4. ${plan.background ? `${tr('prompt.bg')}\n   ${c.servicePlan}\n   ${c.serviceInstall}\n   ${c.serviceStatus}` : `${tr('prompt.fg')}${plan.controlOrigin ? '' : `\n   ${c.foreground}`}`}`,
+    `4. ${plan.background ? `${tr(plan.os === 'windows' ? 'prompt.windowsBackground' : 'prompt.bg')}\n   ${c.servicePlan}\n   ${c.serviceInstall}\n   ${c.serviceStatus}` : `${tr('prompt.fg')}${plan.controlOrigin ? '' : `\n   ${c.foreground}`}`}`,
     `5. ${plan.controlOrigin ? `${tr('prompt.pairBefore')}\n   ${c.pairingPlan}\n   ${c.connect}\n   ${tr('prompt.pairAfter', { origin: plan.controlOrigin })}` : tr('prompt.local')}`,
     `6. ${tr('prompt.mcp', { url: plan.url, mcp: plan.mcpUrl })}`,
     `7. ${tr('prompt.verify')}\n   ${tr('prompt.uninstall')}\n   ${c.uninstallService}`,

package/src/install-walkthrough.js

@@ -1,11 +1,11 @@
 import { translate } from './i18n.js';
 
 // Instruction illustrations only. Navigation never installs software or confirms a binding.
-export function installationSteps({ method = 'agent', mode = 'local', pairingMethod = 'browser' } = {}) {
-  if (!['agent', 'manual'].includes(method) || !['local', 'official', 'self-hosted'].includes(mode) || !['browser', 'headless'].includes(pairingMethod)) throw new Error('invalid_installation_walkthrough');
+export function installationSteps({ method = 'agent', mode = 'local', pairingMethod = 'browser', os = 'posix' } = {}) {
+  if (!['agent', 'manual'].includes(method) || !['local', 'official', 'self-hosted'].includes(mode) || !['posix', 'windows'].includes(os) || !['browser', 'headless'].includes(pairingMethod)) throw new Error('invalid_installation_walkthrough');
   const manual = method === 'manual', cloud = mode !== 'local', headless = manual && pairingMethod === 'headless';
   return [
-    { tab: 'walk.pasteTab', title: manual ? 'walk.terminalTitle' : 'walk.agentTitle', body: manual ? 'walk.terminalBody' : 'walk.agentBody', picture: manual ? 'terminal' : 'chat' },
+    { tab: 'walk.pasteTab', title: manual ? os === 'windows' ? 'walk.windowsTitle' : 'walk.terminalTitle' : 'walk.agentTitle', body: manual ? os === 'windows' ? 'walk.windowsBody' : 'walk.terminalBody' : 'walk.agentBody', picture: manual ? 'terminal' : 'chat' },
     { tab: cloud ? 'walk.bindTab' : 'walk.installTab', title: cloud ? headless ? 'walk.headlessTitle' : 'walk.browserTitle' : 'walk.installTitle', body: cloud ? headless ? 'walk.headlessBody' : 'walk.browserBody' : manual ? 'walk.installBody' : 'walk.agentInstallBody', picture: cloud ? headless ? 'headless' : 'pair' : 'install' },
     { tab: 'walk.checkTab', title: 'walk.checkTitle', body: cloud ? 'walk.cloudCheckBody' : 'walk.localCheckBody', picture: 'dashboard' },
   ];
@@ -16,8 +16,8 @@ const arrows = '<svg viewBox="0 0 32 20" aria-hidden="true"><path d="M2 10h26M20
 const clipboard = '<svg viewBox="0 0 24 24" aria-hidden="true"><path d="M8 5H5v16h14V5h-3M8 3h8v5H8zM8 12h8m-8 4h5"/></svg>';
 const pointer = '<svg class="picture-pointer" viewBox="0 0 30 36" aria-hidden="true"><path d="m4 3 21 18-10 1-5 10z"/></svg>';
 
-export function installWalkthroughMarkup({ method = 'agent', mode = 'local', pairingMethod = 'browser', step = 0, copied = false, controlOrigin = '', localUrl = 'http://127.0.0.1:5174', locale = 'zh-CN' } = {}) {
-  const steps = installationSteps({ method, mode, pairingMethod });
+export function installWalkthroughMarkup({ method = 'agent', mode = 'local', pairingMethod = 'browser', os = 'posix', step = 0, copied = false, controlOrigin = '', localUrl = 'http://127.0.0.1:5174', locale = 'zh-CN' } = {}) {
+  const steps = installationSteps({ method, mode, pairingMethod, os });
   if (!Number.isInteger(step) || step < 0 || step >= steps.length) throw new Error('invalid_installation_step');
   const tr = (key, values) => escape(translate(locale, key, values));
   const active = steps[step], cloud = mode !== 'local';
@@ -28,7 +28,7 @@ export function installWalkthroughMarkup({ method = 'agent', mode = 'local', pai
   const browserTitle = `<span class="picture-address">${escape(controlOrigin || 'https://devices.example.com')}</span>`;
   let picture;
   if (active.picture === 'terminal') {
-    picture = `${paste('terminal')}${window(tr('walk.targetTerminal'), `<div class="picture-terminal"><div class="picture-paste-line"><span>$</span><div>${tr('walk.pasteScript')}<i class="picture-caret"></i></div>${pointer}</div><div class="picture-keyline"><span>macOS <kbd>⌘ V</kbd> · Linux <kbd>Ctrl Shift V</kbd></span><strong>${tr('walk.pressEnter')} <kbd>Enter ↵</kbd></strong></div></div>`, 'terminal-picture')}<div class="picture-launch"><span>${tr('walk.openMac')}</span><span>${tr('walk.openLinux')}</span></div>`;
+    picture = `${paste('terminal')}${window(os === 'windows' ? 'Windows PowerShell' : tr('walk.targetTerminal'), `<div class="picture-terminal"><div class="picture-paste-line"><span>${os === 'windows' ? 'PS&gt;' : '$'}</span><div>${tr('walk.pasteScript')}<i class="picture-caret"></i></div>${pointer}</div><div class="picture-keyline"><span>${os === 'windows' ? 'Windows <kbd>Ctrl V</kbd>' : 'macOS <kbd>⌘ V</kbd> · Linux <kbd>Ctrl Shift V</kbd>'}</span><strong>${tr('walk.pressEnter')} <kbd>Enter ↵</kbd></strong></div></div>`, 'terminal-picture')}<div class="picture-launch">${os === 'windows' ? `<span>${tr('walk.openWindows')}</span>` : `<span>${tr('walk.openMac')}</span><span>${tr('walk.openLinux')}</span>`}</div>`;
   } else if (active.picture === 'chat') {
     picture = `${paste('chat')}${window(tr('walk.targetChat'), `<div class="picture-chat"><div class="picture-chat-message">${tr('walk.pastePrompt')}<i class="picture-caret"></i></div><div class="picture-send"><span>${tr('walk.send')}</span><b>↑</b>${pointer}</div></div>`, 'chat-picture')}`;
   } else if (active.picture === 'pair' || active.picture === 'headless') {

package/src/login-flow.js

@@ -0,0 +1,37 @@
+// A successful POST alone does not prove that the browser saved the panel cookie.
+// This read-only probe keeps a missing session from becoming a navigation loop.
+const NAVIGATION_KEY = 'device-center-login-navigation';
+const storage = () => { try { return window.sessionStorage; } catch { return null; } };
+export function clearLoginNavigation({ store = storage() } = {}) { try { store.removeItem(NAVIGATION_KEY); } catch { /* Optional storage. */ } }
+export function rememberLoginNavigation({ store = storage(), now = Date.now() } = {}) { try { store.setItem(NAVIGATION_KEY, String(now)); } catch { /* The session probe still applies. */ } }
+export function pendingLoginNavigation({ store = storage(), now = Date.now() } = {}) {
+  try {
+    const raw = store.getItem(NAVIGATION_KEY), at = Number(raw);
+    if (raw && Number.isSafeInteger(at) && at <= now && now - at < 60_000) return true;
+  } catch { /* Only a timestamp is stored, never an identity, token or destination. */ }
+  clearLoginNavigation({ store }); return false;
+}
+
+async function checkedFetch(fetchImpl, path, signal, method = 'GET') {
+  const response = await fetchImpl(path, { method, credentials: 'same-origin', cache: 'no-store', redirect: 'error', signal,
+    ...(method === 'POST' ? { headers: { 'content-type': 'application/json' }, body: '{}' } : {}) });
+  if (![200, 401].includes(response.status)) throw new Error(response.status === 403 ? 'login.owner' : response.status === 429 ? 'login.rate' : 'login.unavailable');
+  return response;
+}
+
+export async function continueSession({ fetchImpl = fetch, signal = AbortSignal.timeout(20_000) } = {}) {
+  try {
+    const existing = await checkedFetch(fetchImpl, '/api/auth/session', signal);
+    if (existing.status === 200 && (await existing.json()).authenticated === true) return;
+    if (existing.status !== 401) throw new Error('login.unavailable');
+    const resumed = await checkedFetch(fetchImpl, '/api/auth/continue', signal, 'POST');
+    if (resumed.status === 401) throw new Error('login.first');
+    if ((await resumed.json()).ok !== true) throw new Error('login.unavailable');
+    const session = await checkedFetch(fetchImpl, '/api/auth/session', signal);
+    if (session.status === 401) throw new Error('login.session');
+    if ((await session.json()).authenticated !== true) throw new Error('login.unavailable');
+  } catch (cause) {
+    if (cause.message?.startsWith('login.')) throw cause;
+    throw new Error(cause.name === 'TimeoutError' ? 'login.timeout' : 'login.unavailable');
+  }
+}

package/src/login.css

@@ -11,7 +11,9 @@ input:focus { outline: 2px solid #769e5e; outline-offset: 2px; }
 button { width: 100%; height: 42px; border: 0; border-radius: 8px; color: white; background: #3c622a; font: inherit; cursor: pointer; }
 button:disabled { opacity: .6; }
 #message, #unified-message { min-height: 20px; color: #a53939; }
-.login-link { display: grid; place-items: center; min-height: 44px; margin-top: 24px; border-radius: 8px; color: white; background: #3c622a; text-decoration: none; font-size: 14px; }
+.login-link { display: grid; place-items: center; min-height: 44px; margin-top: 16px; border: 1px solid #cfd7cb; border-radius: 8px; color: #3c622a; text-decoration: none; font-size: 14px; }
+.login-link:focus-visible { outline: 2px solid #769e5e; outline-offset: 2px; }
+#unified[aria-busy="true"] #unified-message { color: #667363; }
 .help { line-height: 1.7; margin: 20px 0; }
 small { color: #788473; }
 

package/src/login.js

@@ -1,7 +1,10 @@
 import { initLanguage, getLocale, t } from './i18n.js';
 import { loginDestination } from './pairing-handoff.js';
+import { continueSession, rememberLoginNavigation, pendingLoginNavigation } from './login-flow.js';
 if (location.pathname === '/pair') {
   await import('./pair.js');
+} else if (location.pathname === '/cli') {
+  await import('./cli-approval.js');
 } else {
 initLanguage();
 function setMessage(element, key) { if (key) element.dataset.i18n = key; else delete element.dataset.i18n; element.textContent = key ? t(key) : ''; }
@@ -13,16 +16,16 @@ async function continueUnified(manual = false) {
   checking = true;
   const message = document.querySelector('#unified-message'), button = document.querySelector('#continue-login');
   button.disabled = true;
+  document.querySelector('#unified').setAttribute('aria-busy', 'true');
+  setMessage(message, 'login.checking');
   try {
-    const response = await fetch('/api/auth/continue', { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}', signal: AbortSignal.timeout(10_000) });
-    if (response.ok) { clearInterval(timer); location.replace(loginDestination(getLocale())); return; }
-    if (response.status === 401) setMessage(message, manual ? 'login.first' : null);
-    else {
-      clearInterval(timer);
-      setMessage(message, response.status === 403 ? 'login.owner' : response.status === 429 ? 'login.rate' : 'login.unavailable');
-    }
-  } catch { setMessage(message, 'login.timeout'); clearInterval(timer); }
-  finally { checking = false; button.disabled = false; }
+    await continueSession();
+    clearInterval(timer); rememberLoginNavigation(); location.replace(loginDestination(getLocale()));
+  } catch (cause) {
+    setMessage(message, cause.message === 'login.first' && !manual ? null : cause.message);
+    if (cause.message !== 'login.first') { clearInterval(timer); watchingUntil = 0; }
+  }
+  finally { checking = false; button.disabled = false; document.querySelector('#unified').setAttribute('aria-busy', 'false'); }
 }
 document.querySelector('#continue-login').addEventListener('click', () => continueUnified(true));
 document.querySelector('#unified-login').addEventListener('click', () => {
@@ -44,7 +47,9 @@ try {
     if (target.protocol !== 'https:' || target.username || target.password) throw new Error();
     document.querySelector('#unified-login').href = target.href;
     document.querySelector('#unified').hidden = false;
-    if (options.automaticContinue) void continueUnified();
+    if (new URLSearchParams(location.search).get('reason') === 'unavailable') setMessage(document.querySelector('#unified-message'), 'login.unavailable');
+    else if (pendingLoginNavigation()) setMessage(document.querySelector('#unified-message'), 'login.returned');
+    else if (options.automaticContinue) void continueUnified();
   } else if (options.provider === 'password') { form.hidden = false; form.elements.username.focus(); }
   else throw new Error();
 } catch { loading.hidden = false; setMessage(loading, 'login.optionsError'); }

package/src/main.js

@@ -12,7 +12,7 @@ Object.assign(state, { pairCode: '', pairing: null, pairBusy: false, pairError:
 Object.assign(state, { cloudChoice: 'official', customOrigin: '', logManager: '', logTarget: '', logPath: '', logLabel: 'app', remotePeers: [], remoteLoading: false, remoteError: null });
 let cloudRefreshTimer, cloudRefreshBusy = false, cloudRefreshFailures = 0;
 Object.assign(state, { profileDevice: null, profileDraft: null, profileError: null, profileSaving: false, collectingDevice: null, pendingCollections: {} });
-Object.assign(state, { installMode: 'local', installOrigin: '', installBackground: true });
+Object.assign(state, { installMode: 'local', installOs: 'posix', installOrigin: '', installBackground: true });
 const RELAY_PROVIDERS = [
   { id: 'self-hosted', get name() { return t("panel.1"); }, get description() { return t("panel.2"); } },
   { id: 'managed', get name() { return t("panel.3"); }, get description() { return t("panel.4"); } },
@@ -217,7 +217,7 @@ function recentMcpInitialize() {
 }
 function renderSidebar() {
   const projects = state.overview?.projects ?? [];
-  if (cloudMode()) return `<aside class="sidebar"><a class="brand" href="/?lang=${getLocale()}" aria-label="${h("panel.183")}"><span class="brand-mark">${icon('cloud')}</span><span><strong>Device Center</strong><small>${h("panel.184")}</small></span></a><div class="nav-caption">${h("panel.185")}</div><nav aria-label="${h("panel.186")}"><button class="nav-item active" data-action="project" data-project="all">${icon('device')}<span>${h("panel.187")}</span><small>${state.overview?.devices.length ?? 0}</small></button><button class="nav-item" data-action="secure-help">${icon('link')}<span>${h("panel.188")}</span></button></nav><div class="nav-caption">${h("panel.189")}</div><nav class="project-navigation" aria-label="${h("panel.190")}"><p class="nav-empty">${h("panel.191")}</p></nav><div class="sidebar-footer"><span class="local-dot"></span> ${h("panel.192")}<button class="text-button" data-action="logout">${h("panel.193")}</button></div></aside>`;
+  if (cloudMode()) return `<aside class="sidebar"><a class="brand" href="/?lang=${getLocale()}" aria-label="${h("panel.183")}"><span class="brand-mark">${icon('cloud')}</span><span><strong>Device Center</strong><small>${h("panel.184")}</small></span></a><div class="nav-caption">${h("panel.185")}</div><nav aria-label="${h("panel.186")}"><button class="nav-item active" data-action="project" data-project="all">${icon('device')}<span>${h("panel.187")}</span><small>${state.overview?.devices.length ?? 0}</small></button><button class="nav-item" data-action="secure-help">${icon('link')}<span>${h("panel.188")}</span></button><a class="nav-item" href="/cli?lang=${getLocale()}">${icon('link')}<span>${h("cli.manage")}</span></a></nav><div class="nav-caption">${h("panel.189")}</div><nav class="project-navigation" aria-label="${h("panel.190")}"><p class="nav-empty">${h("panel.191")}</p></nav><div class="sidebar-footer"><span class="local-dot"></span> ${h("panel.192")}<button class="text-button" data-action="logout">${h("panel.193")}</button></div></aside>`;
   return `<aside class="sidebar"><a class="brand" href="/?lang=${getLocale()}" aria-label="${h("panel.183")}"><span class="brand-mark">${icon('cloud')}</span><span><strong>Device Center</strong><small>${h("panel.194")}</small></span></a><div class="nav-caption">${h("panel.185")}</div><nav aria-label="${h("panel.186")}"><button class="nav-item ${state.project === 'all' ? 'active' : ''}" data-action="project" data-project="all">${icon('device')}<span>${h("panel.187")}</span><small>${state.overview?.devices.length ?? 0}</small></button><button class="nav-item" data-action="connect">${icon('link')}<span>${h("panel.195")}</span></button><button class="nav-item" data-action="secure-help">${icon('link')}<span>${h("panel.188")}</span></button><button class="nav-item" data-action="cloud-connect">${icon('cloud')}<span>${h("panel.196")}</span></button></nav><div class="nav-caption">${h("panel.189")}</div><nav class="project-navigation" aria-label="${h("panel.190")}">${projects.length ? projects.map((p) => `<button class="nav-item ${state.project === p.id ? 'active' : ''}" data-action="project" data-project="${escapeHtml(p.id)}">${icon('folder')}<span>${escapeHtml(p.name)}</span></button>`).join('') : `<p class="nav-empty">${h("panel.191")}</p>`}</nav><div class="sidebar-footer"><span class="local-dot"></span> ${h("panel.197")}<button class="text-button" data-action="resident">${h("panel.198")}</button></div></aside>`;
 }
 function renderConnection() {
@@ -234,17 +234,17 @@ function openAgentInstall() {
   state.toast = null; state.dialog = 'agent-install';
 }
 function installDraft() {
-  try { return { text: agentInstallPrompt({ locale: getLocale(), mode: state.installMode, background: state.installBackground, ...(state.installMode === 'self-hosted' ? { origin: state.installOrigin.trim() } : {}) }), error: null }; }
+  try { return { text: agentInstallPrompt({ locale: getLocale(), mode: state.installMode, os: state.installOs, background: state.installBackground, ...(state.installMode === 'self-hosted' ? { origin: state.installOrigin.trim() } : {}) }), error: null }; }
   catch (error) { return { text: '', error: t(error.translationKey ?? 'error.install') }; }
 }
 function manualInstallHref(draft) {
-  const manualParams = new URLSearchParams({ lang: getLocale(), method: 'manual', mode: state.installMode });
+  const manualParams = new URLSearchParams({ lang: getLocale(), method: 'manual', mode: state.installMode, os: state.installOs });
   if (state.installMode === 'self-hosted' && !draft.error) manualParams.set('origin', state.installOrigin.trim());
   return `/start?${manualParams}#install-title`;
 }
 function agentInstallBody() {
   const draft = installDraft();
-  return `<p class="modal-intro">${h("panel.219")}</p><p class="small-note"><a data-manual-install href="${escapeHtml(manualInstallHref(draft))}">${h('guide.manual.openGuide')}</a></p><div class="method-tabs install-mode-tabs" role="group" aria-label="${h("panel.220")}">${[['local', t("panel.210")], ['official', t("panel.211")], ['self-hosted', t("panel.212")]].map(([mode, label]) => `<button data-action="install-mode" data-mode="${mode}" aria-pressed="${state.installMode === mode}" class="${state.installMode === mode ? 'active' : ''}">${label}</button>`).join('')}</div><p class="small-note">${state.installMode === 'local' ? t("panel.213") : state.installMode === 'official' ? t("panel.214") : t("panel.215")}</p>${state.installMode === 'self-hosted' ? `<label class="field-label" for="install-origin">${h("panel.216")}</label><input id="install-origin" data-field="installOrigin" type="url" value="${escapeHtml(state.installOrigin)}" placeholder="https://devices.example.com" autocomplete="off" spellcheck="false">` : ''}<label class="binding-scope"><input type="checkbox" data-field="installBackground" ${state.installBackground ? 'checked' : ''}>${h("panel.221")}</label><ol class="install-flow"><li>${h("panel.222")}</li><li>${state.installMode === 'local' ? t("panel.217") : t("panel.218")}</li><li>${h("panel.223")}</li></ol><p id="install-error" class="form-error" role="alert" ${draft.error ? '' : 'hidden'}>${escapeHtml(draft.error ?? '')}</p><button class="button button-primary install-copy" data-action="agent-install-copy" ${draft.error ? 'disabled' : ''}>${icon('copy', 15)} ${h("panel.224")}</button><details class="install-details"><summary>${h("panel.225")}</summary><textarea id="agent-install-text" aria-label="${h("panel.226")}" readonly rows="7" spellcheck="false">${escapeHtml(draft.text)}</textarea></details><p class="small-note">${h("panel.227")}</p>`;
+  return `<p class="modal-intro">${h("panel.219")}</p><label class="field-label" for="install-os">${h("guide.os.title")}</label><select id="install-os" data-field="installOs"><option value="posix" ${state.installOs === "posix" ? "selected" : ""}>macOS / Linux</option><option value="windows" ${state.installOs === "windows" ? "selected" : ""}>Windows 11</option></select><p class="small-note">${h("guide.windowsCandidate")}</p><p class="small-note"><a data-manual-install href="${escapeHtml(manualInstallHref(draft))}">${h('guide.manual.openGuide')}</a></p><div class="method-tabs install-mode-tabs" role="group" aria-label="${h("panel.220")}">${[['local', t("panel.210")], ['official', t("panel.211")], ['self-hosted', t("panel.212")]].map(([mode, label]) => `<button data-action="install-mode" data-mode="${mode}" aria-pressed="${state.installMode === mode}" class="${state.installMode === mode ? 'active' : ''}">${label}</button>`).join('')}</div><p class="small-note">${state.installMode === 'local' ? t("panel.213") : state.installMode === 'official' ? t("panel.214") : t("panel.215")}</p>${state.installMode === 'self-hosted' ? `<label class="field-label" for="install-origin">${h("panel.216")}</label><input id="install-origin" data-field="installOrigin" type="url" value="${escapeHtml(state.installOrigin)}" placeholder="https://devices.example.com" autocomplete="off" spellcheck="false">` : ''}<label class="binding-scope"><input type="checkbox" data-field="installBackground" ${state.installBackground ? 'checked' : ''}>${h("panel.221")}</label><ol class="install-flow"><li>${h("panel.222")}</li><li>${state.installMode === 'local' ? t("panel.217") : t("panel.218")}</li><li>${h("panel.223")}</li></ol><p id="install-error" class="form-error" role="alert" ${draft.error ? '' : 'hidden'}>${escapeHtml(draft.error ?? '')}</p><button class="button button-primary install-copy" data-action="agent-install-copy" ${draft.error ? 'disabled' : ''}>${icon('copy', 15)} ${h("panel.224")}</button><details class="install-details"><summary>${h("panel.225")}</summary><textarea id="agent-install-text" aria-label="${h("panel.226")}" readonly rows="7" spellcheck="false">${escapeHtml(draft.text)}</textarea></details><p class="small-note">${h("panel.227")}</p>`;
 }
 async function copyAgentInstall() {
   const field = root.querySelector('#agent-install-text');
@@ -311,7 +311,7 @@ function cloudConnectBody() {
 function logCommandDraft() {
   const peers = cloudMode() ? state.overview?.drivers?.filter(p=>p.revokedAt == null) ?? [] : state.remotePeers;
   const manager = peers.find(p=>p.id === state.logManager), target = peers.find(p=>p.id === state.logTarget);
-  try { return { ...logAccessCommands({manager:manager?.fingerprint,target:target?.fingerprint,path:state.logPath,label:state.logLabel}), error:null }; }
+  try { return { ...logAccessCommands({manager:manager?.fingerprint,target:target?.fingerprint,path:state.logPath,label:state.logLabel,os:/Windows/i.test(target?.platform ?? '')?'windows':'posix',managerOs:/Windows/i.test(manager?.platform ?? '')?'windows':'posix'}), error:null }; }
   catch(error) { return {trust:'',grant:'',error:t(error.translationKey ?? 'error.devices')}; }
 }
 function logCommandFields() {
@@ -584,6 +584,7 @@ root.addEventListener('click', async (event) => {
   render();
 });
 root.addEventListener('change', (event) => {
+  if (event.target.dataset.field === 'installOs') { state.installOs = event.target.value; state.toast = null; render(); return; }
   if (event.target.dataset.field === 'installBackground') { state.installBackground = event.target.checked; render(); return; }
   if (event.target.dataset.profileField && state.profileDraft) { state.profileDraft[event.target.dataset.profileField] = event.target.value; return; }
   if (['requestSsh', 'pairShare'].includes(event.target.dataset.field)) { state[event.target.dataset.field] = event.target.checked; render(); return; }