@toddzheng024/dscode-desktop 0.7.39 → 0.7.41

package/plugins/status/index.mjs

@@ -0,0 +1,127 @@
+import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment';
+import { readLanguage } from '../i18n/messages.mjs';
+import { dscodeVersion } from '../opencode-go/version.mjs';
+import { canonicalProvider, providerSpec } from '../providers/catalog.mjs';
+import { statusSelection } from './selection.mjs';
+
+const words = {
+  en: { title: 'DSCODE status', provider: 'Provider', model: 'Model', balance: 'Account balance', key: 'This key remaining limit', unlimited: 'No key spending cap (not an unlimited account balance)', budget: 'Effective budget remaining', recharge: 'Recharge balance', bonus: 'Bonus balance', missing: 'Credentials are not configured.', unsupported: 'Balance lookup is not supported for this provider or endpoint.', failed: 'Balance unavailable. Check your connection or provider account and retry.', denied: 'The provider refused this credential for balance lookup.', timeout: 'Balance lookup timed out. Retry /status.', available: 'Account available', yes: 'yes', no: 'no', checked: 'Checked', usage: 'Usage: /status', unknown: 'unavailable' },
+  'zh-CN': { title: 'DSCODE 状态', provider: '服务商', model: '模型', balance: '账户余额', key: '当前 key 剩余额度', unlimited: '此 key 未设消费上限（不代表账户余额无限）', budget: '当前有效预算剩余', recharge: '充值余额', bonus: '赠送余额', missing: '尚未配置凭据。', unsupported: '此服务商或接口暂不支持余额查询。', failed: '余额暂不可用，请检查网络或服务商账户后重试。', denied: '服务商拒绝使用当前凭据查询余额。', timeout: '余额查询超时，请重试 /status。', available: '账户可用', yes: '是', no: '否', checked: '查询时间', usage: '用法：/status', unknown: '暂不可用' },
+};
+const decimal = value => (typeof value === 'number' && Number.isFinite(value)) || (typeof value === 'string' && /^-?\d+(?:\.\d+)?$/.test(value));
+const money = (value, currency) => decimal(value) && ['USD', 'CNY'].includes(currency) ? `${value} ${currency}` : undefined;
+
+/** Resolve the same configured reference as the active route, never a different saved key. */
+export function statusConnection(ctx, provider) {
+  const entry = ctx.llm.listConfigurableProviders().find(item => item.provider === provider);
+  if (entry) {
+    const descriptor = ctx.get('settings')?.describe({ redactSecrets: true }).find(item => item.ns === entry.settingsNs);
+    const profile = entry.settingsPath.reduce((value, key) => value?.[key], descriptor?.value);
+    if (!profile || typeof profile.apiKeyEnv !== 'string') return undefined;
+    return { ref: profile.apiKeyEnv, baseURL: profile.baseURL };
+  }
+  const ref = providerSpec(provider)?.credentialRef;
+  return ref ? { ref } : undefined;
+}
+
+function officialEndpoint(ctx, provider, baseURL) {
+  const fallback = provider === 'openrouter' ? 'https://openrouter.ai/api/v1' : 'https://api.deepseek.com/anthropic';
+  const configured = baseURL ?? (provider === 'deepseek-official' ? launchEnvironmentOf(ctx).get('DEEPSEEK_BASE_URL')?.value : undefined);
+  const url = new URL(configured ?? fallback);
+  const expected = new URL(fallback);
+  return url.origin === expected.origin && !url.username && !url.password && !url.search && !url.hash
+    && (provider === 'openrouter' ? /^\/api\/v1\/?$/.test(url.pathname) : /^\/(?:anthropic\/?|v1\/?)?$/.test(url.pathname));
+}
+
+async function json(url, key, fetchImpl, signal) {
+  const response = await fetchImpl(url, { headers: { Authorization: `Bearer ${key}`, Accept: 'application/json' }, signal, redirect: 'error' });
+  if (!response.ok) throw Object.assign(new Error('Balance query failed'), { status: response.status });
+  return response.json();
+}
+
+/** No shared balance cache: every invocation belongs to this exact route and credential. */
+export async function providerStatus(ctx, selection, { signal, fetch: fetchImpl = globalThis.fetch, locale = readLanguage(), timeoutMs = 8000 } = {}) {
+  const w = words[locale] ?? words.en;
+  const provider = selection?.provider, model = selection?.model;
+  const lines = [`${w.title}`, `${w.provider}: ${provider ?? w.unknown}`, `${w.model}: ${model ?? w.unknown}`];
+  const deadline = AbortSignal.any([...(signal ? [signal] : []), AbortSignal.timeout(timeoutMs)]);
+  const run = async () => {
+    const route = canonicalProvider(provider);
+    if (route === 'deepseek-account') {
+      const account = ctx.get('deepseekAccount');
+      if ((await account?.getState())?.status !== 'credential-stored') return [w.missing];
+      const balance = await account.getBalance({ version: dscodeVersion(), locale, timezoneOffsetSeconds: -new Date().getTimezoneOffset() * 60 });
+      if (balance?.status !== 'ready') return [w.failed];
+      const result = [];
+      for (const [label, wallets] of [[w.recharge, balance.value], [w.bonus, balance.bonusWallets]]) {
+        for (const wallet of wallets ?? []) {
+          const amount = money(wallet.balance, wallet.currency);
+          if (amount !== undefined) result.push(`${label}: ${amount}`);
+        }
+      }
+      return result.length ? result : [w.failed];
+    }
+    if (!['deepseek-official', 'openrouter'].includes(route)) return [w.unsupported];
+    const connection = statusConnection(ctx, provider);
+    if (!connection) return [w.failed];
+    if (!officialEndpoint(ctx, route, connection.baseURL)) return [w.unsupported];
+    const credentials = ctx.get('credentials');
+    const key = credentials ? (await credentials.resolve(connection.ref))?.value : launchEnvironmentOf(ctx).get(connection.ref)?.value;
+    if (!key) return [w.missing];
+    if (route === 'deepseek-official') {
+      const body = await json('https://api.deepseek.com/user/balance', key, fetchImpl, deadline);
+      const amounts = (Array.isArray(body?.balance_infos) ? body.balance_infos : []).flatMap(info => {
+        const amount = money(info.total_balance, info.currency);
+        return amount === undefined ? [] : [`${w.balance}: ${amount}`];
+      });
+      if (!amounts.length) return [w.failed];
+      if (typeof body.is_available === 'boolean') amounts.push(`${w.available}: ${body.is_available ? w.yes : w.no}`);
+      return amounts;
+    }
+    // Never borrow a management key: it may belong to a different account.
+    const [credits, keyInfo] = await Promise.allSettled([
+      json('https://openrouter.ai/api/v1/credits', key, fetchImpl, deadline),
+      json('https://openrouter.ai/api/v1/key', key, fetchImpl, deadline),
+    ]);
+    const result = [];
+    const data = credits.status === 'fulfilled' ? credits.value?.data : undefined;
+    const remaining = decimal(data?.total_credits) && decimal(data?.total_usage) ? Number(data.total_credits) - Number(data.total_usage) : NaN;
+    result.push(`${w.balance}: ${Number.isFinite(remaining) ? `${Number(remaining.toFixed(8))} USD` : w.unknown}`);
+    const current = keyInfo.status === 'fulfilled' ? keyInfo.value?.data : undefined;
+    result.push(`${w.key}: ${current?.limit === null && current?.limit_remaining === null ? w.unlimited : money(current?.limit_remaining, 'USD') ?? w.unknown}`);
+    const effective = money(current?.effective_budget?.remaining_usd, 'USD');
+    if (effective !== undefined) result.push(`${w.budget}: ${effective}`);
+    if (credits.status === 'rejected' && keyInfo.status === 'rejected') throw keyInfo.reason;
+    return result;
+  };
+  let onAbort;
+  try {
+    deadline.throwIfAborted();
+    const cancelled = new Promise((_, reject) => {
+      onAbort = () => reject(deadline.reason);
+      deadline.addEventListener('abort', onAbort, { once: true });
+    });
+    lines.push(...await Promise.race([run(), cancelled]));
+  } catch (error) {
+    if (signal?.aborted) throw signal.reason;
+    lines.push(deadline.aborted ? w.timeout : [401, 403].includes(error?.status) ? w.denied : w.failed);
+  } finally {
+    if (onAbort) deadline.removeEventListener('abort', onAbort);
+  }
+  return [...lines, `${w.checked}: ${new Date().toISOString()}`].join('\n');
+}
+
+export function registerStatus(ctx) {
+  ctx.commands.register({ name: 'status', description: 'Show the current provider, model and available balance', handler: async ({ agent, rawInput, signal }) => {
+    if (rawInput.trim()) return { kind: 'error', text: (words[readLanguage()] ?? words.en).usage };
+    const selection = statusSelection(agent);
+    return { kind: 'success', text: await providerStatus(ctx, selection, { signal }) };
+  } });
+}
+
+/** Only a standalone text command is intercepted; paths and attached prompts stay model input. */
+export async function acpStatus(ctx, selection, prompt, signal) {
+  if (prompt.length !== 1 || prompt[0].type !== 'text' || !/^\/status(?:\s|$)/.test(prompt[0].text.trim())) return undefined;
+  if (prompt[0].text.trim() !== '/status') return (words[readLanguage()] ?? words.en).usage;
+  return providerStatus(ctx, selection, { signal });
+}

package/plugins/status/selection.mjs

@@ -0,0 +1,6 @@
+// The TUI's explicit picker choice takes precedence over its last request header.
+// Keep the live ref outside model history; WeakMap ownership follows the Agent.
+const selections = new WeakMap();
+export const registerStatusSelection = (agent, read) => { selections.set(agent, read); };
+export const statusSelection = agent => selections.get(agent)?.()
+  ?? { ...agent.options, ...agent.session.requestHeader()?.config };

package/plugins/triggers/scheduler-service.mjs

@@ -8,7 +8,7 @@ export const schedulerLabel = home => `ai.dscode.scheduler.${createHash('sha256'
 export const schedulerPath = (home, directory = join(homedir(), 'Library', 'LaunchAgents')) => join(directory, `${schedulerLabel(home)}.plist`);
 
 export function schedulerPlist(home, dscodePath) {
-  const args = [process.execPath, dscodePath, 'trigger', 'scheduler', 'start'];
+  const args = [...(/\.[cm]?js$/.test(dscodePath) ? [process.execPath, dscodePath] : [dscodePath]), 'trigger', 'scheduler', 'start'];
   const log = join(home, 'triggers', 'scheduler.log');
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

package/plugins/triggers/scheduler.mjs

@@ -15,7 +15,8 @@ export function launchJobWorker({ home, dscodePath, job }) {
   const fd = openSync(join(directory, `${job.id}.log`), 'a', 0o600);
   let child;
   try {
-    child = spawn(process.execPath, [dscodePath, 'trigger', 'run-job', job.id], {
+    const script = /\.[cm]?js$/.test(dscodePath);
+    child = spawn(script ? process.execPath : dscodePath, [...(script ? [dscodePath] : []), 'trigger', 'run-job', job.id], {
       cwd: home, env: { ...process.env, DSH_HOME: home, DSCODE_HOME: home },
       stdio: ['ignore', fd, fd],
     });

package/plugins/tui-tools/hook-sources.mjs

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { hookEvents, validateHooks } from './hooks.mjs';
-import { enabledFlag } from './workspace-discovery.mjs';
+import { enabledFlag, isolatedDshPath } from './workspace-discovery.mjs';
 
 // Project hook files layer on top of the installation file by default. They run as
 // the OS user outside tool approval, so a cloned repository can install gates;
@@ -67,6 +67,7 @@ export function resolveHookSources({ root, cwd = root, env = process.env }) {
   if (!projectHooksEnabled(env)) return { sources, skipped };
   for (const file of projectHookFiles) {
     const path = join(cwd, file.path);
+    if (isolatedDshPath(path, env)) continue;
     if (!existsSync(path)) continue;
     let parsed;
     try {

package/plugins/tui-tools/index.mjs

@@ -12,6 +12,7 @@ import { hookEvents, validateHooks } from './hooks.mjs';
 import { redact } from '../auto-review/policy.mjs';
 import { plainConfig } from '../cordis-config/plain.mjs';
 import { analyzeDoctorEvidence, collectDoctorEvidence, recordRuntimeLog } from './doctor.mjs';
+import { isolatedDshPath } from './workspace-discovery.mjs';
 
 export const name = 'dscode-tui-tools';
 export const inject = ['commands', 'agents', 'tools', 'skills', 'permissionPresets', 'sessionPersistence', 'llm'];
@@ -53,6 +54,7 @@ export async function findConflicts(cwd, configs, winners, env = process.env) {
   const candidates = new Map();
   const errors = [];
   for (const root of new Set(roots)) {
+    if (isolatedDshPath(root, env)) continue;
     let entries;
     try { entries = await readdir(root, { withFileTypes: true }); }
     catch (e) { if (e.code !== 'ENOENT') errors.push(`${root}: ${e.code}`); continue; }

package/plugins/tui-tools/update.mjs

@@ -29,16 +29,17 @@ export function newerVersion(candidate, current) {
   return false;
 }
 
-/** Newest launcher version on npm, or undefined when the registry cannot be read. */
-export async function fetchLatestVersion({ fetchImpl = fetch, timeoutMs = 8000 } = {}) {
+/** Newest GitHub application or legacy npm launcher; undefined on lookup failure. */
+export async function fetchLatestVersion({ fetchImpl = fetch, timeoutMs = 8000, standalone = !!process.env.DSCODE_STANDALONE_ROOT } = {}) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
     // Plain JSON: the registry answers 406 for the abbreviated metadata type on the
     // `/latest` dist-tag endpoint.
-    const response = await fetchImpl(REGISTRY_URL, { headers: { accept: 'application/json' }, signal: controller.signal });
+    const response = await fetchImpl(standalone ? 'https://api.github.com/repos/qiz029/dscode/releases/latest' : REGISTRY_URL, { headers: { accept: 'application/json' }, signal: controller.signal });
     if (!response.ok) return undefined;
-    const version = (await response.json())?.version;
+    const body = await response.json();
+    const version = standalone ? (body.draft || body.prerelease ? undefined : body.tag_name?.replace(/^v/, '')) : body.version;
     return typeof version === 'string' && VERSION_PATTERN.test(version) ? version : undefined;
   } catch { return undefined; }
   finally { clearTimeout(timer); }
@@ -55,6 +56,7 @@ export function stateHome(env = process.env, home = process.env.HOME) {
  */
 export function planUpdate({ moduleUrl, version = 'latest', execPath = process.execPath } = {}) {
   const root = resolve(dirname(fileURLToPath(moduleUrl)), '..', '..');
+  if (existsSync(join(root, '.dscode-standalone.json'))) return { label: `self-contained ${root}`, command: join(root, 'dscode'), args: ['update', version] };
   const entry = join(root, 'bin/dscode.mjs');
   if (existsSync(entry)) return { label: `tar/source ${root}`, command: execPath, args: [entry, 'update', version] };
   if (existsSync(join(root, 'node_modules', LAUNCHER_PACKAGE, 'cli.mjs'))) return { label: 'npm launcher (bundle tree)', command: execPath, args: [join(root, 'node_modules', LAUNCHER_PACKAGE, 'cli.mjs'), 'update', version] };

package/plugins/tui-tools/workspace-discovery.mjs

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve, sep } from 'node:path';
+import { basename, dirname, join, resolve, sep } from 'node:path';
+import { homedir } from 'node:os';
 
 // Discovery above the project root, bounded at the home directory rather than the
 // filesystem root: a shared workspace directory such as ~/Workspace can contribute
@@ -25,7 +26,20 @@ export const skillAncestorsEnabled = (env = process.env) => !disabledFlag(env.DS
 // whatever $HOME says, so the comparison canonicalizes both sides. The chain itself
 // keeps the caller's logical paths, which is what the skill and instruction probes
 // then stat.
-const canonical = path => { try { return realpathSync(path); } catch { return resolve(path); } };
+const canonical = path => {
+  try { return realpathSync(path); } catch {
+    const absolute = resolve(path), parent = dirname(absolute);
+    return parent === absolute ? absolute : join(canonical(parent), basename(absolute));
+  }
+};
+
+/** Even when ~ is the working directory, its .dsh is another application's home. */
+export function isolatedDshPath(path, env = process.env) {
+  if (!env.DSCODE_STANDALONE_ROOT) return false;
+  const foreign = canonical(join(env.HOME || homedir(), '.dsh'));
+  const target = canonical(path);
+  return target === foreign || target.startsWith(foreign + sep);
+}
 
 // Every directory from the working directory up to home, nearest first. An empty
 // list means home is not an ancestor, and the mode then contributes nothing.
@@ -68,7 +82,7 @@ export function ancestorSkillDirs({ cwd, home, env = process.env }) {
       // The provider already scans these two at rank 100/200 for the owning project.
       if (dir === projectRoot && (root === '.dsh/skills' || root === '.agents/skills')) continue;
       const path = join(dir, root);
-      if (existsSync(path) && !dirs.includes(path)) dirs.push(path);
+      if (existsSync(path) && !isolatedDshPath(path, env) && !dirs.includes(path)) dirs.push(path);
     }
   }
   return dirs;