deepcodex 0.1.1 → 0.1.2

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "deepcodex",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Delegates tasks to native DeepSeek Flash subagents inside Codex through a local router.",
   "author": {
     "name": "DeepCodex"

package/README.md

@@ -50,14 +50,6 @@ is `com.deepcodex.router`. Existing private paths (`~/.config/opencodex`,
 `~/.local/share/opencodex`) and provider IDs are retained, reusing your saved
 key and backup.
 
-If the previous `com.opencodex.router` LaunchAgent is installed, unload it and
-remove its plist before running `deepcodex install` to avoid competing services:
-
-```sh
-launchctl bootout "gui/$(id -u)/com.opencodex.router"
-rm ~/Library/LaunchAgents/com.opencodex.router.plist
-```
-
 Run `deepcodex doctor` and `deepcodex install` to refresh the runtime; there is
 no need to run `configure` again if your key is already saved.
 
@@ -100,7 +92,10 @@ result confirms local prerequisites, not provider authentication or account cred
   `127.0.0.1:4207`;
 - updates `~/.codex/config.toml` with the local provider, the subagent defaults
   and the generated model catalog, keeping a pre-install backup at
-  `~/.config/opencodex/desktop/config.before.toml`.
+  `~/.config/opencodex/desktop/config.before.toml`;
+- registers and installs the bundled DeepCodex plugin in the personal marketplace,
+  including its current name, description, icon and delegation skill. An existing
+  local OpenCodex plugin in that marketplace is replaced after DeepCodex installs.
 
 The installer refuses to run when an unrelated custom provider is active or when
 an endpoint override is already configured, and it leaves your configuration
@@ -111,10 +106,11 @@ that were already open keep the provider and model catalog they started with.
 
 ## Plugin skill
 
-The delegation skill lives in `skills/delegate-flash/SKILL.md` and is loaded by
-installing the DeepCodex plugin through a Codex marketplace. Installing the npm
-package or running the commands above does not install the skill, and this
-checkout is not a marketplace source by itself.
+The delegation skill lives in `skills/delegate-flash/SKILL.md`. `deepcodex install`
+copies the plugin to `~/plugins/deepcodex`, registers it in
+`~/.agents/plugins/marketplace.json`, and installs it through the Codex CLI.
+Repeating the command refreshes the plugin cache even when the package version
+has not changed. Other personal marketplace entries are preserved.
 
 ## Commands
 
@@ -122,7 +118,8 @@ checkout is not a marketplace source by itself.
 | --- | --- |
 | `deepcodex configure` | Prompt for the DeepSeek API key and write `~/.config/opencodex/.env`. |
 | `deepcodex doctor` | Check Codex CLI compatibility and credential presence without inference. |
-| `deepcodex install` | Install the router runtime, the LaunchAgent and the user-level Codex settings. |
+| `deepcodex install` | Install the router runtime, LaunchAgent, Codex settings and current DeepCodex plugin. |
+| `deepcodex uninstall` | Stop and remove the router, restoring the saved Codex configuration. Credentials are preserved. Refuses if config changed since installation. Restart Codex afterward; remove the npm package separately with `npm uninstall -g deepcodex`. |
 | `deepcodex status` | Query the installed router health endpoint without inference. |
 | `deepcodex run --cwd PATH --task-file PATH [--write]` | Run one bounded isolated worker ticket against DeepSeek. Read-only unless `--write` is given. |
 | `deepcodex pilot` | Run the opt-in live native-delegation test; consumes Codex and DeepSeek usage. |

package/bin/deepcodex.js

@@ -7,7 +7,8 @@ const help = `Usage: deepcodex <command>
 
 Commands:
   configure  Save the DeepSeek key using a hidden terminal prompt
-  install  Activate the local macOS router and configure Codex
+  install  Activate the local macOS router and install the Codex plugin
+  uninstall  Remove the local router and restore Codex settings
   status   Check the installed router without inference
   doctor   Check worker prerequisites without inference
   run      Run an isolated worker ticket (consumes DeepSeek usage)
@@ -15,8 +16,8 @@ Commands:
 
 Requires macOS, Node.js >=22.15 and a compatible Codex CLI (PATH or Desktop bundle).
 Run deepcodex configure to save the DeepSeek key in ~/.config/opencodex/.env.
-Installing this npm package does not activate the router or install the skill
-in Codex. Install the plugin through a Codex marketplace to load its skill.
+Run deepcodex install after installing this npm package to activate the router
+and install or update the DeepCodex plugin, including its icon and skill.
 Use deepcodex <command> --help for command options.
 `;
 
@@ -26,7 +27,7 @@ if (!command || command === '--help' || command === '-h') {
   const manifest = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
   console.log(manifest.version);
 } else {
-  const scripts = { configure: 'credentials.js', install: 'desktop.js', status: 'desktop.js', doctor: 'worker.js', run: 'worker.js', pilot: 'pilot.js' };
+  const scripts = { configure: 'credentials.js', install: 'desktop.js', uninstall: 'desktop.js', status: 'desktop.js', doctor: 'worker.js', run: 'worker.js', pilot: 'pilot.js' };
   if (!Object.hasOwn(scripts, command)) {
     console.error(`Unknown command: ${command}\n${help}`);
     process.exit(2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepcodex",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Native DeepSeek Flash subagents for Codex through a local router.",
   "license": "MIT",
   "keywords": [

package/scripts/desktop.js

@@ -11,6 +11,7 @@ import { parseToml } from './toml.js';
 import { startPilot } from './pilot-router.js';
 
 const STATE = path.join(os.homedir(), '.config/opencodex/desktop');
+const LSREGISTER = '/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister';
 const readJson = filename => JSON.parse(fs.readFileSync(filename, 'utf8'));
 const expandHome = filename => filename.startsWith('~/') ? path.join(os.homedir(), filename.slice(2)) : filename;
 
@@ -78,7 +79,7 @@ export function plistDocument(value) {
 
 export function copyRuntime(root, runtime) {
   fs.mkdirSync(runtime, { recursive: true, mode: 0o700 });
-  for (const directory of ['scripts', 'config', 'prompts', 'vendor']) {
+  for (const directory of ['scripts', 'config', 'prompts', 'vendor', '.codex-plugin', 'assets', 'skills']) {
     fs.cpSync(path.join(root, directory), path.join(runtime, directory), { recursive: true,
       filter: source => !['__pycache__', '.env', '.DS_Store'].includes(path.basename(source)) && !/\.py[cod]?$/.test(source) });
   }
@@ -87,6 +88,77 @@ export function copyRuntime(root, runtime) {
   fs.cpSync(dependency, path.join(runtime, 'node_modules/smol-toml'), { recursive: true });
 }
 
+function registerServiceApp(app, action) {
+  const result = spawnSync(LSREGISTER, [action, app], { encoding: 'utf8' });
+  if (result.error || result.status !== 0) throw new Error(`Cannot ${action === '-u' ? 'unregister' : 'register'} DeepCodex app: ${result.error?.message || result.stderr.trim() || `lsregister exited ${result.status}`}`);
+}
+
+function createServiceApp(runtime, label) {
+  const app = path.join(runtime, 'DeepCodex.app');
+  const contents = path.join(app, 'Contents');
+  const executable = path.join(contents, 'MacOS/DeepCodex');
+  fs.mkdirSync(path.dirname(executable), { recursive: true });
+  fs.mkdirSync(path.join(contents, 'Resources'), { recursive: true });
+  const version = readJson(path.join(runtime, 'package.json')).version;
+  privateWrite(path.join(contents, 'Info.plist'), plistDocument({
+    CFBundleIdentifier: label, CFBundleName: 'DeepCodex', CFBundleDisplayName: 'DeepCodex',
+    CFBundleExecutable: 'DeepCodex', CFBundlePackageType: 'APPL', CFBundleIconFile: 'DeepCodex.icns',
+    CFBundleVersion: version, CFBundleShortVersionString: version, LSUIElement: true,
+  }));
+  const command = [process.execPath, path.join(runtime, 'scripts/desktop.js')]
+    .map(value => "'" + value.replaceAll("'", "'\\''") + "'").join(' ');
+  privateWrite(executable, `#!/bin/sh\nexec ${command} "$@"\n`);
+  fs.chmodSync(executable, 0o700);
+  const icon = spawnSync('/usr/bin/sips', ['-z', '512', '512', '-s', 'format', 'icns',
+    path.join(runtime, 'assets/deepcodex.png'), '--out', path.join(contents, 'Resources/DeepCodex.icns')], { encoding: 'utf8' });
+  if (icon.error || icon.status !== 0) throw new Error(`Cannot create DeepCodex app icon: ${icon.error?.message || icon.stderr.trim() || `sips exited ${icon.status}`}`);
+  registerServiceApp(app, '-f');
+  return executable;
+}
+
+export function installPlugin(root, codex, env) {
+  const home = env.HOME || os.homedir();
+  const marketplacePath = path.join(home, '.agents/plugins/marketplace.json');
+  const marketplace = fs.existsSync(marketplacePath) ? readJson(marketplacePath) : {
+    name: 'personal', interface: { displayName: 'Personal' }, plugins: [],
+  };
+  if (typeof marketplace.name !== 'string' || !/^[A-Za-z0-9_-]+$/.test(marketplace.name) || !Array.isArray(marketplace.plugins)) {
+    throw new Error('Invalid personal plugin marketplace');
+  }
+  const manifest = readJson(path.join(root, '.codex-plugin/plugin.json'));
+  if (manifest.name !== 'deepcodex' || typeof manifest.version !== 'string') throw new Error('Invalid DeepCodex plugin manifest');
+  const pluginPath = path.join(home, 'plugins', manifest.name);
+  copyRuntime(root, pluginPath);
+  manifest.version = `${manifest.version.split('+')[0]}+codex.${new Date().toISOString().replace(/\D/g, '')}`;
+  privateWrite(path.join(pluginPath, '.codex-plugin/plugin.json'), JSON.stringify(manifest, null, 2) + '\n');
+  const entry = {
+    name: manifest.name, source: { source: 'local', path: `./plugins/${manifest.name}` },
+    policy: { installation: 'AVAILABLE', authentication: 'ON_INSTALL' }, category: manifest.interface.category,
+  };
+  const existing = marketplace.plugins.findIndex(plugin => plugin.name === manifest.name);
+  if (existing < 0) marketplace.plugins.push(entry);
+  else marketplace.plugins[existing] = { ...marketplace.plugins[existing], source: entry.source };
+  fs.mkdirSync(path.dirname(marketplacePath), { recursive: true });
+  privateWrite(marketplacePath, JSON.stringify(marketplace, null, 2) + '\n');
+  const run = (command, selector) => {
+    const result = spawnSync(codex, ['plugin', command, selector, '--json'], { env, encoding: 'utf8' });
+    if (result.error || result.status !== 0) throw new Error(`Cannot ${command} Codex plugin ${selector}; rerun deepcodex install after checking Codex plugin support`);
+    return JSON.parse(result.stdout);
+  };
+  const selector = `${manifest.name}@${marketplace.name}`;
+  const result = run('add', selector);
+  const configPath = path.join(env.CODEX_HOME || path.join(home, '.codex'), 'config.toml');
+  const config = parseToml(fs.readFileSync(configPath, 'utf8'));
+  const legacySelector = `opencodex@${marketplace.name}`;
+  if (Object.hasOwn(config.plugins || {}, legacySelector)) run('remove', legacySelector);
+  const legacy = marketplace.plugins.find(plugin => plugin.name === 'opencodex' && plugin.source?.source === 'local');
+  if (legacy) {
+    marketplace.plugins = marketplace.plugins.filter(plugin => plugin !== legacy);
+    privateWrite(marketplacePath, JSON.stringify(marketplace, null, 2) + '\n');
+  }
+  return result;
+}
+
 export async function health(state) {
   const response = await fetch(`http://127.0.0.1:${state.config.port}/health`, {
     headers: { 'x-opencodex-pilot': state.capability },
@@ -104,6 +176,8 @@ export async function install() {
   loadCredentials(env, original);
   const diagnosis = doctor(original, env);
   if (diagnosis.status !== 'ready') throw new Error(`DeepCodex prerequisites are not ready: ${diagnosis.errors.join(' ')}`);
+  const pluginSupport = spawnSync(diagnosis.codex, ['plugin', 'add', '--help'], { env, encoding: 'utf8' });
+  if (pluginSupport.error || pluginSupport.status !== 0) throw new Error('Codex CLI must support plugin add; update Codex Desktop before installing DeepCodex');
   const configPath = path.join(env.CODEX_HOME || path.join(os.homedir(), '.codex'), 'config.toml');
   const before = fs.readFileSync(configPath, 'utf8');
   const parsed = parseToml(before);
@@ -113,6 +187,7 @@ export async function install() {
   fs.chmodSync(STATE, 0o700);
   const runtime = path.join(os.homedir(), '.local/share/opencodex/runtime');
   copyRuntime(ROOT, runtime);
+  const executable = createServiceApp(runtime, config.service_label);
   let catalog;
   if (parsed.model_catalog_json && path.resolve(expandHome(parsed.model_catalog_json)) !== path.join(STATE, 'models.json')) {
     catalog = readJson(expandHome(parsed.model_catalog_json));
@@ -130,7 +205,7 @@ export async function install() {
     receipts: path.join(STATE, 'receipts.jsonl'), markers: [] });
   const statePath = path.join(STATE, 'state.json');
   const capability = fs.existsSync(statePath) ? readJson(statePath).capability : randomBytes(32).toString('base64url');
-  const state = { config, capability, node: process.execPath, runtime };
+  const state = { config, capability, node: process.execPath, runtime, configPath };
   const sections = {
     '': { model_provider: 'opencodex', model_catalog_json: path.join(STATE, 'models.json') },
     agents: { enabled: true, default_subagent_model: child.slug, default_subagent_reasoning_effort: 'high' },
@@ -139,21 +214,26 @@ export async function install() {
       requires_openai_auth: true, supports_websockets: false, request_max_retries: 0, stream_max_retries: 0, stream_idle_timeout_ms: config.request_timeout_ms },
     'model_providers.opencodex.http_headers': { 'x-opencodex-pilot': capability },
   };
-  const updated = mergeConfig(before, sections);
+  let updated = mergeConfig(before, sections);
   privateWrite(path.join(STATE, 'config.proposed.toml'), updated);
   if (!fs.existsSync(path.join(STATE, 'config.before.toml'))) privateWrite(path.join(STATE, 'config.before.toml'), before);
   privateWrite(statePath, JSON.stringify(state));
   const label = config.service_label;
   const plist = path.join(os.homedir(), 'Library/LaunchAgents', label + '.plist');
   fs.mkdirSync(path.dirname(plist), { recursive: true });
-  privateWrite(plist, plistDocument({ Label: label, ProgramArguments: [process.execPath, path.join(runtime, 'scripts/desktop.js'), 'serve'],
+  privateWrite(plist, plistDocument({ Label: label, AssociatedBundleIdentifiers: [label], ProgramArguments: [executable, 'serve'],
     WorkingDirectory: runtime, RunAtLoad: true, KeepAlive: true, ThrottleInterval: config.service_throttle_seconds,
     StandardOutPath: path.join(STATE, 'service.log'), StandardErrorPath: path.join(STATE, 'service-errors.log'),
     EnvironmentVariables: { HOME: os.homedir(), PATH: env.PATH } }));
   const domain = `gui/${process.getuid()}`;
-  spawnSync('launchctl', ['bootout', `${domain}/${label}`]);
-  const bootstrap = spawnSync('launchctl', ['bootstrap', domain, plist]);
-  if (bootstrap.error || bootstrap.status !== 0) throw new Error('Cannot start DeepCodex LaunchAgent');
+  const stopped = spawnSync('launchctl', ['bootout', `${domain}/${label}`], { encoding: 'utf8' });
+  if (stopped.error || (stopped.status !== 0 && stopped.status !== 3)) {
+    throw new Error(`Cannot stop ${label}: ${stopped.error?.message || stopped.stderr.trim() || `launchctl exited ${stopped.status}`}`);
+  }
+  const bootstrap = spawnSync('launchctl', ['bootstrap', domain, plist], { encoding: 'utf8' });
+  if (bootstrap.error || bootstrap.status !== 0) {
+    throw new Error(`Cannot start DeepCodex LaunchAgent: ${bootstrap.error?.message || bootstrap.stderr.trim() || `launchctl exited ${bootstrap.status}`}`);
+  }
   const deadline = Date.now() + config.startup_timeout_seconds * 1000;
   let report;
   while (!report) {
@@ -167,18 +247,62 @@ export async function install() {
     }
   }
   if (fs.readFileSync(configPath, 'utf8') !== before) throw new Error('Codex config changed during installation; proposed config was not applied');
+  let plugin;
+  try {
+    plugin = installPlugin(ROOT, diagnosis.codex, env);
+    updated = mergeConfig(fs.readFileSync(configPath, 'utf8'), sections);
+    privateWrite(path.join(STATE, 'config.proposed.toml'), updated);
+  } catch (error) {
+    spawnSync('launchctl', ['bootout', `${domain}/${label}`]);
+    throw error;
+  }
   privateWrite(configPath, updated);
   console.log(JSON.stringify({ ...report, service: label, port: config.port, cwd: runtime, owner: 'DeepCodex LaunchAgent',
-    native_models: nativeModels.length, subagent_model: child.slug, backup: path.join(STATE, 'config.before.toml'), restart_desktop_required: true }));
+    native_models: nativeModels.length, subagent_model: child.slug, plugin, backup: path.join(STATE, 'config.before.toml'), restart_desktop_required: true }));
+}
+
+export function uninstall() {
+  if (process.platform !== 'darwin') throw new Error('The Desktop uninstaller requires macOS');
+  const statePath = path.join(STATE, 'state.json');
+  if (!fs.existsSync(statePath)) {
+    console.log(JSON.stringify({ status: 'not_installed' }));
+    return;
+  }
+  const state = readJson(statePath);
+  const configPath = state.configPath || path.join(process.env.CODEX_HOME || path.join(os.homedir(), '.codex'), 'config.toml');
+  const before = fs.readFileSync(path.join(STATE, 'config.before.toml'), 'utf8');
+  const proposed = fs.readFileSync(path.join(STATE, 'config.proposed.toml'), 'utf8');
+  const current = fs.readFileSync(configPath, 'utf8');
+  if (current !== proposed && current !== before) {
+    throw new Error('Codex configuration changed after installation; uninstall stopped without changes. Reconcile config.toml with the backup and proposed config in ' + STATE);
+  }
+  const runtime = path.join(os.homedir(), '.local/share/opencodex/runtime');
+  if (state.runtime !== runtime) throw new Error('Unexpected router runtime path; uninstall stopped');
+  const label = readJson(path.join(ROOT, 'config/desktop.json')).service_label;
+  if (state.config.service_label !== label) throw new Error('Unexpected router service label; uninstall stopped');
+  const service = `gui/${process.getuid()}/${label}`;
+  // Restore connectivity before stopping the router; a failed stop can be retried.
+  if (current !== before) privateWrite(configPath, before);
+  const stopped = spawnSync('launchctl', ['bootout', service]);
+  if (stopped.error || (stopped.status !== 0 && stopped.status !== 3)) {
+    throw new Error('Cannot stop DeepCodex LaunchAgent; Codex settings restored, runtime retained. Retry uninstall.');
+  }
+  fs.rmSync(path.join(os.homedir(), 'Library/LaunchAgents', label + '.plist'), { force: true });
+  const app = path.join(runtime, 'DeepCodex.app');
+  if (fs.existsSync(app)) registerServiceApp(app, '-u');
+  fs.rmSync(runtime, { recursive: true, force: true });
+  fs.rmSync(STATE, { recursive: true, force: true });
+  console.log(JSON.stringify({ status: 'uninstalled', restart_desktop_required: true, credentials_preserved: true }));
 }
 
 export async function main(args = process.argv.slice(2)) {
   if (args.includes('--help') || args.includes('-h')) {
-    console.log('Usage: deepcodex <install|status>\nActivate or inspect the local macOS Desktop router.');
+    console.log('Usage: deepcodex <install|uninstall|status>\nActivate or inspect the local macOS Desktop router.');
     return 0;
   }
-  if (args.length !== 1 || !['install', 'serve', 'status'].includes(args[0])) throw new Error('Expected install, serve or status');
+  if (args.length !== 1 || !['install', 'uninstall', 'serve', 'status'].includes(args[0])) throw new Error('Expected install, uninstall, serve or status');
   if (args[0] === 'install') await install();
+  else if (args[0] === 'uninstall') uninstall();
   else {
     const state = readJson(path.join(STATE, 'state.json'));
     if (args[0] === 'status') console.log(JSON.stringify({ ...await health(state), port: state.config.port, cwd: state.runtime }));