onadit 0.0.1 → 1.0.0

package/dist/src/cli/commands/hooks-install.js

@@ -0,0 +1,228 @@
+/**
+ * `onadit hooks install --client <id> [--dry-run]`
+ *
+ * Installs the Onadit policy hook into a known agent's settings file:
+ * `claude-code` or `codex` (same two entries, in `~/.codex/hooks.json`;
+ * Codex runs them once the user has reviewed them with `/hooks`).
+ * Idempotent — re-running with the same package version is a no-op when
+ * the hook is already up-to-date.
+ *
+ * For Claude Code the install:
+ *   1. Writes `~/.claude/hooks/rift-policy.mjs` (a small Node ESM script
+ *      with no third-party deps — no `jq` required).
+ *   2. Adds a PreToolUse matcher entry to `~/.claude/settings.json`
+ *      that runs the script for `mcp__onadit__onadit_*` tools.
+ *
+ * The script asks for `onadit_context_pack` (or a session-start brief)
+ * before open-ended `onadit_search` / `onadit_conversations_search` calls.
+ * Exact-id lookups and precise queries (identifiers, paths, quoted
+ * phrases) go straight through.
+ *
+ *   3. Adds a SessionStart entry running `onadit brief --hook`, which injects
+ *      the small prepared project brief (skip with --no-session-brief).
+ *
+ * Disable knobs:
+ *   - `RIFT_POLICY_DISABLED=1` env var → script no-ops.
+ *   - Remove the matcher entry from `settings.json`.
+ */
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { Command, Option } from "commander";
+import { CliError } from "../http-client.js";
+import { ALL_HOOK_CLIENTS, HooksParseFailedError, installedSessionStartConfig, isHookClientId, readSessionHooksState, removeAgentHooks, writeHookConfig, } from "../hooks-writers/index.js";
+/** `"<node>" "<cli>" --config "<cfg>" brief --hook`, using the running install. */
+export function defaultSessionStartCommand(configPath) {
+    // .../dist/src/cli/commands/hooks-install.js → .../dist/src/cli/index.js
+    const cli = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "index.js");
+    if (!fs.existsSync(cli))
+        return undefined;
+    return `"${process.execPath}" "${cli}" --config "${path.resolve(configPath)}" brief --hook`;
+}
+export function makeHooksInstallCommand() {
+    return new Command("install")
+        .description("Install the Onadit policy hook into a known agent's settings file.")
+        .addOption(new Option("--client <id>", "Target client (claude-code, codex)").choices([
+        ...ALL_HOOK_CLIENTS,
+    ]))
+        .option("--dry-run", "Print the outcome without writing", false)
+        .option("--no-session-brief", "Do not add the SessionStart project-brief hook")
+        .action(async function () {
+        const runOpts = this.opts();
+        const globalOpts = this.optsWithGlobals();
+        try {
+            const sessionStartCommand = runOpts.sessionBrief !== false && globalOpts.config
+                ? defaultSessionStartCommand(globalOpts.config)
+                : undefined;
+            await runHooksInstall(runOpts, sessionStartCommand ? { sessionStartCommand } : {});
+        }
+        catch (err) {
+            const msg = err instanceof CliError
+                ? err.message
+                : err instanceof Error
+                    ? err.message
+                    : String(err);
+            process.stderr.write(`onadit hooks install failed: ${msg}\n`);
+            process.exitCode = 1;
+        }
+    });
+}
+/** `onadit hooks remove --client <id>`: take the Onadit entries and script back out. */
+export function makeHooksRemoveCommand() {
+    return new Command("remove")
+        .description("Remove the Onadit hooks from a known agent's settings file.")
+        .addOption(new Option("--client <id>", "Target client (claude-code, codex)")
+        .choices([...ALL_HOOK_CLIENTS])
+        .makeOptionMandatory())
+        .action(function () {
+        const { client } = this.opts();
+        const removal = removeAgentHooks(client);
+        if (removal.status === "failed") {
+            process.stderr.write(`onadit hooks remove failed: ${removal.error ?? "unknown error"}\n`);
+            process.exitCode = 1;
+            return;
+        }
+        process.stdout.write(removal.status === "removed"
+            ? `Removed the Onadit hooks from ${client}. Backup ID: ${removal.backupId}\n`
+            : `No Onadit hooks in ${client}.\n`);
+        if (removal.reviewAgain)
+            process.stdout.write(`${CODEX_REVIEW_AGAIN}\n`);
+    });
+}
+export function makeHooksCommand() {
+    const hooks = new Command("hooks").description("Manage agent hook integrations for Onadit.");
+    hooks.addCommand(makeHooksInstallCommand());
+    hooks.addCommand(makeHooksRemoveCommand());
+    return hooks;
+}
+export async function runHooksInstall(opts, deps) {
+    const emit = deps.emit ?? ((line) => process.stdout.write(`${line}\n`));
+    if (!opts.client) {
+        throw new CliError(`Pass --client <id> (one of: ${ALL_HOOK_CLIENTS.join(", ")}).`, "validation");
+    }
+    if (!isHookClientId(opts.client)) {
+        throw new CliError("Unknown --client value.", "validation");
+    }
+    const homeDir = deps.homeDir ?? os.homedir();
+    let outcome;
+    try {
+        outcome = writeHookConfig({
+            client: opts.client,
+            homeDir,
+            ...(deps.env ? { env: deps.env } : {}),
+            dryRun: !!opts.dryRun,
+            ...(deps.now ? { now: deps.now } : {}),
+            ...(deps.sessionStartCommand ? { sessionStartCommand: deps.sessionStartCommand } : {}),
+        });
+    }
+    catch (err) {
+        if (err instanceof HooksParseFailedError) {
+            // Path-free + content-free by construction; pass through.
+            emit(err.message);
+            throw new CliError("onadit hooks install: existing settings file unparseable.", "validation");
+        }
+        throw err;
+    }
+    printSummary(emit, opts.client, outcome);
+    return outcome;
+}
+function printSummary(emit, client, outcome) {
+    const verb = outcome.dryRun
+        ? "Would install"
+        : outcome.hookEntryAdded ||
+            outcome.hookEntryReplaced ||
+            outcome.scriptUpdated ||
+            (outcome.sessionStartEntry !== undefined && outcome.sessionStartEntry !== "unchanged")
+            ? "Installed"
+            : "Already up-to-date";
+    emit(`${verb} Onadit policy hook for ${client}.`);
+    emit(`  Script:   ${outcome.scriptPath}`);
+    emit(`  Settings: ${outcome.settingsPath}`);
+    if (outcome.hookEntryAdded)
+        emit("  PreToolUse entry: added");
+    if (outcome.hookEntryReplaced)
+        emit("  PreToolUse entry: updated");
+    if (outcome.sessionStartEntry && outcome.sessionStartEntry !== "unchanged") {
+        emit(`  SessionStart brief entry: ${outcome.sessionStartEntry}`);
+    }
+    if (outcome.scriptUpdated && !outcome.dryRun)
+        emit("  Script: written");
+    if (outcome.backupId)
+        emit(`  Backup ID: ${outcome.backupId}`);
+    emit("  Disable knobs: RIFT_POLICY_DISABLED=1 in env, or remove the matcher entry.");
+    if (client === "codex" && verb !== "Already up-to-date") {
+        emit(`  Next: ${CODEX_REVIEW_STEP}`);
+    }
+}
+/**
+ * Rewrite the hook entries that are installed, so they run this build (policy
+ * script, CLI path), and add none. The session-start entry keeps the config
+ * path it already carries.
+ *
+ * After an upgrade the matcher is kept: the connection has not changed names,
+ * and on a packaged Mac nothing Codex approved changes, so Codex goes on
+ * running the hooks. `matcher: "current"` writes the matcher that holds under
+ * both names, for a connection the person has just moved to the new ones.
+ */
+export function refreshSessionHooks(client, deps = {}) {
+    const home = { homeDir: deps.homeDir ?? os.homedir(), ...(deps.env ? { env: deps.env } : {}) };
+    const configPath = installedSessionStartConfig(client, home);
+    const sessionStartCommand = configPath ? (deps.commandFor ?? defaultSessionStartCommand)(configPath) : undefined;
+    return writeHookConfig({
+        client,
+        ...home,
+        dryRun: false,
+        existingOnly: true,
+        ...(deps.matcher === "current" ? {} : { keepMatcher: true }),
+        ...(deps.now ? { now: deps.now } : {}),
+        ...(sessionStartCommand ? { sessionStartCommand } : {}),
+    });
+}
+export const CODEX_REVIEW_STEP = "open Codex and run /hooks once to review the Onadit entries. Codex skips them until you do.";
+/** After a removal that moved one of the person's own Codex hooks. */
+export const CODEX_REVIEW_AGAIN = "Your other Codex hooks changed position, so Codex will ask you to review them again: run /hooks in Codex.";
+const HOOK_CLIENT_NAMES = { "claude-code": "Claude Code", codex: "Codex" };
+/**
+ * The last step of connecting Claude Code or Codex: offer the session-start
+ * hooks. Connecting alone never installs them, because they put a project
+ * note in every session; the person says yes here, with a flag, or by running
+ * `onadit hooks install` themselves.
+ */
+export async function offerSessionHooks(client, offer) {
+    const { emit } = offer;
+    const name = HOOK_CLIENT_NAMES[client];
+    const home = { homeDir: offer.homeDir ?? os.homedir(), ...(offer.env ? { env: offer.env } : {}) };
+    const state = readSessionHooksState(client, home);
+    if (state === "needs_review")
+        emit(`  Next: ${CODEX_REVIEW_STEP}`);
+    if (state !== "off" || offer.choice === "no")
+        return;
+    if (offer.choice === "ask") {
+        emit(`  Optional: ${name} can start each session with a short Onadit note about the project, and ask Onadit before a task.`);
+        emit(`  The note goes to ${name}'s AI provider with the rest of the session.`);
+        if (!offer.ask) {
+            emit(`  To turn it on: onadit hooks install --client ${client}`);
+            return;
+        }
+        const answer = (await offer.ask(`  Turn this on for ${name}? [y/N]: `)).trim().toLowerCase();
+        if (answer !== "y" && answer !== "yes") {
+            emit(`  Left off. To turn it on later: onadit hooks install --client ${client}`);
+            return;
+        }
+    }
+    const sessionStartCommand = offer.sessionStartCommand ?? defaultSessionStartCommand(offer.configPath);
+    try {
+        await runHooksInstall({ client }, {
+            ...home,
+            emit: (line) => emit(`  ${line}`),
+            ...(offer.now ? { now: offer.now } : {}),
+            ...(sessionStartCommand ? { sessionStartCommand } : {}),
+        });
+    }
+    catch (err) {
+        // The connection is saved either way; the hooks are an extra.
+        emit(`  The hooks were not installed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+//# sourceMappingURL=hooks-install.js.map

package/dist/src/cli/commands/hooks-install.js.map

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

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

@@ -0,0 +1,19 @@
+import { Command } from "commander";
+import { type SupportedIngestSource } from "../../ingestion/parsers/types.js";
+export interface SniffResult {
+    ok: boolean;
+    /** When `ok` is false, a one-line operator-friendly hint. */
+    hint?: string;
+}
+/**
+ * Inspect a zip export's top-level entry names against the canonical
+ * markers for `source`. Returns `ok: true` when the layout looks
+ * right; returns a hint pointing at the likely correct source when
+ * the layout matches a different one (or none).
+ *
+ * Pure (no I/O outside the passed-in entry name list) so it stays
+ * unit-testable without zip fixtures.
+ */
+export declare function sniffZipEntries(entryNames: string[], source: SupportedIngestSource): SniffResult;
+export declare function makeImportCommand(): Command;
+//# sourceMappingURL=import.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/import.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAepC,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,kCAAkC,CAAC;AAY1C,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,CAAC;IACZ,6DAA6D;IAC7D,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,MAAM,EAAE,qBAAqB,GAC5B,WAAW,CA8Fb;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAsB3C"}

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

@@ -0,0 +1,258 @@
+/**
+ * `onadit import <export>` — friend-grade wrapper around POST /ingest.
+ *
+ * Slice 3. Wraps the existing `onadit ingest` flow with:
+ *   - source default (`chatgpt_web`) so the common case is one arg
+ *   - structural sniff for zip exports: open the archive, read entry
+ *     names, bail early with a "looks like a <other> export" hint if
+ *     the canonical marker for `--source` is missing
+ *   - friendlier polling output and a final one-line summary
+ *
+ * The internal `onadit ingest` command still exists for scripted use
+ * (multipart upload + idempotency-key passthrough). Friend onboarding
+ * and the install flow point at `onadit import`.
+ */
+import fs from "node:fs";
+import path from "node:path";
+import { Command } from "commander";
+import AdmZip from "adm-zip";
+import { CliError, createHttpClient, readToken, resolveBaseUrl, } from "../http-client.js";
+import { pollJob } from "../job-poller.js";
+import { isJobFailure, printError, printJson, printJobResult, } from "../output.js";
+import { SUPPORTED_INGEST_SOURCES, } from "../../ingestion/parsers/types.js";
+import { SOURCE_EXTENSIONS } from "../../ingestion/staging.js";
+const DEFAULT_SOURCE = "chatgpt_web";
+/**
+ * Inspect a zip export's top-level entry names against the canonical
+ * markers for `source`. Returns `ok: true` when the layout looks
+ * right; returns a hint pointing at the likely correct source when
+ * the layout matches a different one (or none).
+ *
+ * Pure (no I/O outside the passed-in entry name list) so it stays
+ * unit-testable without zip fixtures.
+ */
+export function sniffZipEntries(entryNames, source) {
+    const names = entryNames.map((n) => n.toLowerCase());
+    const has = (re) => names.some((n) => re.test(n));
+    const grokMarker = /(^|\/)prod-grok-backend\.json$/;
+    // ChatGPT-only sidecars (verified from real exports). `user.json` is
+    // singular; Claude's metadata file is `users.json` (plural) — that
+    // plural-vs-singular distinction is the load-bearing signal.
+    const chatgptOnlyMarker = /(^|\/)(chat\.html|user\.json|message_feedback\.json|model_comparisons\.json|shared_conversations\.json)$/;
+    // ChatGPT chunked layout: conversations-001.json etc. — never produced
+    // by Claude.
+    const chatgptChunkedMarker = /(^|\/)conversations-\d+\.json$/;
+    // Claude-only metadata files (verified from real exports).
+    const claudeOnlyMarker = /(^|\/)(projects\.json|users\.json)$/;
+    // Plain `conversations.json` — present in both ChatGPT and Claude
+    // exports, so on its own it cannot disambiguate.
+    const conversationsJson = /(^|\/)conversations\.json$/;
+    const looksLikeGrok = has(grokMarker);
+    const looksLikeChatgpt = has(chatgptOnlyMarker) || has(chatgptChunkedMarker);
+    const looksLikeClaude = has(claudeOnlyMarker);
+    const hasConversationsJson = has(conversationsJson);
+    switch (source) {
+        case "chatgpt_web":
+            if (looksLikeGrok) {
+                return { ok: false, hint: "looks like a Grok export — try --source grok_web" };
+            }
+            if (looksLikeClaude) {
+                return {
+                    ok: false,
+                    hint: "looks like a Claude export — try --source claude_web",
+                };
+            }
+            if (looksLikeChatgpt)
+                return { ok: true };
+            // Bare `conversations.json` with no ChatGPT-only sidecars and no
+            // Claude-only sidecars: ambiguous. Refuse rather than risk an
+            // import that yields zero rows because the JSON shape is wrong
+            // for the chosen parser.
+            if (hasConversationsJson) {
+                return {
+                    ok: false,
+                    hint: "found conversations.json but no ChatGPT sidecars — if it's a Claude export, pass --source claude_web; otherwise --no-sniff to override",
+                };
+            }
+            return {
+                ok: false,
+                hint: "no recognizable export markers found at zip root — pass the right --source",
+            };
+        case "claude_web":
+            if (looksLikeGrok) {
+                return { ok: false, hint: "looks like a Grok export — try --source grok_web" };
+            }
+            if (looksLikeChatgpt) {
+                return {
+                    ok: false,
+                    hint: "looks like a ChatGPT export — try --source chatgpt_web",
+                };
+            }
+            // Either Claude-only sidecars or a bare conversations.json (which
+            // for a friend who explicitly chose --source claude_web is fine).
+            if (looksLikeClaude || hasConversationsJson)
+                return { ok: true };
+            return {
+                ok: false,
+                hint: "no conversations.json found in zip — pass the right --source",
+            };
+        case "grok_web":
+            if (looksLikeGrok)
+                return { ok: true };
+            if (looksLikeChatgpt) {
+                return {
+                    ok: false,
+                    hint: "looks like a ChatGPT export — try --source chatgpt_web",
+                };
+            }
+            if (looksLikeClaude) {
+                return {
+                    ok: false,
+                    hint: "looks like a Claude export — try --source claude_web",
+                };
+            }
+            return {
+                ok: false,
+                hint: "no prod-grok-backend.json found in zip",
+            };
+        case "gemini_web":
+            // Gemini's `.zip` path doesn't exist (SOURCE_EXTENSIONS only allows
+            // .json). Defensive: if a zip is somehow passed, redirect.
+            return {
+                ok: false,
+                hint: "Gemini exports are JSON only — pass the .json file directly",
+            };
+    }
+}
+export function makeImportCommand() {
+    return new Command("import")
+        .description("Import a conversation export (ChatGPT/Claude/Grok zip, or Gemini JSON)")
+        .argument("<file>", "Path to export file (.zip or .json)")
+        .option("--source <source>", `Source: ${SUPPORTED_INGEST_SOURCES.join(" | ")} (default: ${DEFAULT_SOURCE})`, DEFAULT_SOURCE)
+        .option("--idempotency-key <key>", "Idempotency key")
+        .option("--no-sniff", "Skip the structural sniff (zip-only) and trust --source")
+        .action(async (file, opts, cmd) => {
+        const globalOpts = cmd.optsWithGlobals();
+        try {
+            await runImport(file, opts, globalOpts);
+        }
+        catch (err) {
+            printError(err instanceof CliError || err instanceof Error ? err.message : String(err));
+            process.exitCode = 1;
+        }
+    });
+}
+async function runImport(file, opts, globalOpts) {
+    // --- Validate source ---
+    if (!SUPPORTED_INGEST_SOURCES.includes(opts.source)) {
+        printError(`Unsupported source "${opts.source}". Supported: ${SUPPORTED_INGEST_SOURCES.join(", ")}.`);
+        process.exitCode = 1;
+        return;
+    }
+    const source = opts.source;
+    // --- Resolve + validate file ---
+    const filePath = path.resolve(file);
+    if (!fs.existsSync(filePath)) {
+        printError(`File not found: ${filePath}`);
+        process.exitCode = 1;
+        return;
+    }
+    const stat = fs.statSync(filePath);
+    if (!stat.isFile()) {
+        printError(`Not a file: ${filePath}`);
+        process.exitCode = 1;
+        return;
+    }
+    const ext = path.extname(filePath).toLowerCase();
+    const allowed = SOURCE_EXTENSIONS[source];
+    if (!allowed.includes(ext)) {
+        printError(`${source} expects ${allowed.join(" or ")} — got "${ext}".`);
+        process.exitCode = 1;
+        return;
+    }
+    // --- Structural sniff (zip only, opt-out via --no-sniff) ---
+    if (ext === ".zip" && opts.sniff !== false) {
+        const sniff = sniffFile(filePath, source);
+        if (!sniff.ok) {
+            printError(`This doesn't look like a ${source} export — ${sniff.hint}.`);
+            process.exitCode = 1;
+            return;
+        }
+    }
+    // --- Auth + daemon ---
+    const baseUrl = resolveBaseUrl(globalOpts.config);
+    const token = await readToken();
+    if (!token) {
+        printError("No auth token. Run: onadit token issue");
+        process.exitCode = 1;
+        return;
+    }
+    const client = createHttpClient({ baseUrl, token });
+    // --- Submit ---
+    const fileBuffer = fs.readFileSync(filePath);
+    const form = new FormData();
+    form.append("source", source);
+    form.append("file", new Blob([fileBuffer]), path.basename(filePath));
+    if (opts.idempotencyKey)
+        form.append("idempotency_key", opts.idempotencyKey);
+    const submitted = (await client.postMultipart("/ingest", form)).data;
+    if (submitted.duplicate) {
+        if (globalOpts.json) {
+            printJson(submitted);
+        }
+        else {
+            process.stdout.write(`Already imported (job ${submitted.job_id}). Skipping.\n`);
+        }
+        return;
+    }
+    if (!globalOpts.json) {
+        process.stderr.write(`Importing ${path.basename(filePath)} as ${source} (job ${submitted.job_id})…\n`);
+    }
+    // --- Poll ---
+    const result = await pollJob({
+        get: client.get.bind(client),
+        jobId: submitted.job_id,
+        onProgress: (job) => {
+            if (globalOpts.json)
+                return;
+            // JobStatusView doesn't carry counts yet; render the status churn
+            // on a single line so the friend sees the daemon is alive.
+            const tty = process.stderr.isTTY === true;
+            const line = `  [${job.status}] job ${job.id}`;
+            process.stderr.write(tty ? `\r\x1b[2K${line}` : `${line}\n`);
+        },
+    });
+    // Newline after the last \r-redrawn status line.
+    if (!globalOpts.json && process.stderr.isTTY === true) {
+        process.stderr.write("\n");
+    }
+    if (globalOpts.json) {
+        printJson(result.job);
+    }
+    else if (isJobFailure(result.job, result.timedOut)) {
+        printJobResult(result.job, result.timedOut);
+        process.stderr.write("If the failure mentions parsing or quarantine, re-run with --source set to the right exporter.\n");
+    }
+    else {
+        process.stdout.write(`✓ Imported (job ${result.job.id}). Try: onadit search "<topic>"\n`);
+    }
+    if (isJobFailure(result.job, result.timedOut))
+        process.exitCode = 1;
+}
+function sniffFile(zipPath, source) {
+    let entries;
+    try {
+        entries = new AdmZip(zipPath)
+            .getEntries()
+            .filter((e) => !e.isDirectory)
+            .map((e) => e.entryName);
+    }
+    catch (err) {
+        return {
+            ok: false,
+            hint: `couldn't open the zip (${err instanceof Error ? err.message : String(err)})`,
+        };
+    }
+    return sniffZipEntries(entries, source);
+}
+//# sourceMappingURL=import.js.map

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

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

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

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+export declare function makeIngestCommand(): Command;
+//# sourceMappingURL=ingest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ingest.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/ingest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,wBAAgB,iBAAiB,IAAI,OAAO,CAsD3C"}

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

@@ -0,0 +1,80 @@
+import fs from "node:fs";
+import path from "node:path";
+import { Command } from "commander";
+import { createHttpClient, readToken, resolveBaseUrl, CliError } from "../http-client.js";
+import { pollJob } from "../job-poller.js";
+import { printError, printJson, printJobResult, isJobFailure } from "../output.js";
+// Web-conversation ingest only understands JSON exports (raw or zipped).
+// Reject other formats locally so the operator gets immediate feedback
+// instead of a 400 from the daemon (or, worse, a silent no-op job).
+const SUPPORTED_INGEST_EXTENSIONS = new Set([".json", ".zip"]);
+export function makeIngestCommand() {
+    return new Command("ingest")
+        .description("Import a conversation export (zip or JSON)")
+        .requiredOption("--source <source>", "Source (chatgpt_web)")
+        .requiredOption("--file <path>", "Path to export file (.json or .zip)")
+        .option("--idempotency-key <key>", "Idempotency key")
+        .action(async (opts, cmd) => {
+        const globalOpts = cmd.optsWithGlobals();
+        try {
+            const baseUrl = resolveBaseUrl(globalOpts.config);
+            const token = await readToken();
+            if (!token) {
+                printError("No auth token. Run: onadit token issue");
+                process.exitCode = 1;
+                return;
+            }
+            const filePath = path.resolve(opts.file);
+            if (!fs.existsSync(filePath)) {
+                printError(`File not found: ${filePath}`);
+                process.exitCode = 1;
+                return;
+            }
+            const ext = path.extname(filePath).toLowerCase();
+            if (!SUPPORTED_INGEST_EXTENSIONS.has(ext)) {
+                printError(`Unsupported file extension "${ext}". ` +
+                    `Allowed: ${[...SUPPORTED_INGEST_EXTENSIONS].join(", ")}.`);
+                process.exitCode = 1;
+                return;
+            }
+            const client = createHttpClient({ baseUrl, token });
+            const fileBuffer = fs.readFileSync(filePath);
+            const form = new FormData();
+            form.append("source", opts.source);
+            form.append("file", new Blob([fileBuffer]), path.basename(filePath));
+            if (opts.idempotencyKey)
+                form.append("idempotency_key", opts.idempotencyKey);
+            const { data } = await client.postMultipart("/ingest", form);
+            const resp = data;
+            if (resp.duplicate) {
+                if (globalOpts.json) {
+                    printJson(resp);
+                }
+                else {
+                    process.stdout.write(`Duplicate job: ${resp.job_id}\n`);
+                }
+                return;
+            }
+            process.stderr.write(`Job ${resp.job_id} submitted. Polling...\n`);
+            const result = await pollJob({ get: client.get.bind(client), jobId: resp.job_id });
+            if (globalOpts.json) {
+                printJson(result.job);
+            }
+            else {
+                printJobResult(result.job, result.timedOut);
+            }
+            if (isJobFailure(result.job, result.timedOut))
+                process.exitCode = 1;
+        }
+        catch (err) {
+            if (err instanceof CliError) {
+                printError(err.message);
+            }
+            else {
+                printError(err instanceof Error ? err.message : String(err));
+            }
+            process.exitCode = 1;
+        }
+    });
+}
+//# sourceMappingURL=ingest.js.map

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

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