@getrift/rift 0.1.0-beta.2 → 0.1.0-beta.21

package/dist/src/cli/commands/menubar.js

@@ -0,0 +1,388 @@
+/**
+ * `rift menubar install` — install/refresh the SwiftBar heartbeat plugin AND
+ * make it actually visible.
+ *
+ * The menu surface lives in `operator/swiftbar/` because it is a tiny
+ * operator-adjacent script, but beta users should not have to symlink repo
+ * paths by hand. This command links the packaged wrapper into SwiftBar's
+ * plugin folder. The wrapper follows the symlink back to the package so the
+ * renderer beside it updates whenever `npm install -g @getrift/rift@beta`
+ * replaces the package on disk.
+ *
+ * Dropping the plugin file is necessary but NOT sufficient for the icon to
+ * appear (this was the beta.20 first-run bug): SwiftBar is a separate app, and
+ * if it is not installed, or installed but never launched, the friend sees
+ * nothing. So this command now also:
+ *   1. resolves SwiftBar's REAL plugin directory (`defaults read … PluginDirectory`)
+ *      and installs into it, configuring the default the first time so a fresh
+ *      SwiftBar reads our plugin instead of prompting the user to pick a folder;
+ *   2. launches (or refreshes) SwiftBar when the app is present, so the icon
+ *      shows without a second manual step;
+ *   3. when SwiftBar is missing, returns a structured, non-fatal recovery
+ *      action (`brew install --cask swiftbar`, or a direct download) instead of
+ *      silently "succeeding" with no visible menu.
+ *
+ * Every system side effect (reading/writing SwiftBar defaults, launching the
+ * app, detecting Homebrew) goes through an injectable `MenuBarHost` so the
+ * behavior is unit-testable without touching the real machine.
+ */
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { Command } from "commander";
+import { printError, printJson, printText } from "../output.js";
+export const SWIFTBAR_PLUGIN_NAME = "rift.10s.sh";
+export const SWIFTBAR_RENDERER_NAME = "render-menu.py";
+/** SwiftBar's macOS preferences domain (used for `defaults` reads/writes). */
+export const SWIFTBAR_DEFAULTS_DOMAIN = "com.ameba.SwiftBar";
+const SWIFTBAR_DOWNLOAD_URL = "https://swiftbar.app";
+export function makeMenuBarCommand() {
+    const cmd = new Command("menubar").description("Install and manage the Rift menu bar");
+    cmd
+        .command("install")
+        .description("Install or refresh the SwiftBar menu plugin")
+        .option("--plugin-dir <path>", "Override SwiftBar's plugin directory")
+        .option("--copy", "Copy scripts instead of symlinking to the packaged files")
+        .option("--yes", "Non-interactive install; accepted for install scripts")
+        .action((opts, command) => {
+        const globalOpts = command.optsWithGlobals();
+        let result;
+        try {
+            const installOpts = {};
+            if (opts.pluginDir)
+                installOpts.pluginDir = opts.pluginDir;
+            if (opts.copy !== undefined)
+                installOpts.copy = opts.copy;
+            result = installMenuBar(installOpts);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            if (globalOpts.json) {
+                printJson({ ok: false, error: message });
+            }
+            else {
+                printError(`Menu bar install failed: ${message}`);
+            }
+            process.exitCode = 1;
+            return;
+        }
+        if (globalOpts.json) {
+            printJson(result);
+        }
+        else {
+            for (const line of result.transcript)
+                printText(line);
+        }
+        if (!result.ok)
+            process.exitCode = result.skipped ? 0 : 1;
+    });
+    return cmd;
+}
+export function defaultSwiftBarPluginDir(homeDir = os.homedir()) {
+    return path.join(homeDir, "Library", "Application Support", "SwiftBar", "Plugins");
+}
+export function installMenuBar(opts = {}) {
+    const platform = opts.platform ?? process.platform;
+    const homeDir = opts.homeDir ?? os.homedir();
+    const host = opts.host ?? defaultMenuBarHost(homeDir);
+    if (platform !== "darwin") {
+        const reason = "SwiftBar menu is macOS-only.";
+        const pluginDir = path.resolve(opts.pluginDir ?? process.env.RIFT_SWIFTBAR_PLUGIN_DIR ?? defaultSwiftBarPluginDir(homeDir));
+        return {
+            ok: true,
+            skipped: true,
+            reason,
+            pluginDir,
+            pluginPath: path.join(pluginDir, SWIFTBAR_PLUGIN_NAME),
+            sourceDir: null,
+            sourcePath: null,
+            rendererPath: null,
+            mode: null,
+            backupPath: null,
+            swiftBarDetected: false,
+            swiftBarOpened: false,
+            pluginDirSource: "default",
+            menuVisible: false,
+            recovery: null,
+            transcript: [`Menu bar skipped: ${reason}`],
+        };
+    }
+    const swiftBarApp = host.findSwiftBarApp();
+    const swiftBarDetected = swiftBarApp !== null;
+    // --- Resolve the plugin directory SwiftBar actually reads from ---
+    // Precedence: an explicit override (operator/test) wins; otherwise honor
+    // SwiftBar's own configured directory; otherwise fall back to the default
+    // and, when SwiftBar is present but unconfigured, persist that default so a
+    // fresh SwiftBar loads our plugin instead of prompting for a folder.
+    const explicitDir = opts.pluginDir ?? process.env.RIFT_SWIFTBAR_PLUGIN_DIR ?? null;
+    let pluginDirSource;
+    let resolvedDir;
+    if (explicitDir) {
+        resolvedDir = explicitDir;
+        pluginDirSource = "override";
+    }
+    else {
+        const configured = swiftBarDetected ? host.readPluginDirectory() : null;
+        if (configured) {
+            resolvedDir = configured;
+            pluginDirSource = "configured";
+        }
+        else {
+            resolvedDir = defaultSwiftBarPluginDir(homeDir);
+            // Only write SwiftBar's default when the app is present but has no
+            // directory yet — never clobber a folder the user already chose.
+            if (swiftBarDetected && host.writePluginDirectory(resolvedDir)) {
+                pluginDirSource = "default-written";
+            }
+            else {
+                pluginDirSource = "default";
+            }
+        }
+    }
+    const pluginDir = path.resolve(resolvedDir);
+    const pluginPath = path.join(pluginDir, SWIFTBAR_PLUGIN_NAME);
+    const transcript = [];
+    const sourceDir = path.resolve(opts.sourceDir ??
+        path.join(opts.packageRoot ?? findPackageRoot(), "operator", "swiftbar"));
+    const sourcePath = path.join(sourceDir, SWIFTBAR_PLUGIN_NAME);
+    const rendererPath = path.join(sourceDir, SWIFTBAR_RENDERER_NAME);
+    assertReadableFile(sourcePath, "SwiftBar wrapper");
+    assertReadableFile(rendererPath, "SwiftBar renderer");
+    fs.mkdirSync(pluginDir, { recursive: true });
+    let backupPath = null;
+    const mode = opts.copy ? "copy" : "symlink";
+    if (mode === "symlink") {
+        backupPath = replaceExistingPlugin(pluginPath, sourcePath, opts.now);
+        fs.symlinkSync(sourcePath, pluginPath);
+    }
+    else {
+        backupPath = replaceExistingPlugin(pluginPath, sourcePath, opts.now);
+        fs.copyFileSync(sourcePath, pluginPath);
+        fs.copyFileSync(rendererPath, path.join(pluginDir, SWIFTBAR_RENDERER_NAME));
+        fs.chmodSync(pluginPath, 0o755);
+    }
+    transcript.push("Menu bar installed.");
+    // --- Make it visible: launch/refresh SwiftBar, or hand back a recovery ---
+    // Invariant: when `menuVisible` is false on a non-skipped install, `recovery`
+    // is ALWAYS non-null. Callers (postinstall, update) branch on that, so a
+    // launch/config failure can never be laundered into a silent "installed".
+    let swiftBarOpened = false;
+    let menuVisible = false;
+    let recovery = null;
+    if (!swiftBarDetected) {
+        recovery = buildRecovery(host.hasHomebrew());
+        transcript.push("SwiftBar is not installed — it is the free app that draws Rift's menu bar icon.");
+        transcript.push(`  ${recovery}`);
+    }
+    else if (pluginDirSource === "default") {
+        // SwiftBar is present but we could NOT tell it which folder to scan: it had
+        // no PluginDirectory configured and `defaults write` failed. Launching it
+        // now would just prompt the user to pick a folder, so the icon is not
+        // reliably shown. Be honest — attempt the launch, but report not-visible
+        // with the one manual step (point SwiftBar at our folder).
+        const wasRunning = host.isSwiftBarRunning();
+        swiftBarOpened = host.openSwiftBar(wasRunning);
+        recovery =
+            "SwiftBar could not be pointed at Rift's plugin folder automatically. " +
+                `Open SwiftBar's preferences and set the plugin folder to ${pluginDir}, ` +
+                "then re-run: rift menubar install";
+        transcript.push("SwiftBar is installed, but Rift could not set its plugin folder automatically.");
+        transcript.push(`  ${recovery}`);
+    }
+    else {
+        const wasRunning = host.isSwiftBarRunning();
+        swiftBarOpened = host.openSwiftBar(wasRunning);
+        menuVisible = swiftBarOpened;
+        if (swiftBarOpened) {
+            transcript.push(wasRunning
+                ? "Refreshed the Rift menu in SwiftBar — the icon is in your menu bar."
+                : "Launched SwiftBar — the Rift icon should appear in your menu bar.");
+        }
+        else {
+            // App is there and pointed at the right folder, but we could not drive it
+            // (sandboxed context, GUI session unavailable, etc.). Not a silent
+            // success: hand back the one manual step.
+            recovery =
+                "SwiftBar is installed but Rift could not launch it automatically. " +
+                    "Open SwiftBar yourself to show the Rift icon.";
+            transcript.push("SwiftBar is installed but could not be launched automatically.");
+            transcript.push(`  ${recovery}`);
+        }
+    }
+    return {
+        ok: true,
+        skipped: false,
+        reason: null,
+        pluginDir,
+        pluginPath,
+        sourceDir,
+        sourcePath,
+        rendererPath,
+        mode,
+        backupPath,
+        swiftBarDetected,
+        swiftBarOpened,
+        pluginDirSource,
+        menuVisible,
+        recovery,
+        transcript,
+    };
+}
+/** Plain-language recovery line for a machine without SwiftBar installed. */
+function buildRecovery(hasHomebrew) {
+    return hasHomebrew
+        ? "Install it: brew install --cask swiftbar — then re-run: rift menubar install"
+        : `Download it from ${SWIFTBAR_DOWNLOAD_URL}, then re-run: rift menubar install`;
+}
+function assertReadableFile(filePath, label) {
+    if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+        throw new Error(`${label} missing from package: ${filePath}`);
+    }
+}
+function replaceExistingPlugin(pluginPath, sourcePath, now) {
+    let stat;
+    try {
+        stat = fs.lstatSync(pluginPath);
+    }
+    catch {
+        return null;
+    }
+    if (stat.isSymbolicLink()) {
+        const target = fs.readlinkSync(pluginPath);
+        const resolved = path.resolve(path.dirname(pluginPath), target);
+        if (resolved === sourcePath) {
+            fs.unlinkSync(pluginPath);
+            return null;
+        }
+        fs.unlinkSync(pluginPath);
+        return null;
+    }
+    const stamp = toBackupStamp((now ? now() : new Date()).toISOString());
+    const backupPath = `${pluginPath}.bak.${stamp}`;
+    fs.renameSync(pluginPath, backupPath);
+    return backupPath;
+}
+function toBackupStamp(iso) {
+    return iso.replace(/[:.]/g, "-");
+}
+function findPackageRoot() {
+    let dir = path.dirname(fileURLToPath(import.meta.url));
+    for (let i = 0; i < 8; i += 1) {
+        if (fs.existsSync(path.join(dir, "package.json")) &&
+            fs.existsSync(path.join(dir, "operator", "swiftbar", SWIFTBAR_PLUGIN_NAME))) {
+            return dir;
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    throw new Error("Could not locate packaged SwiftBar assets.");
+}
+// ---------------------------------------------------------------------------
+// Default host: real, best-effort system operations. Every call swallows its
+// own failures and degrades to a safe value — a missing `defaults`/`open`/
+// `brew`/`pgrep`, a sandboxed context, or a non-macOS host never throws.
+// ---------------------------------------------------------------------------
+export function defaultMenuBarHost(homeDir) {
+    return {
+        findSwiftBarApp() {
+            const candidates = [
+                "/Applications/SwiftBar.app",
+                path.join(homeDir, "Applications", "SwiftBar.app"),
+            ];
+            const direct = candidates.find((candidate) => fs.existsSync(candidate));
+            if (direct)
+                return direct;
+            // Fallback: a SwiftBar installed somewhere non-standard (direct download
+            // dragged elsewhere, Setapp, etc.) is still registered with macOS. Ask
+            // LaunchServices via Spotlight for the bundle id so we don't mislabel a
+            // present app as "missing" and skip reading its real plugin folder.
+            const found = runCapture("mdfind", [
+                `kMDItemCFBundleIdentifier == '${SWIFTBAR_DEFAULTS_DOMAIN}'`,
+            ]);
+            if (found) {
+                const first = found.split("\n")[0]?.trim();
+                if (first && fs.existsSync(first))
+                    return first;
+            }
+            return null;
+        },
+        readPluginDirectory() {
+            const raw = runCapture("defaults", [
+                "read",
+                SWIFTBAR_DEFAULTS_DOMAIN,
+                "PluginDirectory",
+            ]);
+            if (!raw)
+                return null;
+            return expandTilde(raw.trim(), homeDir);
+        },
+        writePluginDirectory(dir) {
+            return runOk("defaults", [
+                "write",
+                SWIFTBAR_DEFAULTS_DOMAIN,
+                "PluginDirectory",
+                "-string",
+                dir,
+            ]);
+        },
+        isSwiftBarRunning() {
+            // pgrep exits 0 when a match exists, 1 when none — runOk maps that.
+            return runOk("pgrep", ["-x", "SwiftBar"]);
+        },
+        openSwiftBar(refresh) {
+            if (refresh) {
+                // Ask a running SwiftBar to reload plugins so a just-updated wrapper
+                // is reflected immediately; fall through to a plain launch if that
+                // URL scheme is unavailable.
+                if (runOk("open", ["-g", "swiftbar://refreshallplugins"]))
+                    return true;
+            }
+            // `-g` launches in the background without stealing focus from the user.
+            return runOk("open", ["-g", "-a", "SwiftBar"]);
+        },
+        hasHomebrew() {
+            return runOk("/bin/sh", ["-c", "command -v brew"]);
+        },
+    };
+}
+/** Expand a leading `~` to the home dir; SwiftBar stores `~`-relative paths. */
+function expandTilde(value, homeDir) {
+    if (value === "~")
+        return homeDir;
+    if (value.startsWith("~/"))
+        return path.join(homeDir, value.slice(2));
+    return value;
+}
+/** Run a command, return trimmed stdout, or null on any non-zero/failure. */
+function runCapture(cmd, args) {
+    try {
+        const out = execFileSync(cmd, args, {
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+            timeout: 10_000,
+        });
+        const trimmed = out.trim();
+        return trimmed.length > 0 ? trimmed : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Run a command, return true on exit 0, false on any non-zero/failure. */
+function runOk(cmd, args) {
+    try {
+        execFileSync(cmd, args, {
+            stdio: ["ignore", "ignore", "ignore"],
+            timeout: 10_000,
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=menubar.js.map

package/dist/src/cli/commands/menubar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"menubar.js","sourceRoot":"","sources":["../../../../src/cli/commands/menubar.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/commands/onboard.d.ts

@@ -1,8 +1,60 @@
+import readline from "node:readline";
 import { Command } from "commander";
 import { loadRiftEnv } from "../../runtime/rift-env.js";
 import { validateVoyageKey } from "../../onboarding/voyage-validate.js";
 import { writeEnvFile } from "../../onboarding/env-file.js";
+import { type RelaySecretStore } from "../feedback/relay-secret-store.js";
+/**
+ * Commander.js note on `--no-<flag>` shape.
+ *
+ * `.option("--no-foo", ...)` sets `opts.foo = false` on the parsed
+ * options, NOT `opts.noFoo = true`. Two consequences:
+ *   1. We accept BOTH shapes in this interface: the affirmative key
+ *      (`codexCapture: boolean`, `importExport: string | boolean`, …)
+ *      is what Commander populates; the `no*` keys exist purely so
+ *      tests that drive `runOnboard` programmatically can keep passing
+ *      `{ noCodexCapture: true }` without going through the parser.
+ *   2. Every read goes through `isOff(opts, "<affirmative>", "<no*>")`
+ *      so a real CLI invocation and a programmatic one resolve to the
+ *      same truth. Reading only `opts.no*` (the pre-2026-05-19 bug)
+ *      silently ignored the CLI form.
+ */
+interface OnboardOpts {
+    voyageKey?: string | boolean;
+    noVoyageKey?: boolean;
+    voyageLabel?: string;
+    invite?: string;
+    enableFeedbackRelay?: string;
+    relaySecret?: string;
+    allowUnsignedFeedbackRelay?: boolean;
+    feedbackRelay?: boolean;
+    noFeedbackRelay?: boolean;
+    email?: string;
+    importExport?: string | boolean;
+    noImportExport?: boolean;
+    reconfigureVoyage?: boolean;
+    yes?: boolean;
+    skipCapture?: boolean;
+    withClaudeHook?: boolean;
+    claudeHook?: boolean;
+    noClaudeHook?: boolean;
+    codexCapture?: boolean;
+    noCodexCapture?: boolean;
+    enableCodexEnrichment?: boolean;
+    enableCapture?: boolean;
+}
+/**
+ * Resolve a `--no-<flag>` to a single boolean ("yes, skip this thing").
+ * Commander populates the affirmative key with `false`; programmatic
+ * callers may pass the `no*` key with `true`. Either form wins.
+ */
+export declare function isOff<K extends keyof OnboardOpts, N extends keyof OnboardOpts>(opts: OnboardOpts, affirmative: K, negative: N): boolean;
+interface GlobalOpts {
+    config: string;
+    json: boolean;
+}
 export declare function makeOnboardCommand(): Command;
+export declare function runOnboard(opts: OnboardOpts, globalOpts: GlobalOpts): Promise<void>;
 /**
  * Sanitize a raw `--voyage-label`, persist it when valid, and return the
  * string the caller should use for display. Invalid labels are dropped
@@ -27,6 +79,36 @@ export declare function applyVoyageLabel(rawLabel: string | undefined, configPat
  * string in the file.
  */
 export declare function persistVoyageLabel(configPath: string, label: string): void;
+/**
+ * Persist the Codex AI-metadata-enrichment opt-in into config.json. Default
+ * onboarding leaves `enrichment.ai_metadata = false` (AI-free import + keyword
+ * search, zero Codex calls). When the user passes `--enable-codex-enrichment`,
+ * this flips it to true so the daemon/worker select the Codex-backed extractor.
+ * Backs the file up first, mirroring `persistVoyageLabel`.
+ *
+ * Exported for orchestrator-level tests; `runOnboard` is the only production
+ * caller. Returns true when the flag was set and persisted, false otherwise.
+ */
+export declare function applyCodexEnrichmentOptIn(enable: boolean | undefined, configPath: string, emit: (line: string) => void): boolean;
+/**
+ * Persist the scheduled-capture opt-in. Default install writes
+ * `capture.enabled = false` (trust-first: zero Codex calls on a fresh
+ * machine). When the user passes `--enable-capture`, this flips it to true
+ * so the daemon runs auto-capture on its interval. Backs the file up first,
+ * mirroring `applyCodexEnrichmentOptIn`.
+ *
+ * Exported for orchestrator-level tests; `runOnboard` is the only production
+ * caller. Returns true when the flag was set and persisted, false otherwise.
+ */
+export declare function applyCaptureOptIn(enable: boolean | undefined, configPath: string, emit: (line: string) => void): boolean;
+/**
+ * Resolve the Voyage key, or `""` to mean "finish without a key" (keyword-only
+ * lexical mode). The key is no longer mandatory: a friend can import and search
+ * first, then add a key later for semantic ranking. Returns `""` on explicit
+ * opt-out (`--no-voyage-key`), on `--yes` with no key available, or when the
+ * interactive prompt is left blank.
+ */
+export declare function collectVoyageKey(opts: OnboardOpts, rl: readline.Interface): Promise<string>;
 type DaemonRefreshOutcome = {
     ok: true;
     kickstarted: boolean;
@@ -35,9 +117,56 @@ type DaemonRefreshOutcome = {
     reason: string;
     kind: "not_configured" | "agent_not_loaded" | "kickstart_failed" | "health_failed" | "smoke_failed";
 };
+/**
+ * Result of ensureToken. Per A-1.1: existing-token is success
+ * (`source: "existing"`), not a failure variant. Per A-1.2: the
+ * locked-keychain classification covers reads (readToken /
+ * findLatestVersion) and writes (issueToken) — they share the same
+ * macOS error string.
+ */
+export type EnsureTokenResult = {
+    ok: true;
+    token: string;
+    source: "existing" | "issued";
+} | {
+    ok: false;
+    reason: "keychain_locked" | "other";
+    message: string;
+    hint: string;
+};
+export declare function classifyTokenFailure(err: unknown): {
+    reason: "keychain_locked" | "other";
+    message: string;
+};
+export declare function ensureToken(configPath: string): Promise<EnsureTokenResult>;
+export declare function describeTokenFailure(reason: string): string;
+interface FeedbackConfig {
+    enabled: boolean;
+    url?: string;
+    installation_id?: string;
+    email?: string;
+    unsigned?: boolean;
+}
+/**
+ * Conservative email check — enough to catch obvious typos at the prompt;
+ * the relay endpoint can re-validate. Returns the normalized (trimmed,
+ * lowercased) address, or undefined if it doesn't look like an email.
+ */
+export declare function normalizeEmail(raw: string): string | undefined;
+/**
+ * Bundled "stay connected" opt-in. One yes/no that, on yes, collects an
+ * email used for product news, pricing, a leaving-beta heads-up, and a
+ * feedback channel. Opt-in only: `--yes` alone never subscribes (consent
+ * must be active), `--no-feedback-relay` declines, and `--email` subscribes
+ * non-interactively. The relay URL stays operator-only infra; when none is
+ * configured the email is captured locally (sidecar + beta-signups.jsonl)
+ * and reaches the operator once an endpoint is wired.
+ */
+export declare function collectFeedbackPreference(opts: OnboardOpts, dataDir: string, rl: readline.Interface, store?: RelaySecretStore): Promise<FeedbackConfig>;
 export declare function runFirstCapturePass(configPath: string, dataDir: string): Promise<{
     saved: number;
     reviewed: number;
+    fatal?: boolean;
 }>;
 export type RecallResult = {
     ok: true;
@@ -47,15 +176,24 @@ export type RecallResult = {
     reason: string;
 };
 /**
- * Pure outcome decision for the next-action card. Onboarding is only
- * "complete" when this run actually ingested user data AND a recall
- * query against the freshly-ingested data returned at least one hit.
- * Smoke is non-indexing (see daemonRefreshFlow), so any hit is real
- * user data, not a leftover probe.
+ * Pure outcome decision for the next-action card.
+ *
+ * "Complete + verified" needs both: this run ingested user data AND a recall
+ * query returned a hit (smoke is non-indexing — see daemonRefreshFlow — so a
+ * hit is real user data, not a leftover probe).
+ *
+ * But an EMPTY archive is not a failure. By default capture is OFF (zero-Codex
+ * trust default) and import is optional, so a friend who simply presses Enter
+ * past the import prompt has finished a valid setup — they just have nothing to
+ * recall yet. That case (`ingestAttempted === false`) is reported as DONE, not
+ * "incomplete". We only flag a retry when an ingest was actually attempted and
+ * still added nothing.
  */
 export declare function decideOnboardOutcome(input: {
     ingestedAny: boolean;
     recall: RecallResult;
+    /** True when capture ran or an import was attempted this run. */
+    ingestAttempted?: boolean;
 }): string[];
 export interface ReconfigureDeps {
     key: string;

package/dist/src/cli/commands/onboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/onboard.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,OAAO,EAEL,WAAW,EACZ,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAmD5D,wBAAgB,kBAAkB,IAAI,OAAO,CAsC5C;AAuLD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC3B,MAAM,GAAG,IAAI,CAgBf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAmC1E;AA6DD,KAAK,oBAAoB,GACrB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,GAClC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,eAAe,GAAG,cAAc,CAAA;CAAE,CAAC;AAgOvI,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAqD9C;AAqFD,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAElC;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAC1C,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,MAAM,EAAE,CAyBX;AAwDD,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC7C,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,iBAAiB,CAAC;IACpC,6DAA6D;IAC7D,KAAK,CAAC,EAAE,OAAO,YAAY,CAAC;IAC5B,wDAAwD;IACxD,OAAO,CAAC,EAAE,OAAO,WAAW,CAAC;IAC7B,0CAA0C;IAC1C,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,iBAAiB,EAC9B,oBAAoB,EAAE,MAAM,GAAG,SAAS,GACvC,IAAI,CAyBN"}
+{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/onboard.ts"],"names":[],"mappings":"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"}