mirror of
https://github.com/cline/cline.git
synced 2026-10-25 10:26:36 +08:00
* Let hosts choose the hub daemon launcher and defer spawn-only setup Adds setHubDaemonLauncher so an embedding process can start the hub daemon through a bundled Cline CLI instead of its own executable, and a beforeSpawn hook on ensureDetachedHubServer that only runs when a new daemon is actually started. * Add programmatic options to cline hub ensure hub ensure/start gain --json (URL + auth token), --allow-port-fallback, --no-connectors and --login-shell-path, and the hub command accepts --discovery-path for a dedicated discovery record. These let the desktop app and SSH remotes start or reuse a hub through the CLI. Also extracts the standalone binary compile step into script/compile-binary.ts so other packages can build the CLI binary. * Run SSH remote hubs through the Cline CLI SSH remotes now upload the Cline CLI binary and start or reuse the remote hub with 'cline hub ensure --json --discovery-path ...', stopping it with 'cline hub stop'. The dedicated remote helper entrypoint is removed; cleanup records from older releases still stop through the old flag. * Run the desktop backend on the bundled Cline CLI The desktop app no longer compiles its own executable. It bundles the self-contained Cline CLI (externalBin cline-cli) plus the backend as a JS bundle that runs on the CLI's embedded runtime. At startup the backend has the CLI run 'hub ensure', which reuses a compatible healthy Hub or starts one, and any Hub it starts later also goes through the CLI binary. Linux CLI copies are bundled for SSH remotes. * Launch the desktop backend through the bundled Cline CLI The Tauri shell resolves the bundled cline-cli and the backend bundle (per-platform resource layouts) and starts 'cline-cli run' on it. The Windows installer stops users of cline-cli.exe, and also stops and removes the backend executable of earlier releases on upgrade. * Recognize the CLI-hosted desktop backend in cline doctor --fix * Update desktop publish workflow and docs for the bundled Cline CLI Telemetry selfchecks and smoke tests run the backend bundle on the bundled CLI, and the Windows signature gate verifies cline-cli.exe. * fix(desktop): address runtime packaging review findings * fix(desktop): preserve failed hub cleanup and handle exited daemons * fix(hub): distinguish missing discovery records from read failures * fix(hub): preserve discovery recovery while enforcing strict shutdown reads * fix(cli): do not count hub commands as CLI activations (#14870) * fix(cli): do not count hub commands as CLI activations The desktop app runs `cline-cli hub ensure` on every launch and the SSH remote flow runs `cline hub ensure` on every connect. Both went through runCli(), which captured user.extension_activated unconditionally, so each desktop launch was double-counted as a CLI activation and every SSH remote host (with its own distinct id) showed up as a new CLI user. Skip the activation capture for the hub subcommand; it is plumbing other clients invoke, not a user activation. Hub-owned task telemetry is unaffected since the daemon path never enters runCli(). * test(cli): clear the hub command mock between main.test.ts cases * test(cli): stop stubbing the hub command module in main.test.ts The module-wide vi.mock("./commands/hub") replaced createHubCommand with a no-op, so `cline hub dashboard` (routed through createHubCommand) never reached the dashboard mock and three dashboard tests failed. Drop the module mock and assert the activation exclusion through `hub dashboard --no-open`, which is already mocked. --------- Co-authored-by: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com>
163 lines
5.1 KiB
TypeScript
163 lines
5.1 KiB
TypeScript
import {
|
|
chmodSync,
|
|
copyFileSync,
|
|
existsSync,
|
|
mkdirSync,
|
|
readFileSync,
|
|
realpathSync,
|
|
rmSync,
|
|
} from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { dirname, join, relative, resolve } from "node:path";
|
|
import { $ } from "bun";
|
|
|
|
const cliDir = resolve(import.meta.dir, "..");
|
|
const rootDir = resolve(cliDir, "../..");
|
|
|
|
// Telemetry / OTEL environment variables that should be baked into the
|
|
// compiled binary at build time. Mirrors the list of secrets injected by the
|
|
// `cli-publish` GitHub Actions workflow. These are inlined via Bun's `define`
|
|
// so the CLI ships with the production telemetry configuration without
|
|
// requiring the end user to set any env vars.
|
|
const BUILD_TIME_INLINED_ENV_VARS = [
|
|
"TELEMETRY_SERVICE_API_KEY",
|
|
"ERROR_SERVICE_API_KEY",
|
|
"OTEL_TELEMETRY_ENABLED",
|
|
"OTEL_LOGS_EXPORTER",
|
|
"OTEL_METRICS_EXPORTER",
|
|
"OTEL_TRACES_EXPORTER",
|
|
"CLINE_TRACE_SAMPLE_PERCENT",
|
|
"CLINE_TRACE_RECORD_CONTENT",
|
|
"OTEL_EXPORTER_OTLP_PROTOCOL",
|
|
"OTEL_EXPORTER_OTLP_ENDPOINT",
|
|
"OTEL_EXPORTER_OTLP_HEADERS",
|
|
] as const;
|
|
|
|
function buildInlinedEnvDefines(): Record<string, string> {
|
|
const defines: Record<string, string> = {};
|
|
for (const name of BUILD_TIME_INLINED_ENV_VARS) {
|
|
defines[`process.env.${name}`] = JSON.stringify(process.env[name] ?? "");
|
|
}
|
|
return defines;
|
|
}
|
|
|
|
function findOpenTuiParserWorker(): string {
|
|
const localPath = resolve(
|
|
cliDir,
|
|
"node_modules/@opentui/core/parser.worker.js",
|
|
);
|
|
const rootPath = resolve(
|
|
rootDir,
|
|
"node_modules/@opentui/core/parser.worker.js",
|
|
);
|
|
const parserWorkerPath = existsSync(localPath) ? localPath : rootPath;
|
|
return realpathSync(parserWorkerPath);
|
|
}
|
|
|
|
export function readOpenTuiVersion(): string | undefined {
|
|
const pkg = JSON.parse(readFileSync(join(cliDir, "package.json"), "utf-8"));
|
|
return pkg.dependencies?.["@opentui/core"];
|
|
}
|
|
|
|
/**
|
|
* Bun only has the host platform's OpenTUI native package by default, and a
|
|
* cross-compiled build cannot resolve the FFI layer without the target's.
|
|
* Installs every platform variant of the pinned version.
|
|
*/
|
|
export async function installOpenTuiNativeVariants(): Promise<void> {
|
|
const opentuiVersion = readOpenTuiVersion();
|
|
if (!opentuiVersion) {
|
|
return;
|
|
}
|
|
console.log(
|
|
`Installing all platform variants of @opentui/core@${opentuiVersion}...`,
|
|
);
|
|
await $`bun install --no-save --os="*" --cpu="*" @opentui/core@${opentuiVersion}`.cwd(
|
|
cliDir,
|
|
);
|
|
}
|
|
|
|
export interface CompileCliBinaryOptions {
|
|
bunTarget: Bun.Build.CompileTarget;
|
|
outfile: string;
|
|
/** Runtime flags baked into the executable, e.g. `--use-system-ca`. */
|
|
execArgv?: string[];
|
|
/**
|
|
* Read `.env` / `bunfig.toml` from the launch directory before the CLI
|
|
* starts. Bun's default; binaries launched in directories the user did not
|
|
* pick (an SSH home, a GUI app's cwd) should turn this off.
|
|
*/
|
|
autoloadLaunchDirectoryConfig?: boolean;
|
|
}
|
|
|
|
/** Compiles the CLI entrypoint into one self-contained executable. */
|
|
export async function compileCliBinary(
|
|
input: CompileCliBinaryOptions,
|
|
): Promise<void> {
|
|
const parserWorker = findOpenTuiParserWorker();
|
|
const targetOs = input.bunTarget.includes("windows") ? "windows" : "posix";
|
|
const bunfsRoot = targetOs === "windows" ? "B:/~BUN/root/" : "/$bunfs/root/";
|
|
const parserWorkerPath = relative(rootDir, parserWorker).replaceAll(
|
|
"\\",
|
|
"/",
|
|
);
|
|
|
|
// Build to /tmp first so Bun's temp-file rename stays on one filesystem
|
|
// layer in containerized environments (virtiofs, overlayfs).
|
|
const entrypoint = join(cliDir, "src/index.ts");
|
|
const scratchRoot = process.platform === "win32" ? tmpdir() : "/tmp";
|
|
const tmpDir = join(
|
|
scratchRoot,
|
|
`cline-build-${input.bunTarget}-${process.pid}`,
|
|
);
|
|
const tmpOutfile = join(
|
|
tmpDir,
|
|
input.outfile.endsWith(".exe") ? "cline.exe" : "cline",
|
|
);
|
|
mkdirSync(tmpDir, { recursive: true });
|
|
|
|
const previousCwd = process.cwd();
|
|
process.chdir(scratchRoot);
|
|
let result: Awaited<ReturnType<typeof Bun.build>>;
|
|
try {
|
|
const autoload = input.autoloadLaunchDirectoryConfig !== false;
|
|
result = await Bun.build({
|
|
entrypoints: [entrypoint, parserWorker],
|
|
splitting: true,
|
|
compile: {
|
|
target: input.bunTarget,
|
|
outfile: tmpOutfile,
|
|
// Plugins import SDK packages from disk at runtime; let Bun resolve
|
|
// their package exports without falling back to transpiling the SDK.
|
|
autoloadPackageJson: true,
|
|
...(input.execArgv?.length ? { execArgv: input.execArgv } : {}),
|
|
...(autoload ? {} : { autoloadDotenv: false, autoloadBunfig: false }),
|
|
},
|
|
minify: true,
|
|
external: ["@anthropic-ai/vertex-sdk"],
|
|
define: {
|
|
OTUI_TREE_SITTER_WORKER_PATH: bunfsRoot + parserWorkerPath,
|
|
// Inline telemetry/OTEL env vars at build time so the compiled
|
|
// binary ships with production telemetry configuration baked in.
|
|
...buildInlinedEnvDefines(),
|
|
},
|
|
throw: false,
|
|
});
|
|
} finally {
|
|
process.chdir(previousCwd);
|
|
}
|
|
|
|
if (!result.success) {
|
|
for (const log of result.logs) {
|
|
console.error(log);
|
|
}
|
|
rmSync(tmpDir, { recursive: true, force: true });
|
|
throw new Error(`CLI build failed for ${input.bunTarget}`);
|
|
}
|
|
|
|
mkdirSync(dirname(input.outfile), { recursive: true });
|
|
copyFileSync(tmpOutfile, input.outfile);
|
|
chmodSync(input.outfile, 0o755);
|
|
rmSync(tmpDir, { recursive: true, force: true });
|
|
}
|