livedesk 0.1.447 → 0.1.449

package/client/bin/livedesk-client.js

@@ -67,6 +67,11 @@ const FAST_PREFLIGHT_CACHE_PATH = join(UNIFIED_CLIENT_STATE_DIR, 'fast-preflight
 const CLIENT_SLOT_PATH = join(UNIFIED_CLIENT_STATE_DIR, 'device-slot.json');
 const CLIENT_UPDATE_STATE_PATH = process.env.LIVEDESK_CLIENT_UPDATE_STATE_PATH
     || join(UNIFIED_CLIENT_STATE_DIR, 'client-update.json');
+// Migration-only compatibility: releases before 0.1.204 could persist these
+// Client-side model options in startup/update commands. Consume them without
+// forwarding so an upgrade starts normally, but never restores that feature.
+const RETIRED_CLIENT_MODEL_SINGLE_OPTIONS = new Set(['--ai', '--no-ai', '--fake-ai']);
+const RETIRED_CLIENT_MODEL_VALUE_OPTION = '--ai-model';
 let activeAgentProcess = null;
 let roleRestartRequest = null;
 let agentRestartRequest = null;
@@ -301,8 +306,8 @@ Options:
   --version                       Show the agent version.
   --help                          Show this help.
 
-Auto uses C# RemoteFast when supported and falls back to Node for AI assist or
-when a packaged RemoteFast runtime is unavailable.
+Auto uses C# RemoteFast when supported and falls back to Node only when a
+packaged RemoteFast runtime is unavailable.
 Enable Windows auto-start from the connection page when this client signs in.
 `.trimStart());
 }
@@ -394,15 +399,30 @@ export function parseLauncherArgs(argv) {
     let slot = process.env.LIVEDESK_CLIENT_SLOT || process.env.MINDEXEC_REMOTE_SLOT || '';
     let authPort = normalizePort(process.env.LIVEDESK_CLIENT_RUNTIME_PORT || process.env.LIVEDESK_CLIENT_AUTH_PORT) || DEFAULT_AUTH_CALLBACK_PORT;
     let command = 'connect';
-    let nodeOnlyFeature = false;
-    let fakeThumbnail = false;
+    let fakeThumbnail = false;
     let startupRun = isTruthy(process.env.LIVEDESK_ROLE_TRANSITION);
-    let openBrowserOnStart = !isTruthy(process.env.LIVEDESK_SKIP_BROWSER_OPEN);
-    let updateWaitPid = 0;
-
-    for (let index = 0; index < argv.length; index += 1) {
-        const arg = argv[index];
-        if (arg && !arg.startsWith('-')) {
+    let openBrowserOnStart = !isTruthy(process.env.LIVEDESK_SKIP_BROWSER_OPEN);
+    let updateWaitPid = 0;
+    let retiredModelOptionsDiscarded = 0;
+
+    for (let index = 0; index < argv.length; index += 1) {
+        const arg = argv[index];
+        if (RETIRED_CLIENT_MODEL_SINGLE_OPTIONS.has(arg)) {
+            retiredModelOptionsDiscarded += 1;
+            continue;
+        }
+        if (arg === RETIRED_CLIENT_MODEL_VALUE_OPTION) {
+            retiredModelOptionsDiscarded += 1;
+            if (index + 1 < argv.length && !String(argv[index + 1] || '').startsWith('-')) {
+                index += 1;
+            }
+            continue;
+        }
+        if (String(arg || '').startsWith(`${RETIRED_CLIENT_MODEL_VALUE_OPTION}=`)) {
+            retiredModelOptionsDiscarded += 1;
+            continue;
+        }
+        if (arg && !arg.startsWith('-')) {
             const lowerArg = arg.toLowerCase();
             const shortcutSlot = normalizeSlotNumber(arg);
             if (lowerArg === 'connect') {
@@ -512,11 +532,8 @@ export function parseLauncherArgs(argv) {
         if (arg === '--version') {
             version = true;
         }
-        if (arg === '--ai' || arg === '--fake-ai' || arg === '--ai-model' || arg === '--no-ai') {
-            nodeOnlyFeature = true;
-        }
-        if (arg === '--fake-thumbnail') {
-            fakeThumbnail = true;
+        if (arg === '--fake-thumbnail') {
+            fakeThumbnail = true;
         }
         forwarded.push(arg);
     }
@@ -539,13 +556,13 @@ export function parseLauncherArgs(argv) {
         deviceId,
         slot,
         authPort,
-        nodeOnlyFeature,
-        fakeThumbnail,
-        startupRun,
-        openBrowserOnStart,
-        updateWaitPid
-    };
-}
+        fakeThumbnail,
+        startupRun,
+        openBrowserOnStart,
+        updateWaitPid,
+        retiredModelOptionsDiscarded
+    };
+}
 
 function normalizePort(value) {
     const port = Number(String(value || '').trim());
@@ -854,13 +871,15 @@ const CLIENT_UPDATE_SINGLE_FLAGS = new Set([
     '--no-open',
     '--exit-on-disconnect',
     '--exit-on-invalid-pair',
-    '--once'
+    '--once',
+    ...RETIRED_CLIENT_MODEL_SINGLE_OPTIONS
 ]);
 const CLIENT_UPDATE_VALUE_FLAGS = new Set([
     '--update-wait-pid',
     // Pairing credentials stay in the inherited private environment and must
     // never be copied onto a replacement process command line.
-    '--pair'
+    '--pair',
+    RETIRED_CLIENT_MODEL_VALUE_OPTION
 ]);
 
 export function buildClientUpdateRestartArgs(prepared = {}) {
@@ -874,6 +893,9 @@ export function buildClientUpdateRestartArgs(prepared = {}) {
         if (arg.startsWith('--pair=')) {
             continue;
         }
+        if (arg.startsWith(`${RETIRED_CLIENT_MODEL_VALUE_OPTION}=`)) {
+            continue;
+        }
         if (CLIENT_UPDATE_VALUE_FLAGS.has(arg)) {
             index += 1;
             continue;
@@ -4233,6 +4255,18 @@ export function buildFastArgs(args, fakeThumbnail, transport = 'auto', relay = '
     const forwarded = [];
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
+        if (RETIRED_CLIENT_MODEL_SINGLE_OPTIONS.has(arg)) {
+            continue;
+        }
+        if (arg === RETIRED_CLIENT_MODEL_VALUE_OPTION) {
+            if (index + 1 < args.length && !String(args[index + 1] || '').startsWith('-')) {
+                index += 1;
+            }
+            continue;
+        }
+        if (String(arg || '').startsWith(`${RETIRED_CLIENT_MODEL_VALUE_OPTION}=`)) {
+            continue;
+        }
         if (arg === '--transport' || arg === '--relay') {
             index += 1;
             continue;
@@ -4241,8 +4275,8 @@ export function buildFastArgs(args, fakeThumbnail, transport = 'auto', relay = '
             forwarded.push('--fake-frame');
             continue;
         }
-        if (arg === '--tasks' || arg === '--no-tasks' || arg === '--no-ai') {
-            continue;
+        if (arg === '--tasks' || arg === '--no-tasks') {
+            continue;
         }
         forwarded.push(arg);
     }
@@ -4446,15 +4480,15 @@ function spawnAgent(command, args, env = process.env, onStart = null) {
     });
 }
 
-function shouldUseFast(parsed) {
-    if (parsed.engine === 'node') {
-        return false;
+function shouldUseFast(parsed) {
+    if (parsed.engine === 'node') {
+        return false;
     }
     if (parsed.engine === 'fast') {
         return true;
     }
-    return !parsed.nodeOnlyFeature;
-}
+    return true;
+}
 
 function shouldTryFast(parsed, runtime) {
     if (parsed.engine === 'fast') {
@@ -4480,6 +4514,12 @@ export async function runClientRuntime(argv = process.argv.slice(2)) {
         console.warn('[LiveDesk] @livedesk/client is deprecated. Use the unified livedesk package or LiveDesk Desktop.');
     }
     const parsed = parseLauncherArgs(argv);
+    if (parsed.retiredModelOptionsDiscarded > 0) {
+        console.warn(
+            '[LiveDesk Client] Ignored retired Client model-runtime options. '
+            + 'Approved AI computer commands are handled by the Hub Codex Agent.'
+        );
+    }
     if (parsed.updateWaitPid) {
         await waitForProcessExit(parsed.updateWaitPid);
     }

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.202",
+  "version": "0.1.204",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -37,14 +37,13 @@
     "@livedesk/runtime-core": "0.1.0",
     "@supabase/supabase-js": "^2.110.0",
     "node-screenshots": "^0.2.8",
-    "openai": "^6.42.0",
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.410",
-    "@livedesk/fast-osx-arm64": "0.1.410",
-    "@livedesk/fast-osx-x64": "0.1.410",
-    "@livedesk/fast-win-x64": "0.1.410"
+    "@livedesk/fast-linux-x64": "0.1.411",
+    "@livedesk/fast-osx-arm64": "0.1.411",
+    "@livedesk/fast-osx-x64": "0.1.411",
+    "@livedesk/fast-win-x64": "0.1.411"
   },
   "publishConfig": {
     "access": "public"

package/hub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/hub",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "LiveDesk local Hub API and browser frame bridge",
   "type": "module",
   "main": "src/server.js",

package/hub/src/agents/agent-manager.js

@@ -1,175 +1,123 @@
-import os from 'node:os';
-import path from 'node:path';
-import { AgentSettingsStore, AGENT_PROVIDER_CODEX, AGENT_PROVIDER_OPENCODE_GO } from './agent-settings.js';
-import { createOsSecretStore } from './secret-store.js';
-import { createOpenCodeGoProvider } from './opencode-go-provider.js';
-import { AgentProviderError } from './provider-errors.js';
-import { createCodexAgentRuntime } from './codex-agent-runtime.js';
-
-function maskApiKey(value) {
-  const key = String(value || '');
-  return key.length >= 4 ? `••••${key.slice(-4)}` : '';
-}
-
-function publicCodexStatus(status = {}) {
-  return {
-    installed: status.installed === true,
-    authenticated: ['signed-in', 'not-signed-in'].includes(status.authenticated) ? status.authenticated : 'unknown',
-    status: String(status.status || 'unknown').slice(0, 40),
-    codexPath: String(status.codexPath || '').slice(0, 500),
-    detail: String(status.detail || '').slice(0, 300)
-  };
-}
-
-export function createAgentManager({
-  dataDir = path.join(os.homedir(), '.livedesk'),
-  settingsStore,
-  secretStore,
-  provider,
-  codexRuntime
-} = {}) {
-  const settings = settingsStore || new AgentSettingsStore({ dataDir });
-  const secrets = secretStore || createOsSecretStore({ dataDir });
-  const legacyProvider = provider || createOpenCodeGoProvider();
-  const runtime = codexRuntime;
-  let statusCache = { expiresAt: 0, value: null };
-
-  async function getCodexStatus() {
-    if (!runtime) return { installed: false, authenticated: 'unknown', status: 'unavailable', codexPath: '' };
-    if (statusCache.value && statusCache.expiresAt > Date.now()) return statusCache.value;
-    let value;
-    try {
-      value = publicCodexStatus(await runtime.getStatus());
-    } catch (error) {
-      value = publicCodexStatus({ installed: true, authenticated: 'unknown', status: error?.code || 'security-unavailable', detail: error?.message || 'Codex security isolation is unavailable.' });
-    }
-    statusCache = { value, expiresAt: Date.now() + 10000 };
-    return value;
-  }
-
-  async function publicSettings() {
-    const current = await settings.get();
-    const { codexMaxTurns: _codexMaxTurns, ...exposedSettings } = current;
-    let hasApiKey = false;
-    let apiKeyPreview = '';
-    let secretStoreAvailable = true;
-    if (current.provider === AGENT_PROVIDER_OPENCODE_GO) {
-      try {
-        const key = await secrets.getApiKey(AGENT_PROVIDER_OPENCODE_GO);
-        hasApiKey = Boolean(key);
-        apiKeyPreview = maskApiKey(key);
-      } catch {
-        secretStoreAvailable = false;
-      }
-    }
-    const codex = await getCodexStatus();
-    const securityStatus = runtime?.getSecurityStatus?.() || {
-      isolatedCodexHome: false,
-      restrictedEnvironment: false,
-      livedeskMcpOnly: false,
-      selectedDeviceScopeEnforced: false,
-      failClosed: true,
-      verified: false,
-      state: 'unavailable'
-    };
-    return {
-      ...exposedSettings,
-      hasApiKey,
-      apiKeyPreview,
-      secretStoreAvailable,
-      codexInstallation: codex.installed ? 'installed' : 'not-installed',
-      codexAuth: codex.authenticated,
-      codexStatus: codex.status,
-      codexPath: codex.codexPath,
-      agentWorkspacePath: current.codexWorkingDirectory,
-      securityStatus
-    };
-  }
-
-  async function legacyApiKey() {
-    const key = await secrets.getApiKey(AGENT_PROVIDER_OPENCODE_GO);
-    if (!key) throw new AgentProviderError('agent-api-key-missing', 'OpenCode Go API key is not configured.', { status: 401 });
-    return key;
-  }
-
-  async function currentProvider() {
-    const current = await settings.get();
-    return { current, active: current.provider === AGENT_PROVIDER_CODEX ? runtime : legacyProvider };
-  }
-
-  return {
-    getSettings: publicSettings,
-    async updateSettings(patch = {}) {
-      const nextPatch = { ...patch };
-      const apiKey = typeof nextPatch.apiKey === 'string' ? nextPatch.apiKey.trim() : '';
-      delete nextPatch.apiKey;
-      const current = await settings.get();
-      const requestedProvider = String(nextPatch.provider || current.provider);
-      if (apiKey) {
-        if (requestedProvider !== AGENT_PROVIDER_OPENCODE_GO) {
-          throw new AgentProviderError('agent-codex-does-not-use-api-key', 'Codex authentication is owned by the installed Codex CLI.', { status: 400 });
-        }
-        await secrets.setApiKey(AGENT_PROVIDER_OPENCODE_GO, apiKey);
-      }
-      await settings.update(nextPatch);
-      statusCache = { expiresAt: 0, value: null };
-      return publicSettings();
-    },
-    async resetSettings() {
-      await settings.reset();
-      statusCache = { expiresAt: 0, value: null };
-      return publicSettings();
-    },
-    async deleteApiKey() {
-      await secrets.deleteApiKey(AGENT_PROVIDER_OPENCODE_GO);
-      return publicSettings();
-    },
-    async getModels() {
-      const { current, active } = await currentProvider();
-      if (current.provider === AGENT_PROVIDER_CODEX) {
-        return [{ id: '', name: 'Codex default', protocol: 'codex-sdk', available: true, capabilities: { supportsReasoningLevel: true, supportsStreaming: true, supportsTools: true } }];
-      }
-      return active.getModels(current, await legacyApiKey());
-    },
-    async testConnection() {
-      const { current, active } = await currentProvider();
-      if (current.provider === AGENT_PROVIDER_CODEX) {
-        if (!active) throw new AgentProviderError('codex-sdk-not-installed', 'Codex SDK is not installed.', { status: 503 });
-        statusCache = { expiresAt: 0, value: null };
-        return active.testConnection();
-      }
-      return active.testConnection(current, await legacyApiKey());
-    },
-    async createPlan(input) {
-      const { current, active } = await currentProvider();
-      if (!current.enabled) throw new AgentProviderError('agent-ai-disabled', 'Agent AI is disabled in Settings.', { status: 409 });
-      if (current.provider === AGENT_PROVIDER_CODEX) {
-        throw new AgentProviderError('agent-codex-run-required', 'Codex runs use the LiveDesk tool loop.', { status: 409 });
-      }
-      return active.createPlan(input, current, await legacyApiKey());
-    },
-    async createSummary(input) {
-      const { current, active } = await currentProvider();
-      if (!current.enabled || !current.generateSummary) throw new AgentProviderError('agent-summary-disabled', 'Agent summaries are disabled in Settings.', { status: 409 });
-      if (current.provider === AGENT_PROVIDER_CODEX) {
-        const source = input && typeof input === 'object' ? input : {};
-        const results = Array.isArray(source.results) ? source.results : [];
-        return { summary: String(results.length ? `${source.completed || 0} completed, ${source.failed || 0} failed.` : 'LiveDesk Agent run completed.').slice(0, 1200), modelId: current.codexModelId || 'Codex default' };
-      }
-      const source = input && typeof input === 'object' ? input : {};
-      const results = Array.isArray(source.results) ? source.results : [];
-      const safeResults = current.includeRawDeviceDetails
-        ? results.map(result => ({ deviceName: String(result?.deviceName || '').slice(0, 120), status: String(result?.status || '').slice(0, 40), result: String(result?.result || '').slice(0, 1200), error: String(result?.error || '').slice(0, 500) }))
-        : results.map(result => ({ deviceName: String(result?.deviceName || '').slice(0, 120), status: String(result?.status || '').slice(0, 40), hasResult: Boolean(result?.result), hasError: Boolean(result?.error) }));
-      return active.createSummary({ instruction: String(source.instruction || '').slice(0, 500), operation: String(source.operation || '').slice(0, 80), summary: { total: Number(source.total || results.length), completed: Number(source.completed || 0), failed: Number(source.failed || 0), results: safeResults } }, current, await legacyApiKey());
-    },
-    async startRun(input) {
-      const current = await settings.get();
-      if (current.provider !== AGENT_PROVIDER_CODEX || !runtime) throw new AgentProviderError('agent-codex-not-active', 'Codex SDK is not the active Agent provider.', { status: 409 });
-      return runtime.start(input);
-    },
-    getRun(runId) { return runtime?.get(runId) || null; },
-    cancelRun(runId) { return runtime?.cancel(runId) || null; },
-    cancelAllRuns() { return runtime?.cancelAll?.() || 0; }
-  };
-}
+import os from 'node:os';
+import path from 'node:path';
+import { AgentSettingsStore, AGENT_PROVIDER_CODEX } from './agent-settings.js';
+import { AgentProviderError } from './provider-errors.js';
+
+function publicCodexStatus(status = {}) {
+  return {
+    installed: status.installed === true,
+    authenticated: ['signed-in', 'not-signed-in'].includes(status.authenticated) ? status.authenticated : 'unknown',
+    status: String(status.status || 'unknown').slice(0, 40),
+    codexPath: String(status.codexPath || '').slice(0, 500),
+    detail: String(status.detail || '').slice(0, 300)
+  };
+}
+
+export function createAgentManager({
+  dataDir = path.join(os.homedir(), '.livedesk'),
+  settingsStore,
+  codexRuntime
+} = {}) {
+  const settings = settingsStore || new AgentSettingsStore({ dataDir });
+  const runtime = codexRuntime;
+  let statusCache = { expiresAt: 0, value: null };
+
+  async function getCodexStatus() {
+    if (!runtime) return { installed: false, authenticated: 'unknown', status: 'unavailable', codexPath: '' };
+    if (statusCache.value && statusCache.expiresAt > Date.now()) return statusCache.value;
+    let value;
+    try {
+      value = publicCodexStatus(await runtime.getStatus());
+    } catch (error) {
+      value = publicCodexStatus({
+        installed: true,
+        authenticated: 'unknown',
+        status: error?.code || 'security-unavailable',
+        detail: error?.message || 'Codex security isolation is unavailable.'
+      });
+    }
+    statusCache = { value, expiresAt: Date.now() + 10000 };
+    return value;
+  }
+
+  async function publicSettings() {
+    const current = await settings.get();
+    const { codexMaxTurns: _codexMaxTurns, ...exposedSettings } = current;
+    const codex = await getCodexStatus();
+    const securityStatus = runtime?.getSecurityStatus?.() || {
+      isolatedCodexHome: false,
+      restrictedEnvironment: false,
+      livedeskMcpOnly: false,
+      selectedDeviceScopeEnforced: false,
+      failClosed: true,
+      verified: false,
+      state: 'unavailable'
+    };
+    return {
+      ...exposedSettings,
+      provider: AGENT_PROVIDER_CODEX,
+      codexInstallation: codex.installed ? 'installed' : 'not-installed',
+      codexAuth: codex.authenticated,
+      codexStatus: codex.status,
+      codexPath: codex.codexPath,
+      agentWorkspacePath: current.codexWorkingDirectory,
+      securityStatus
+    };
+  }
+
+  return {
+    getSettings: publicSettings,
+    async updateSettings(patch = {}) {
+      const nextPatch = { ...patch };
+      const requestedProvider = String(nextPatch.provider || AGENT_PROVIDER_CODEX).trim().toLowerCase();
+      const suppliedLegacyKey = typeof nextPatch.apiKey === 'string' && nextPatch.apiKey.trim().length > 0;
+      delete nextPatch.provider;
+      delete nextPatch.apiKey;
+      if (requestedProvider !== AGENT_PROVIDER_CODEX || suppliedLegacyKey) {
+        throw new AgentProviderError(
+          'agent-provider-retired',
+          'LiveDesk uses the Hub-hosted Codex Agent and does not configure alternate model providers.',
+          { status: 400 }
+        );
+      }
+      await settings.update({ ...nextPatch, provider: AGENT_PROVIDER_CODEX });
+      statusCache = { expiresAt: 0, value: null };
+      return publicSettings();
+    },
+    async resetSettings() {
+      await settings.reset();
+      statusCache = { expiresAt: 0, value: null };
+      return publicSettings();
+    },
+    // Kept as a harmless compatibility endpoint for an older cached web UI.
+    // No credential is read, written, or returned by the current Hub.
+    async deleteApiKey() {
+      return publicSettings();
+    },
+    async testConnection() {
+      if (!runtime) throw new AgentProviderError('codex-sdk-not-installed', 'Codex SDK is not installed.', { status: 503 });
+      statusCache = { expiresAt: 0, value: null };
+      return runtime.testConnection();
+    },
+    async createPlan() {
+      throw new AgentProviderError('agent-codex-run-required', 'Codex Agent requests use the LiveDesk tool loop.', { status: 409 });
+    },
+    async createSummary(input) {
+      const source = input && typeof input === 'object' ? input : {};
+      const results = Array.isArray(source.results) ? source.results : [];
+      return {
+        summary: String(results.length ? `${source.completed || 0} completed, ${source.failed || 0} failed.` : 'LiveDesk Agent run completed.').slice(0, 1200)
+      };
+    },
+    async startRun(input) {
+      const current = await settings.get();
+      if (current.provider !== AGENT_PROVIDER_CODEX || !runtime) {
+        throw new AgentProviderError('agent-codex-not-active', 'Codex SDK is not the active Agent runtime.', { status: 409 });
+      }
+      return runtime.start(input);
+    },
+    getRun(runId) { return runtime?.get(runId) || null; },
+    cancelRun(runId) { return runtime?.cancel(runId) || null; },
+    cancelAllRuns() { return runtime?.cancelAll?.() || 0; }
+  };
+}