mixdog 0.7.5 → 0.7.7

package/setup/mixdog-cli.mjs

@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+// mixdog-cli.mjs — `mixdog` bin dispatcher: launch Claude Code with the dev
+// plugin load flags for other args; no args or `install` → runInstall().
+
+import { spawn } from 'node:child_process';
+import { realpathSync } from 'node:fs';
+import { constants as osConstants } from 'node:os';
+import { fileURLToPath } from 'node:url';
+import { DEFAULT_MARKETPLACE, DEFAULT_PLUGIN } from '../src/shared/plugin-paths.mjs';
+import { runInstall } from './install.mjs';
+import { resolveClaudeExecutable } from './locate-claude.mjs';
+
+export { resolveClaudeExecutable } from './locate-claude.mjs';
+
+const PLUGIN_LOAD_ARG = `plugin:${DEFAULT_PLUGIN}@${DEFAULT_MARKETPLACE}`;
+const CLAUDE_PREFIX = ['--dangerously-load-development-channels', PLUGIN_LOAD_ARG];
+
+export function buildClaudeLaunchArgv(passthrough = []) {
+  return [...CLAUDE_PREFIX, ...passthrough];
+}
+
+export async function dispatchMixdogCli(argv = process.argv.slice(2)) {
+  const [first] = argv;
+  if (argv.length === 0 || first === 'install') {
+    if (process.env.MIXDOG_CLI_DRY_RUN === '1') {
+      process.stdout.write('mixdog-cli: route=setup\n');
+      return 0;
+    }
+    await runInstall();
+    return 0;
+  }
+
+  const claudeArgs = buildClaudeLaunchArgv(argv);
+  if (process.env.MIXDOG_CLI_DRY_RUN === '1') {
+    process.stdout.write(`mixdog-cli: claude ${JSON.stringify(claudeArgs)}\n`);
+    return 0;
+  }
+
+  const claudePath = resolveClaudeExecutable();
+  if (!claudePath) {
+    process.stderr.write(
+      '\n✗ `claude` was not found on PATH. Install Claude Code first: https://docs.anthropic.com/en/docs/claude-code\n',
+    );
+    return 127;
+  }
+
+  return launchClaude(claudePath, claudeArgs);
+}
+
+function launchClaude(claudePath, claudeArgs) {
+  return new Promise((resolve) => {
+    const win32 = process.platform === 'win32';
+    const needsShell = win32 && /\.(cmd|bat)$/i.test(claudePath);
+    const child = spawn(claudePath, claudeArgs, {
+      stdio: 'inherit',
+      shell: needsShell,
+      windowsHide: true,
+    });
+
+    child.on('error', (err) => {
+      process.stderr.write(`${err?.stack || err?.message || String(err)}\n`);
+      resolve(1);
+    });
+
+    child.on('close', (code, signal) => {
+      if (signal) {
+        const sigNum = osConstants.signals?.[signal] ?? 0;
+        resolve(128 + sigNum);
+        return;
+      }
+      resolve(code ?? 0);
+    });
+  });
+}
+
+function isDirectCliEntry() {
+  const entry = process.argv[1];
+  if (!entry) return false;
+  try {
+    const self = realpathSync(fileURLToPath(import.meta.url));
+    const invoked = realpathSync(entry);
+    return self === invoked;
+  } catch {
+    return false;
+  }
+}
+
+if (isDirectCliEntry()) {
+  dispatchMixdogCli()
+    .then((code) => process.exit(code))
+    .catch((err) => {
+      console.error(err?.stack || err?.message || String(err));
+      process.exit(1);
+    });
+}

package/setup/setup-server.mjs

@@ -7,8 +7,8 @@ import { fileURLToPath } from 'url';
 import http from 'http';
 import https from 'https';
 import { DEFAULT_MAINTENANCE, MAINTENANCE_SLOTS, DEFAULT_PRESETS, getPluginData } from '../src/agent/orchestrator/config.mjs';
-import { getOpenAIOAuthModelCatalogError, hasOpenAIOAuthCredentials } from '../src/agent/orchestrator/providers/openai-oauth.mjs';
-import { hasAnthropicOAuthCredentials } from '../src/agent/orchestrator/providers/anthropic-oauth.mjs';
+import { getOpenAIOAuthModelCatalogError, hasOpenAIOAuthCredentials, loginOAuth as loginOpenAIOAuth } from '../src/agent/orchestrator/providers/openai-oauth.mjs';
+import { hasAnthropicOAuthCredentials, loginOAuth as loginAnthropicOAuth } from '../src/agent/orchestrator/providers/anthropic-oauth.mjs';
 import { hasGrokOAuthCredentials, loginOAuth as loginGrokOAuth } from '../src/agent/orchestrator/providers/grok-oauth.mjs';
 import { resolvePluginData } from '../src/shared/plugin-paths.mjs';
 import { listSchedules } from '../src/shared/schedules-store.mjs';
@@ -2135,6 +2135,54 @@ async function handleRequest(req, res) {
     return;
   }
 
+  if (req.method === 'POST' && path === '/agent/openai-oauth/login') {
+    if (!isAllowedOrigin(req)) {
+      res.writeHead(403, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: false, error: 'forbidden: cross-origin' }));
+      return;
+    }
+    try {
+      const tokens = await loginOpenAIOAuth();
+      if (!tokens?.access_token) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: false, error: 'login cancelled or timed out' }));
+        return;
+      }
+      dropRuntimeModelCaches();
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: true }));
+    } catch (e) {
+      process.stderr.write('[setup] /agent/openai-oauth/login failed: ' + (e?.stack || e?.message || String(e)) + '\n');
+      res.writeHead(500, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: false, error: e?.message || String(e) }));
+    }
+    return;
+  }
+
+  if (req.method === 'POST' && path === '/agent/anthropic-oauth/login') {
+    if (!isAllowedOrigin(req)) {
+      res.writeHead(403, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: false, error: 'forbidden: cross-origin' }));
+      return;
+    }
+    try {
+      const tokens = await loginAnthropicOAuth();
+      if (!tokens?.accessToken) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ ok: false, error: 'login cancelled or timed out' }));
+        return;
+      }
+      dropRuntimeModelCaches();
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: true }));
+    } catch (e) {
+      process.stderr.write('[setup] /agent/anthropic-oauth/login failed: ' + (e?.stack || e?.message || String(e)) + '\n');
+      res.writeHead(500, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: false, error: e?.message || String(e) }));
+    }
+    return;
+  }
+
   if (req.method === 'GET' && path === '/agent/presets') {
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ presets: readAgentPresets() }));

package/setup/setup.html

@@ -2607,8 +2607,8 @@ const AG_API_PROVIDERS = [
   {id:'nvidia',name:'NVIDIA',env:'NVIDIA_API_KEY',url:'https://build.nvidia.com'},
 ];
 const AG_OAUTH_PROVIDERS = [
-  {id:'openai-oauth',name:'Codex',desc:'~/.codex/auth.json'},
-  {id:'anthropic-oauth',name:'Claude Code',desc:'~/.claude/.credentials.json'},
+  {id:'openai-oauth',name:'Codex',desc:'~/.codex/auth.json',login:true},
+  {id:'anthropic-oauth',name:'Claude Code',desc:'~/.claude/.credentials.json',login:true},
   {id:'grok-oauth',name:'Grok',desc:'~/.grok/auth.json — or browser OAuth (consent: "Grok Build")',login:true},
 ];
 const AG_LOCAL_PROVIDERS = [
@@ -2673,8 +2673,9 @@ function agRenderAll() {
   for (const p of AG_OAUTH_PROVIDERS) {
     const detected = agOAuthDetected(p.id);
     const tag = detected ? '<span class="r-tag ok">Set</span>' : '<span class="r-tag no">Not Set</span>';
-    // Login / Re-login button removed per request — OAuth state is shown via the Set / Not Set tag only.
-    const btn = '';
+    const btn = p.login
+      ? `<button class="save" style="width:auto;height:28px;padding:0 12px;font-size:11px;flex-shrink:0;margin-left:8px" type="button" onclick="oauthProviderLogin('${escapeAttr(p.id)}', this)">${detected ? 'Re-login' : 'Sign in'}</button>`
+      : '';
     oauthSec.innerHTML += `<div class="r"><span class="r-name">${p.name}</span><span style="flex:1;font-size:12px;color:var(--text-4)">${p.desc}</span>${tag}${btn}</div>`;
   }
   const localSec = document.getElementById('ag-local-sec');
@@ -2733,18 +2734,31 @@ function agOAuthDetected(providerId, auth = agAuth) {
   return false;
 }
 
-// Grok CLI OAuth login. An existing `grok` CLI login (~/.grok/auth.json) shows
-// as "Set" automatically; this button signs in from the browser when no CLI
-// login exists. The request blocks until consent completes, then we re-fetch
-// auth so the row flips to "Set".
-async function grokOAuthLogin(btn) {
+const OAUTH_LOGIN_ROUTES = {
+  'openai-oauth': '/agent/openai-oauth/login',
+  'anthropic-oauth': '/agent/anthropic-oauth/login',
+  'grok-oauth': '/agent/grok-oauth/login',
+};
+const OAUTH_LOGIN_LABELS = {
+  'openai-oauth': 'Codex',
+  'anthropic-oauth': 'Claude',
+  'grok-oauth': 'Grok',
+};
+
+// Browser OAuth login for providers with login:true. CLI cred files (~/.codex,
+// ~/.claude, ~/.grok) show as "Set" automatically; Sign in runs when none exist.
+// Blocks until consent completes, then re-fetches auth so the row flips to Set.
+async function oauthProviderLogin(providerId, btn) {
+  const route = OAUTH_LOGIN_ROUTES[providerId];
+  if (!route) return;
+  const label = OAUTH_LOGIN_LABELS[providerId] || providerId;
   if (btn) { btn.disabled = true; btn.textContent = 'Waiting for browser…'; }
   try {
-    const r = await fetch('/agent/grok-oauth/login', { method: 'POST' }).then(r => r.json());
+    const r = await fetch(route, { method: 'POST' }).then(r => r.json());
     if (r && r.ok) { await loadAgentData(); }
-    else { alert('Grok login failed: ' + ((r && r.error) || 'unknown error')); if (btn) btn.disabled = false; }
+    else { alert(label + ' login failed: ' + ((r && r.error) || 'unknown error')); if (btn) btn.disabled = false; }
   } catch (e) {
-    alert('Grok login failed: ' + (e?.message || e));
+    alert(label + ' login failed: ' + (e?.message || e));
     if (btn) btn.disabled = false;
   }
 }