fix: address plugin marketplace review feedback and split the mail plugin out of tree

Author: adminliu-main

apps/daemon/e2e/plugin-marketplace.e2e.ts

@@ -17,9 +17,9 @@ const marketplaceScript = join(repoRoot, 'scripts', 'dev-marketplace.mts');
 const fixtureIndex = join(repoRoot, 'node_modules', '.cache', 'dev-marketplace', 'index.json');
 
 const MARKETPLACE_ID = 'linkcode-official';
-const PLUGIN_ID = 'linkcode/mail';
+const PLUGIN_ID = 'linkcode/echo';
 const PLUGIN_VERSION = '0.1.0';
-const AUTHCODE = 'e2e-secret-authcode';
+const SECRET_TOKEN = 'e2e-secret-token';
 
 async function freePort(): Promise<number> {
   const server = createServer();
@@ -118,7 +118,7 @@ async function main(): Promise<void> {
         (entry) =>
           entry.pluginId === PLUGIN_ID && entry.release.manifest.version === PLUGIN_VERSION,
       ),
-      'catalog does not list linkcode/mail',
+      'catalog does not list linkcode/echo',
     );
     const second = await client.refreshPluginMarketplace(MARKETPLACE_ID);
     assert.equal(second.notModified, true, 'second refresh did not hit the ETag cache');
@@ -137,45 +137,45 @@ async function main(): Promise<void> {
       version: PLUGIN_VERSION,
     });
     assert.equal(installed.pluginId, PLUGIN_ID);
-    const packageDir = join(home, '.linkcode', 'plugins', 'linkcode', 'mail', PLUGIN_VERSION);
+    const packageDir = join(home, '.linkcode', 'plugins', 'linkcode', 'echo', PLUGIN_VERSION);
     assert(existsSync(join(packageDir, 'manifest.json')), 'installed manifest.json missing');
     assert(existsSync(join(packageDir, 'dist', 'index.js')), 'installed dist/index.js missing');
 
     // 4. Settings: masked read shows the schema, set splits secret vs non-secret.
     const before = await client.listLinkCodePluginConfigs();
     const view = before.find((entry) => entry.id === PLUGIN_ID);
     assert(view, 'installed plugin missing from plugin-config.list');
-    assert(view.settings.authcode?.secret, 'authcode must be a secret field');
-    assert.equal(view.values.authcode, undefined, 'secret value leaked in masked read');
+    assert(view.settings.token?.secret, 'token must be a secret field');
+    assert.equal(view.values.token, undefined, 'secret value leaked in masked read');
 
     await client.setLinkCodePluginConfig({
       pluginId: PLUGIN_ID,
-      set: { account: 'user@163.com', authcode: AUTHCODE, preset: 'qq' },
+      set: { greeting: '你好', token: SECRET_TOKEN, mode: 'shout' },
     });
     const configFile = JSON.parse(readFileSync(join(home, '.linkcode', 'config.json'), 'utf8')) as {
       pluginConfigs?: Record<string, Record<string, unknown>>;
     };
-    assert.equal(configFile.pluginConfigs?.[PLUGIN_ID]?.account, 'user@163.com');
-    assert.equal(configFile.pluginConfigs?.[PLUGIN_ID]?.preset, 'qq');
-    assert(!('authcode' in (configFile.pluginConfigs?.[PLUGIN_ID] ?? {})), 'secret in config.json');
+    assert.equal(configFile.pluginConfigs?.[PLUGIN_ID]?.greeting, '你好');
+    assert.equal(configFile.pluginConfigs?.[PLUGIN_ID]?.mode, 'shout');
+    assert(!('token' in (configFile.pluginConfigs?.[PLUGIN_ID] ?? {})), 'secret in config.json');
     const secretsFile = JSON.parse(
       readFileSync(join(home, '.linkcode', 'secrets.json'), 'utf8'),
     ) as {
       protection: 'os-keyring' | 'plaintext';
     };
     // A fake HOME has no login keychain, so the vault degrades to plaintext on disk (with a boot
-    // warning). Either way the authcode belongs in secrets.json — just never in config.json.
+    // warning). Either way the token belongs in secrets.json — just never in config.json.
     const secretsRaw = readFileSync(join(home, '.linkcode', 'secrets.json'), 'utf8');
     if (secretsFile.protection === 'os-keyring') {
-      assert(!secretsRaw.includes(AUTHCODE), 'authcode stored in plaintext under os-keyring');
+      assert(!secretsRaw.includes(SECRET_TOKEN), 'token stored in plaintext under os-keyring');
     } else {
-      assert(secretsRaw.includes(AUTHCODE), 'authcode missing from the vault');
+      assert(secretsRaw.includes(SECRET_TOKEN), 'token missing from the vault');
     }
 
     const after = await client.listLinkCodePluginConfigs();
     const afterView = after.find((entry) => entry.id === PLUGIN_ID);
-    assert.equal(afterView?.values.account, 'user@163.com');
-    assert.equal(afterView?.values.authcode, undefined, 'secret value leaked after set');
+    assert.equal(afterView?.values.greeting, '你好');
+    assert.equal(afterView?.values.token, undefined, 'secret value leaked after set');
 
     // 5. Uninstall removes the package and prunes its config.
     const removed = await client.uninstallLinkCodePlugin(PLUGIN_ID);

apps/daemon/src/__tests__/fixtures/in-memory-vault.ts

@@ -20,6 +20,13 @@ export function createInMemoryVault(protection: SecretProtection = 'os-keyring')
     return {
       protection,
       get: (key) => refs.get(prefix + key) ?? null,
+      keys: () => {
+        const keys: string[] = [];
+        for (const ref of refs.keys()) {
+          if (ref.startsWith(prefix)) keys.push(ref.slice(prefix.length));
+        }
+        return keys;
+      },
       set(key, secret) {
         refs.set(prefix + key, secret);
       },

apps/daemon/src/__tests__/marketplace.test.ts

@@ -156,12 +156,18 @@ describe('DaemonLinkCodeMarketplaceService.refresh', () => {
   });
 
   it('does not refresh or resolve releases from a disabled marketplace', async () => {
+    // Populate the cache through an enabled config first, so the resolveRelease assertion below
+    // actually exercises the disabled gate instead of short-circuiting on an empty cache.
+    const fetchIndex = vi.fn(() => Promise.resolve(fakeResponse(200, JSON.stringify(INDEX))));
+    await new DaemonLinkCodeMarketplaceService(MARKETPLACES, fetchIndex).refresh(
+      'linkcode-official',
+    );
+
     const disabled: LinkCodeMarketplaceConfigList = [{ ...MARKETPLACES[0], enabled: false }];
-    const fetchIndex = vi.fn();
     const service = new DaemonLinkCodeMarketplaceService(disabled, fetchIndex);
 
     await expect(service.refresh('linkcode-official')).rejects.toThrow('Marketplace is disabled');
-    expect(fetchIndex).not.toHaveBeenCalled();
+    expect(fetchIndex).toHaveBeenCalledTimes(1);
     expect(
       service.resolveRelease({
         marketplaceId: 'linkcode-official',

apps/daemon/src/__tests__/plugin-store.test.ts

@@ -6,6 +6,7 @@ import type {
   LinkCodePluginManifest,
   LinkCodePluginRelease,
 } from '@linkcode/schema';
+import { wait } from 'foxts/wait';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { makePluginTmpDir, pluginPackageDir, pluginRegistryPath } from '../plugin-store/paths';
 import { DaemonLinkCodePluginStore } from '../plugin-store/store';
@@ -128,6 +129,85 @@ describe('DaemonLinkCodePluginStore', () => {
     ]);
   });
 
+  it('serializes concurrent installs of the same plugin so neither deletes the other’s package', async () => {
+    const events: string[] = [];
+    mocks.tarExtract.mockImplementation(async ({ cwd }: { cwd: string }) => {
+      events.push('extract:start');
+      await wait(10);
+      writeFileSync(join(cwd, 'manifest.json'), JSON.stringify(manifest('0.2.0')));
+      events.push('extract:end');
+    });
+    const release = {
+      manifest: manifest('0.2.0'),
+      artifact: {
+        urls: ['https://plugins.example/arcbox-latex-0.2.0.tgz'],
+        integrity: 'sha256-7bZ8YaunaCifbaRByeb1I8+v9PiypXCFI+8pxUP46I4=',
+        format: 'tgz',
+      },
+    } satisfies LinkCodePluginRelease;
+    const store = new DaemonLinkCodePluginStore(createInMemoryVault());
+
+    await Promise.all([
+      store.install(release, 'linkcode-official'),
+      store.install(release, 'linkcode-official'),
+    ]);
+
+    expect(events).toEqual(['extract:start', 'extract:end', 'extract:start', 'extract:end']);
+    expect(existsSync(pluginPackageDir('arcbox/latex', '0.2.0'))).toBe(true);
+    expect(JSON.parse(readFileSync(pluginRegistryPath(), 'utf8'))).toMatchObject([
+      { id: 'arcbox/latex', version: '0.2.0' },
+    ]);
+  });
+
+  it('uninstall prunes only its own secrets, even beside a dotted sibling id', async () => {
+    const installed = record('0.1.0');
+    writePackage(installed, settingsManifest('0.1.0'));
+    const neighbour: InstalledLinkCodePlugin = {
+      ...record('0.3.0'),
+      // Dots are legal inside id segments, so `arcbox/latex.pro` is a real neighbour whose keys
+      // would match a naive `arcbox/latex.` prefix; a corrupt manifest must not turn them into
+      // prunable orphans either.
+      id: 'arcbox/latex.pro',
+      path: pluginPackageDir('arcbox/latex.pro', '0.3.0'),
+    };
+    writePackage(neighbour, '{broken');
+    writeRegistry([installed, neighbour]);
+    const vault = createInMemoryVault();
+    const store = new DaemonLinkCodePluginStore(vault);
+    await store.setSettings('arcbox/latex', {
+      set: { account: 'a@example.com', authcode: 'secret-a' },
+    });
+    vault.namespace('plugin').set('arcbox/latex.pro/authcode', 'secret-b');
+
+    await store.uninstall('arcbox/latex');
+
+    const secrets = vault.namespace('plugin');
+    expect(secrets.get('arcbox/latex/authcode')).toBeNull();
+    expect(secrets.get('arcbox/latex.pro/authcode')).toBe('secret-b');
+  });
+
+  it('folds manifest defaults into settings that have no stored value', async () => {
+    const installed = record('0.1.0');
+    const withDefaults = settingsManifest('0.1.0');
+    withDefaults.settings = {
+      ...withDefaults.settings,
+      preset: { type: 'enum', enum: ['163', 'qq'], default: '163' },
+      limit: { type: 'number', default: 8000 },
+      fallbacktoken: { type: 'password', secret: true, default: 'manifest-leak' },
+    };
+    writePackage(installed, withDefaults);
+    writeRegistry([installed]);
+    const store = new DaemonLinkCodePluginStore(createInMemoryVault());
+    await store.setSettings('arcbox/latex', { set: { account: 'a@example.com' } });
+
+    // A secret field's default is a plaintext credential in the manifest — never folded in.
+    expect(store.getSettings('arcbox/latex')).toEqual({
+      account: 'a@example.com',
+      preset: '163',
+      limit: 8000,
+    });
+  });
+
   it('rolls back config and secret changes when the vault rejects a settings update', () => {
     const installed = record('0.1.0');
     writePackage(installed, settingsManifest('0.1.0'));
@@ -146,7 +226,7 @@ describe('DaemonLinkCodePluginStore', () => {
         return {
           ...secrets,
           set(key: string, value: string) {
-            if (key === 'arcbox/latex.authcode' && value === 'new-secret') throw vaultFailure;
+            if (key === 'arcbox/latex/authcode' && value === 'new-secret') throw vaultFailure;
             secrets.set(key, value);
           },
         };

apps/daemon/src/config.ts

@@ -324,7 +324,7 @@ export function savePluginConfigValues(
   writeConfigFields(file, { pluginConfigs: configs });
 }
 
-/** The daemon's `plugin` vault namespace, for secret setting values keyed `<pluginId>.<fieldId>`. */
+/** The daemon's `plugin` vault namespace, for secret setting values keyed `<pluginId>/<fieldId>`. */
 export function pluginSecretStore(vault: SecretVault): SecretStore {
   return pluginSecrets(vault);
 }