@pellux/goodvibes-tui 1.27.1 → 2.0.1

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@pellux/goodvibes-tui",
-  "version": "1.27.1",
-  "description": "Terminal-native GoodVibes product for coding, operations, automation, knowledge, channels, and daemon-backed control-plane workflows.",
+  "version": "2.0.1",
+  "description": "Terminal-native GoodVibes client for coding, operations, knowledge and channel workflows — a pure client of the GoodVibes daemon.",
   "type": "module",
   "main": "src/main.ts",
   "bin": {
-    "goodvibes": "bin/goodvibes",
-    "goodvibes-daemon": "bin/goodvibes-daemon"
+    "goodvibes": "bin/goodvibes"
   },
   "files": [
     "bin",
@@ -25,7 +24,6 @@
   ],
   "scripts": {
     "dev": "bun run src/main.ts",
-    "daemon": "bun run src/daemon/cli.ts",
     "dev:watch": "bun --watch src/main.ts",
     "prebuild": "bun run scripts/prebuild.ts",
     "build": "bun build src/main.ts --compile --outfile dist/goodvibes",
@@ -33,11 +31,6 @@
     "build:linux-arm64": "bun build src/main.ts --compile --target=bun-linux-arm64 --outfile dist/goodvibes-linux-arm64",
     "build:macos-x64": "bun build src/main.ts --compile --target=bun-darwin-x64 --outfile dist/goodvibes-macos-x64",
     "build:macos-arm64": "bun build src/main.ts --compile --target=bun-darwin-arm64 --outfile dist/goodvibes-macos-arm64",
-    "build:daemon:linux-x64": "goodvibes-build-binaries --target daemon-linux-x64",
-    "build:daemon:linux-arm64": "goodvibes-build-binaries --target daemon-linux-arm64",
-    "build:daemon:macos-x64": "goodvibes-build-binaries --target daemon-macos-x64",
-    "build:daemon:macos-arm64": "goodvibes-build-binaries --target daemon-macos-arm64",
-    "smoke:daemon": "bun run scripts/post-build-smoke.ts",
     "smoke:tui": "goodvibes-post-build-smoke",
     "build:windows": "bun build src/main.ts --compile --target=bun-windows-x64 --outfile dist/goodvibes-windows.exe",
     "build:all-shell": "bun run build:linux-x64 && bun run build:linux-arm64 && bun run build:macos-x64 && bun run build:macos-arm64 && bun run build:windows",
@@ -88,9 +81,6 @@
     "goodvibes",
     "tui",
     "bun",
-    "daemon",
-    "control-plane",
-    "automation",
     "ai"
   ],
   "publishConfig": {
@@ -101,21 +91,20 @@
     "bun": ">=1.3.10"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "^0.16.1",
-    "@anthropic-ai/bedrock-sdk": "^0.28.1",
-    "@anthropic-ai/sdk": "^0.82.0",
-    "@anthropic-ai/vertex-sdk": "^0.16.0",
+    "@agentclientprotocol/sdk": "^0.21.0",
+    "@anthropic-ai/bedrock-sdk": "^0.29.1",
+    "@anthropic-ai/sdk": "^0.92.0",
     "@ast-grep/napi": "^0.42.0",
-    "@aws/bedrock-token-generator": "^1.1.0",
-    "@pellux/goodvibes-sdk": "1.21.0",
-    "@pellux/goodvibes-terminal-shell": "1.21.0",
+    "@pellux/goodvibes-sdk": "2.0.0",
+    "@pellux/goodvibes-terminal-shell": "2.0.0",
     "bash-language-server": "^5.6.0",
     "fuse.js": "^7.1.0",
+    "@pellux/goodvibes-daemon": "1.28.1",
     "graphql": "^16.13.2",
     "jszip": "^3.10.1",
     "node-edge-tts": "^1.2.10",
     "onnxruntime-web": "^1.27.0",
-    "openai": "^6.29.0",
+    "openai": "6.46.0",
     "pyright": "^1.1.408",
     "simple-git": "^3.33.0",
     "sql.js": "^1.14.1",
@@ -135,10 +124,10 @@
     "typescript": "^5.9.3"
   },
   "optionalDependencies": {
-    "@pellux/goodvibes-tui-linux-x64": "1.27.1",
-    "@pellux/goodvibes-tui-linux-arm64": "1.27.1",
-    "@pellux/goodvibes-tui-darwin-x64": "1.27.1",
-    "@pellux/goodvibes-tui-darwin-arm64": "1.27.1"
+    "@pellux/goodvibes-tui-linux-x64": "2.0.1",
+    "@pellux/goodvibes-tui-linux-arm64": "2.0.1",
+    "@pellux/goodvibes-tui-darwin-x64": "2.0.1",
+    "@pellux/goodvibes-tui-darwin-arm64": "2.0.1"
   },
   "trustedDependencies": [],
   "overrides": {

package/scripts/postinstall.js

@@ -60,9 +60,15 @@ async function downloadText(url) {
 }
 
 /**
- * Copy the prebuilt binaries (and sqlite-vec addon, if present) out of the
+ * Copy the prebuilt binary (and sqlite-vec addon, if present) out of the
  * installed platform package into vendor/. Returns true when it handled the
  * install, false when no platform package is available (fall back to download).
+ *
+ * The daemon binary is NOT here any more. The daemon is its own product with
+ * its own npm package (`goodvibes-daemon`), which this package declares as a
+ * dependency — so an npm install still brings the whole suite, and the daemon's
+ * own postinstall places the daemon's own binary. Two packages each placing
+ * a copy of `goodvibes-daemon` is exactly how a machine ends up with two.
  */
 function installFromPlatformPackage(artifacts, vendorDir) {
   const pkgName = PLATFORM_PACKAGE_NAMES[`${process.platform}-${process.arch}`];
@@ -78,17 +84,14 @@ function installFromPlatformPackage(artifacts, vendorDir) {
   }
 
   const app = join(pkgBinDir, artifacts.app);
-  const daemon = join(pkgBinDir, artifacts.daemon);
-  if (!existsSync(app) || !existsSync(daemon)) {
+  if (!existsSync(app)) {
     return false;
   }
 
-  for (const artifactName of [artifacts.app, artifacts.daemon]) {
-    const destination = join(vendorDir, artifactName);
-    rmSync(destination, { force: true });
-    copyFileSync(join(pkgBinDir, artifactName), destination);
-    prepareBinary(destination);
-  }
+  const destination = join(vendorDir, artifacts.app);
+  rmSync(destination, { force: true });
+  copyFileSync(app, destination);
+  prepareBinary(destination);
 
   // Carry the sqlite-vec native addon (bin/lib/...) beside the vendored binary
   // so semantic memory keeps working (resolved as <execDir>/lib/...).
@@ -123,16 +126,14 @@ async function installPlatformBinaries() {
 
   const localSourceDir = process.env.GOODVIBES_ASSET_SOURCE_DIR?.trim();
   if (localSourceDir) {
-    for (const artifactName of [artifacts.app, artifacts.daemon]) {
-      const sourcePath = join(localSourceDir, artifactName);
-      if (!existsSync(sourcePath)) {
-        throw new Error(`missing local release artifact for postinstall smoke: ${sourcePath}`);
-      }
-      const destination = join(vendorDir, artifactName);
-      copyFileSync(sourcePath, destination);
-      prepareBinary(destination);
+    const sourcePath = join(localSourceDir, artifacts.app);
+    if (!existsSync(sourcePath)) {
+      throw new Error(`missing local release artifact for postinstall smoke: ${sourcePath}`);
     }
-    console.log(`postinstall: installed local smoke-test binaries for ${process.platform}-${process.arch}`);
+    const destination = join(vendorDir, artifacts.app);
+    copyFileSync(sourcePath, destination);
+    prepareBinary(destination);
+    console.log(`postinstall: installed the local smoke-test binary for ${process.platform}-${process.arch}`);
     return;
   }
 
@@ -153,26 +154,25 @@ async function installPlatformBinaries() {
   writeFileSync(join(vendorDir, 'SHA256SUMS.txt'), checksumText);
   const checksums = parseChecksumFile(checksumText);
 
-  for (const artifactName of [artifacts.app, artifacts.daemon]) {
-    const destination = join(vendorDir, artifactName);
-    const tempDestination = `${destination}.download`;
-    rmSync(tempDestination, { force: true });
-    await downloadFile(`${releaseBaseUrl}/${artifactName}`, tempDestination);
-    const actual = sha256(readFileSync(tempDestination));
-    const expected = checksums.get(artifactName);
-    try {
-      verifyChecksum(artifactName, actual, expected);
-    } catch (error) {
-      rmSync(tempDestination, { force: true });
-      throw error;
-    }
-    rmSync(destination, { force: true });
-    copyFileSync(tempDestination, destination);
+  const artifactName = artifacts.app;
+  const destination = join(vendorDir, artifactName);
+  const tempDestination = `${destination}.download`;
+  rmSync(tempDestination, { force: true });
+  await downloadFile(`${releaseBaseUrl}/${artifactName}`, tempDestination);
+  const actual = sha256(readFileSync(tempDestination));
+  const expected = checksums.get(artifactName);
+  try {
+    verifyChecksum(artifactName, actual, expected);
+  } catch (error) {
     rmSync(tempDestination, { force: true });
-    prepareBinary(destination);
+    throw error;
   }
+  rmSync(destination, { force: true });
+  copyFileSync(tempDestination, destination);
+  rmSync(tempDestination, { force: true });
+  prepareBinary(destination);
 
-  console.log(`postinstall: installed release binaries for ${process.platform}-${process.arch}`);
+  console.log(`postinstall: installed the release binary for ${process.platform}-${process.arch}`);
 }
 
 function deployBundledFiles() {

package/src/audio/spoken-turn-model-routing.ts

@@ -1,7 +1,7 @@
 import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { ModelDefinition, ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
 import type { ContentPart } from '@pellux/goodvibes-sdk/platform/providers';
-import type { Orchestrator, OrchestratorUserInputOptions } from '../core/orchestrator.ts';
+import type { Orchestrator, OrchestratorUserInputOptions } from '@pellux/goodvibes-sdk/platform/core';
 
 const SPOKEN_TURN_SOURCE = 'tts';
 

package/src/cli/bundle-command.ts

@@ -6,15 +6,15 @@ import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/pro
 import { createRuntimeServices } from '../runtime/services.ts';
 import { createRuntimeStore } from '../runtime/store/index.ts';
 import { getOnboardingCheckMarkerPath } from '../runtime/onboarding/index.ts';
-import { CONFIG_SCHEMA } from '../config/index.ts';
+import { CONFIG_SCHEMA } from '@pellux/goodvibes-sdk/platform/config';
 import { SecretsManager } from '../config/secrets.ts';
-import type { ConfigKey } from '../config/index.ts';
-import type { CliCommandRuntime } from './types.ts';
-import type { CliCommandOutput } from './types.ts';
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config';
+import type { CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
+import type { CliCommandOutput } from '@pellux/goodvibes-terminal-shell';
 import { getPackageVersion } from './help.ts';
 import { classifyProviderSetup } from '../providers/provider-classification.ts';
 import { buildCliServicePosture } from './service-posture.ts';
-import { REDACTED_VALUE, collectSensitiveConfigValues, isRedactedValue, redactConfig, redactSerializedSecrets } from './redaction.ts';
+import { REDACTED_VALUE, collectSensitiveConfigValues, isRedactedValue, redactConfig, redactSerializedSecrets } from '@pellux/goodvibes-terminal-shell';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 
 interface BundleInspectSummary {

package/src/cli/completions/generate.ts

@@ -23,7 +23,7 @@
  *     `"completions": "bun run src/cli/completions/generate.ts"` to write files.
  */
 
-import type { GoodVibesCliCommand } from '../types.ts';
+import type { GoodVibesCliCommand } from '@pellux/goodvibes-terminal-shell';
 
 // ---------------------------------------------------------------------------
 // Typed completion data surface

package/src/cli/doctor.ts

@@ -2,10 +2,10 @@ import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import { PermissionManager, createPermissionConfigReader } from '@pellux/goodvibes-sdk/platform/permissions';
 import type { PermissionCategory, PermissionCheckResult } from '@pellux/goodvibes-sdk/platform/permissions';
 import { PolicyRuntimeState, createFeatureFlagManager, deriveFeatureStates } from '@/runtime/index.ts';
-import { getProviderIdFromModel } from '../config/provider-model.ts';
+import { getProviderIdFromModel } from '@pellux/goodvibes-sdk/platform/providers';
 import { describeConfiguredEffort } from '../providers/reasoning-effort-surface.ts';
-import type { CliCommandOutput } from './types.ts';
-import type { GoodVibesCliOutputFormat } from './types.ts';
+import type { CliCommandOutput } from '@pellux/goodvibes-terminal-shell';
+import type { GoodVibesCliOutputFormat } from '@pellux/goodvibes-terminal-shell';
 import { buildHooksValidation } from './hooks-report.ts';
 
 // ---------------------------------------------------------------------------

package/src/cli/entrypoint.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { ConfigManager } from '../config/index.ts';
-import { formatProviderModel, getModelIdFromProviderModel, getProviderIdFromModel } from '../config/provider-model.ts';
+import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import { formatProviderModel, getModelIdFromProviderModel, getProviderIdFromModel } from '@pellux/goodvibes-sdk/platform/providers';
 import { readOnboardingCheckMarkers } from '../runtime/onboarding/index.ts';
 import { GlobalNetworkTransportInstaller } from '@/runtime/index.ts';
 import { createShellPathService } from '@/runtime/index.ts';
@@ -25,14 +25,15 @@ import {
 } from './index.ts';
 import { buildCliServicePosture, getGoodVibesPackageRoot, resolveGoodVibesDaemonExecutable } from './service-posture.ts';
 import { runInstallSelfCheck } from '../runtime/install-self-check.ts';
-import { readPersistedWorkspaceTrust } from '../runtime/trust/workspace-trust.ts';
-import { WorkspaceRegistrationManager } from '../runtime/trust/workspace-registration.ts';
+import { readPersistedWorkspaceTrust } from '@pellux/goodvibes-sdk/platform/runtime/operations';
+import { WorkspaceRegistrationManager } from '@pellux/goodvibes-sdk/platform/runtime/operations';
 import type { CliWorkspaceStatus, CliSandboxStatus, CliRelayStatus } from './status.ts';
 import { detectSandboxAvailability, probeSandboxHost } from '@pellux/goodvibes-sdk/platform/tools/exec/sandbox';
 import { createFeatureFlagManager, deriveFeatureStates } from '@/runtime/index.ts';
 import { ensureGoodvibesGitignore } from './ensure-goodvibes-gitignore.ts';
 import { runDaemonConfigMigration } from '../config/run-daemon-config-migration.ts';
 import { describeDaemonConfigMigration } from '@pellux/goodvibes-sdk/platform/config';
+import { GOODVIBES_TUI_SURFACE_ROOT } from '../config/surface.ts';
 
 type ShellEntrypointOwnership = {
   readonly workingDirectory: string;
@@ -97,8 +98,12 @@ export async function prepareShellCliRuntime(
   }
 
   if (cli.command === 'serve') {
-    await import('../daemon/cli.ts');
-    return new Promise<PreparedShellCliRuntime>(() => {});
+    // The daemon is its own product and its own binary. This app is a client:
+    // it never hosts one, so `serve` names something it cannot do. Say which
+    // command to run instead rather than starting a daemon that would be a
+    // second, drifting copy of the real one.
+    console.error('`goodvibes serve` is gone: the daemon is a separate program now. Run `goodvibes-daemon serve` (installed alongside this app), or `goodvibes service start` to start the installed service.');
+    process.exit(2);
   }
 
   const {
@@ -180,7 +185,7 @@ export async function prepareShellCliRuntime(
     // Read-only workspace posture for the report: the trust reader never
     // persists (no grandfathering side effect), and registration resolve() is
     // read-only, so `status`/`doctor` observe state without mutating it.
-    const trustView = readPersistedWorkspaceTrust(shellPaths);
+    const trustView = readPersistedWorkspaceTrust(shellPaths, GOODVIBES_TUI_SURFACE_ROOT);
     const registrationEvaluation = await new WorkspaceRegistrationManager({ shellPaths }).evaluate();
     const workspaceStatus: CliWorkspaceStatus = {
       trustLevel: trustView.level,

package/src/cli/help.ts

@@ -58,7 +58,6 @@ export function renderGoodVibesHelp(binary = 'goodvibes'): string {
     'Commands:',
     '  tui [path]                 Start the interactive TUI (default)',
     '  run|exec [prompt]          Run non-interactively with text/json/stream-json output',
-    '  serve|daemon               Start the daemon/API host',
     '  web                        Show browser surface bind URL and enablement',
     '  service                    Inspect/manage daemon service lifecycle',
     '  status                     Print config, provider, service, and onboarding posture',
@@ -134,7 +133,7 @@ export function renderGoodVibesHelp(binary = 'goodvibes'): string {
     `  ${binary} control-plane status`,
     `  ${binary} subscription providers`,
     `  ${binary} subscription login openai start --open`,
-    `  ${binary} serve --hostname 0.0.0.0 --port 3421`,
+    `  goodvibes-daemon --hostname 0.0.0.0 --port 3421`,
   ].join('\n');
 }
 
@@ -247,9 +246,9 @@ const COMMAND_HELP: Record<string, CommandHelp> = {
     examples: ['completion bash', 'completion zsh'],
   },
   serve: {
-    usage: ['serve [--hostname <host>] [--port <port>]', 'daemon [--hostname <host>] [--port <port>]'],
-    summary: 'Start the headless GoodVibes daemon/API host.',
-    examples: ['serve', 'serve --hostname 0.0.0.0 --port 3421'],
+    usage: ['serve'],
+    summary: 'Not served here: the daemon is its own program. Run `goodvibes-daemon` (or manage the installed service with `goodvibes service`).',
+    examples: [],
   },
   remote: {
     usage: ['remote', 'bridge'],

package/src/cli/hooks-command.ts

@@ -1,5 +1,5 @@
 import { buildHooksValidation } from './hooks-report.ts';
-import type { CliCommandOutput, CliCommandRuntime } from './types.ts';
+import type { CliCommandOutput, CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
 
 // ---------------------------------------------------------------------------
 // `goodvibes hooks validate` — validate the user's hooks.json against the

package/src/cli/index.ts

@@ -1,10 +1,7 @@
-export * from './types.ts';
-export * from './parser.ts';
+export * from '@pellux/goodvibes-terminal-shell';
 export * from './help.ts';
 export * from './status.ts';
 export * from './completion.ts';
-export * from './config-overrides.ts';
-export * from './endpoints.ts';
 export * from './surface-command.ts';
 export * from './service-command.ts';
 export * from './bundle-command.ts';

package/src/cli/launch-auto-update.ts

@@ -3,7 +3,7 @@
  * an installed binary never drifts behind. At TUI launch (before any runtime
  * bootstrap or terminal mode change) this runs a quick version check and, when
  * a newer release exists, installs it through the SAME checksum-verified
- * download/verify/swap path `/update apply` and scripts/install.sh use
+ * download/verify/swap path `/update apply` and the suite installer use
  * (src/input/commands/update-runtime.ts — there is deliberately no second
  * updater), then asks the caller to restart onto the new binary.
  *
@@ -44,7 +44,9 @@ import {
   type ApplyUpdateOptions,
 } from '../input/commands/update-runtime.ts';
 import { readUpdateSettings, type UpdateSettings } from '../config/tui-extension-settings.ts';
-import type { ConfigManager } from '../config/index.ts';
+import { runDaemonHandover, type DaemonHandoverOutcome } from '@pellux/goodvibes-sdk/platform/runtime/client';
+import { resolveGoodVibesDaemonExecutable } from './service-posture.ts';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import { VERSION } from '../version.ts';
 
 /**
@@ -217,19 +219,21 @@ export interface SelfUpdateAtLaunchParams {
  */
 export async function selfUpdateAtLaunch(params: SelfUpdateAtLaunchParams): Promise<readonly string[]> {
   const lines: string[] = [];
+  const print = (line: string): void => {
+    lines.push(line);
+    params.stdout.write(`${line}\n`);
+  };
+  const settings = readUpdateSettings(params.configManager);
   const outcome = await runLaunchAutoUpdate({
     fetchImpl: fetch as UpdateFetchLike,
     execPath: process.execPath,
     platform: process.platform,
     arch: process.arch,
     currentVersion: VERSION,
-    settings: readUpdateSettings(params.configManager),
+    settings,
     env: process.env,
     configManager: params.configManager,
-    print: (line) => {
-      lines.push(line);
-      params.stdout.write(`${line}\n`);
-    },
+    print,
   });
   if (outcome.action === 'restart') {
     process.exit(
@@ -241,9 +245,57 @@ export async function selfUpdateAtLaunch(params: SelfUpdateAtLaunchParams): Prom
       }),
     );
   }
+  // Runs AFTER the restart branch, so on a launch that updated this binary the
+  // handover happens in the restarted process rather than in one that is about
+  // to be replaced.
+  await handDaemonOverAtLaunch({ configManager: params.configManager, settings, print });
   return lines;
 }
 
+export interface HandDaemonOverAtLaunchParams {
+  readonly configManager: Pick<ConfigManager, 'get'>;
+  readonly settings: UpdateSettings;
+  readonly print: (line: string) => void;
+}
+
+/**
+ * The launch wiring for the old→new daemon handover (src/runtime/daemon-handover.ts).
+ *
+ * A daemon binary from before the split cannot update itself onto its own
+ * release line — the releases URL baked into it names this repository, which no
+ * longer builds daemons, and pointing it at the daemon's repository instead
+ * still fails because its shipped updater insists on downloading the terminal
+ * binary beside it, which that repository does not publish. So the terminal
+ * hands it over directly, once, and the path goes quiet afterwards.
+ *
+ * Gated on the SAME `update.autoUpdateAtLaunch` setting as this binary's own
+ * launch update: that setting is the operator's "do not swap binaries while I
+ * am starting up" answer, and it means the same thing for the daemon installed
+ * beside this one. No second switch is introduced for one migration.
+ *
+ * Only a binary install acts. A source or package-managed terminal has no
+ * business replacing a daemon binary on the host it happens to be running on.
+ */
+export async function handDaemonOverAtLaunch(
+  params: HandDaemonOverAtLaunchParams,
+): Promise<DaemonHandoverOutcome> {
+  if (!(params.settings.autoUpdateAtLaunch ?? true)) {
+    return { action: 'skipped', reason: 'disabled' };
+  }
+  if (detectInstallKind(process.execPath) !== 'binary') {
+    return { action: 'skipped', reason: 'not-swappable-install' };
+  }
+  const resolved = resolveGoodVibesDaemonExecutable();
+  return await runDaemonHandover({
+    fetchImpl: fetch as UpdateFetchLike,
+    binaryPath: resolved.absolute ? resolved.command : null,
+    platform: process.platform,
+    arch: process.arch,
+    configManager: params.configManager,
+    print: params.print,
+  });
+}
+
 export interface RestartOntoUpdatedBinaryOptions {
   readonly execPath: string;
   readonly argv: readonly string[];

package/src/cli/management-commands.ts

@@ -6,13 +6,13 @@ import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } fro
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
 import { inspectProviderAuth } from '@/runtime/index.ts';
 import { generateQrMatrix, renderQrToString, PAIRING_HANDOFF_OFFER_KINDS, type PairingHandoffOfferKind } from '@pellux/goodvibes-sdk/platform/pairing';
-import { ensurePublicBaseUrl } from '../core/pairing-origin.ts';
-import { formatPairingOffers, formatPostureCapabilities, pairingPostureNotice } from '../core/pairing-offers.ts';
-import { defaultPairingTokenName } from '../core/pairing-handoff.ts';
-import { stableUrlHostForBindHost } from '../core/stable-host.ts';
-import { formatRuntimeEndpointBinding, resolveRuntimeEndpointBinding } from './endpoints.ts';
+import { ensurePublicBaseUrl } from '@pellux/goodvibes-sdk/platform/pairing';
+import { formatPairingOffers, formatPostureCapabilities, pairingPostureNotice } from '@pellux/goodvibes-sdk/platform/pairing';
+import { defaultPairingTokenName } from '@pellux/goodvibes-sdk/platform/pairing';
+import { stableUrlHostForBindHost } from '@pellux/goodvibes-sdk/platform/pairing';
+import { formatRuntimeEndpointBinding, resolveRuntimeEndpointBinding } from '@pellux/goodvibes-terminal-shell';
 import { classifyBindPosture, isNetworkFacing } from './network-posture.ts';
-import type { CliCommandRuntime } from './types.ts';
+import type { CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
 import type { RuntimeServices } from '../runtime/services.ts';
 import { extractAuthorizationCode, formatJsonOrText, hasCommandFlag, openBrowser, probeTcp, readAuthPaths, readOptionValue, runNonInteractiveAgent, withRuntimeServices, yesNo } from './management-utils.ts';
 

package/src/cli/management-utils.ts

@@ -18,7 +18,7 @@ import { join } from 'node:path';
 import net from 'node:net';
 import { spawn } from 'node:child_process';
 import { networkInterfaces } from 'node:os';
-import type { ConfigManager, GoodVibesConfig } from '../config/index.ts';
+import type { ConfigManager, GoodVibesConfig } from '@pellux/goodvibes-sdk/platform/config';
 import { bootstrapRuntime } from '../runtime/bootstrap.ts';
 import { refreshMemoryRecallSnapshot } from '../runtime/orchestrator-core-services.ts';
 import { createRuntimeServices } from '../runtime/services.ts';
@@ -26,10 +26,10 @@ import { createRuntimeStore } from '../runtime/store/index.ts';
 import type { RuntimeServices } from '../runtime/services.ts';
 import { RuntimeEventBus, type TurnEvent, createShellPathService, configureRuntimeEventBusDefaults, runtimeEventBusOptionsFrom } from '@/runtime/index.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
-import { resolveRuntimeEndpointBinding } from './endpoints.ts';
-import { applyRuntimeEndpointFlagOverrides } from './config-overrides.ts';
-import type { RuntimeEndpointId } from './endpoints.ts';
-import type { CliCommandRuntime, GoodVibesCliParseResult } from './types.ts';
+import { resolveRuntimeEndpointBinding } from '@pellux/goodvibes-terminal-shell';
+import { applyRuntimeEndpointFlagOverrides } from '@pellux/goodvibes-terminal-shell';
+import type { RuntimeEndpointId } from '@pellux/goodvibes-terminal-shell';
+import type { CliCommandRuntime, GoodVibesCliParseResult } from '@pellux/goodvibes-terminal-shell';
 import { openBrowser as _openBrowser } from '../utils/browser.ts';
 
 type Formatter = (value: unknown, text: string) => string;

package/src/cli/management.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname } from 'node:path';
-import type { ConfigManager, ConfigKey, GoodVibesConfig } from '../config/index.ts';
-import { CONFIG_SCHEMA } from '../config/index.ts';
-import { formatProviderModel, getModelIdFromProviderModel } from '../config/provider-model.ts';
+import type { ConfigManager, ConfigKey, GoodVibesConfig } from '@pellux/goodvibes-sdk/platform/config';
+import { CONFIG_SCHEMA } from '@pellux/goodvibes-sdk/platform/config';
+import { formatProviderModel, getModelIdFromProviderModel } from '@pellux/goodvibes-sdk/platform/providers';
 import { SecretsManager } from '../config/secrets.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers';
@@ -11,12 +11,12 @@ import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, r
 import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
 import { inspectProviderAuth } from '@/runtime/index.ts';
-import type { CliCommandRuntime, GoodVibesCliParseResult } from './types.ts';
+import type { CliCommandRuntime, GoodVibesCliParseResult } from '@pellux/goodvibes-terminal-shell';
 import { formatProviderAuthRoute, summarizeProviderAuthRoutes } from './provider-auth-routes.ts';
 import { classifyProviderSetup } from '../providers/provider-classification.ts';
-import { resolveRuntimeEndpointBinding } from './endpoints.ts';
-import { applyRuntimeEndpointFlagOverrides } from './config-overrides.ts';
-import type { RuntimeEndpointId } from './endpoints.ts';
+import { resolveRuntimeEndpointBinding } from '@pellux/goodvibes-terminal-shell';
+import { applyRuntimeEndpointFlagOverrides } from '@pellux/goodvibes-terminal-shell';
+import type { RuntimeEndpointId } from '@pellux/goodvibes-terminal-shell';
 import { handleServiceCommand } from './service-command.ts';
 import { handleBundleCommand } from './bundle-command.ts';
 import { handleHooksCommand } from './hooks-command.ts';

package/src/cli/network-posture.ts

@@ -1,4 +1,4 @@
-import type { RuntimeEndpointBinding } from './endpoints.ts';
+import type { RuntimeEndpointBinding } from '@pellux/goodvibes-terminal-shell';
 
 export type BindPostureKind = 'local' | 'local-network' | 'custom-network';
 

package/src/cli/package-verification.ts

@@ -3,7 +3,7 @@ import { existsSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 
 export interface PackageCliBinVerification {
-  readonly command: 'goodvibes' | 'goodvibes-daemon';
+  readonly command: 'goodvibes';
   readonly target: string;
   readonly exists: boolean;
   readonly executable: boolean;
@@ -27,15 +27,16 @@ export interface PackageCliVerificationReport {
   readonly issues: readonly string[];
 }
 
-const REQUIRED_BIN_COMMANDS = ['goodvibes', 'goodvibes-daemon'] as const;
+// One bin, one entry point. The daemon ships as its own package with its own
+// binary; this package carrying a second wrapper is what let two daemons exist
+// on one machine, built from one tree and drifting apart.
+const REQUIRED_BIN_COMMANDS = ['goodvibes'] as const;
 const REQUIRED_TARBALL_PATHS = [
   'README.md',
   'CHANGELOG.md',
   'package.json',
   'src/main.ts',
-  'src/daemon/cli.ts',
   'bin/goodvibes',
-  'bin/goodvibes-daemon',
   'scripts/check-bun.sh',
   'scripts/postinstall.js',
   '.goodvibes/GOODVIBES.md',
@@ -53,8 +54,8 @@ function hasExecutableBit(path: string): boolean {
 function verifyBin(root: string, command: typeof REQUIRED_BIN_COMMANDS[number], target: string | undefined): PackageCliBinVerification {
   const binPath = target ? join(root, target) : '';
   const source = target && existsSync(binPath) ? readFileSync(binPath, 'utf-8') : '';
-  const expectedLocalBuild = command === 'goodvibes' ? "dist', 'goodvibes'" : "dist', 'goodvibes-daemon'";
-  const expectedSource = command === 'goodvibes' ? "src', 'main.ts'" : "src', 'daemon', 'cli.ts'";
+  const expectedLocalBuild = "dist', 'goodvibes'";
+  const expectedSource = "src', 'main.ts'";
   return {
     command,
     target: target ?? '',

package/src/cli/plugin-bundles-command.ts

@@ -11,7 +11,7 @@ import {
   type BundleActivationPlan,
 } from '@pellux/goodvibes-sdk/platform/runtime/ecosystem';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
-import type { CliCommandOutput, CliCommandRuntime } from './types.ts';
+import type { CliCommandOutput, CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
 
 // ---------------------------------------------------------------------------
 // `goodvibes plugin bundles browse|install|list` — the capability-bundle

package/src/cli/plugin-command.ts

@@ -1,10 +1,10 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { tmpdir } from 'node:os';
-import { discoverPlugins } from '../plugins/loader.ts';
+import { discoverPlugins } from '@pellux/goodvibes-sdk/platform/plugins';
 import { validateManifestV2 } from '@/runtime/index.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
-import type { CliCommandOutput, CliCommandRuntime } from './types.ts';
+import type { CliCommandOutput, CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
 import { handlePluginBundlesCommand } from './plugin-bundles-command.ts';
 
 // ---------------------------------------------------------------------------

package/src/cli/service-command.ts

@@ -1,7 +1,7 @@
 import { mkdirSync } from 'node:fs';
-import type { CliCommandRuntime } from './types.ts';
+import type { CliCommandRuntime } from '@pellux/goodvibes-terminal-shell';
 import { buildCliServicePosture, createPlatformServiceManager, formatCliServicePosture, getServiceStateRoot } from './service-posture.ts';
-import type { CliCommandOutput } from './types.ts';
+import type { CliCommandOutput } from '@pellux/goodvibes-terminal-shell';
 
 function enableServicePosture(runtime: CliCommandRuntime): void {
   runtime.configManager.setDynamic('service.enabled', true);