@inixiative/archive 0.8.0 → 0.10.0

package/README.md

@@ -76,7 +76,9 @@ First, pair this Archive with Kingdom:
 bun run archive pair --kingdom https://api.your-kingdom.example --name "Work laptop"
 ```
 
-`pair` creates a device key in `<home>/kingdom/` and asks Kingdom to pair this Archive, identified by its `sourceId`. It prints a review code and a link. Open the link, choose the owner and the hosted Archives this machine may write to, and approve. The command waits for the approval, then saves the delivered Signet credential (0600) and lists the libraries it may write to.
+`pair` registers this Archive with Kingdom as an **Installation**, named by a key kept in `<home>/kingdom/<kingdom host>/`. The same key is reused for every owner it registers with. It then asks to be registered as an integration and prints a review code with a link.
+
+Open the link, choose the owner and the hosted Archives this machine may write to, and approve. The command waits for approval, then shows which owner it was registered with and asks you to accept. Pass `--yes` to accept without the prompt; without a terminal, `--yes` is required. Only then does it collect the Signet (0600) and list the libraries it may write to. Confirming the owner protects you if someone else claimed your code into their own owner.
 
 Next, route a project to one of those libraries:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inixiative/archive",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -35,7 +35,7 @@
     "prepare": "if git rev-parse --git-dir >/dev/null 2>&1; then lefthook install; fi && prisma generate"
   },
   "dependencies": {
-    "@inixiative/signet": "^0.1.0",
+    "@inixiative/signet": "^0.3.0",
     "@prisma/client": "^6.6.0",
     "js-tiktoken": "1.0.21",
     "prisma": "^6.6.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.2",
-    "@inixiative/config": "^0.5.53",
+    "@inixiative/config": "^0.5.62",
     "@types/bun": "1.4.2",
     "lefthook": "2.1.9",
     "typescript": "6.0.3"

package/src/cli.ts

@@ -71,6 +71,7 @@ export async function runCli(args = Bun.argv.slice(2)) {
       watch: { type: 'boolean', default: false },
       sync: { type: 'boolean', default: false },
       remote: { type: 'boolean', default: false },
+      yes: { type: 'boolean', default: false },
       help: { type: 'boolean' },
     },
   });
@@ -87,7 +88,7 @@ export async function runCli(args = Bun.argv.slice(2)) {
         'import --file PATH --source codex|claude-code|chatgpt --project-id ID [--tag TAG]\n' +
         'collect --directory HISTORY --source codex|claude-code --project-root EXACT_CWD [--project-root ...] [--worktrees] [--atlas] --project-id ID [--watch]\n' +
         'list | export --id ID | tag --id ID [--tag TAG ...] [--untag TAG ...] | search --query TEXT [--remote]\n' +
-        'pair --kingdom KINGDOM_API_URL [--name NAME]   (pair this Archive with Kingdom; approve the review code there)\n' +
+        'pair --kingdom KINGDOM_API_URL [--name NAME] [--yes]   (register this Archive with Kingdom; claim the review code there, then confirm the owner)\n' +
         'connect --url HTTPS_URL --project-id ID (--token-env ENV | --token-file PATH)   (a remote Archive, for serve --sync)\n' +
         'connect --kind kingdom --url KINGDOM_API_URL --credential-file PATH --integration-id UUID --resource-id UUID --project-id ID   (a hosted Archive through Kingdom)\n' +
         'sync | routes   (DATABASE_URL: publish to, or preview, destinations once)\n' +
@@ -191,6 +192,15 @@ export async function runCli(args = Bun.argv.slice(2)) {
         sourceId: await local.sourceId(),
         directory: join(home, 'kingdom'),
         onReview: (review) => console.error(JSON.stringify(review)),
+        onError: (error) =>
+          console.error(`Still waiting: ${error instanceof Error ? error.message : String(error)}`),
+        confirmOwner: async ({ ownerName }) => {
+          if (v.yes) return true;
+          if (!process.stdin.isTTY)
+            throw new Error(`Registered with ${ownerName}; rerun with --yes to accept it`);
+          const answer = prompt(`Kingdom registered this Archive with ${ownerName}. Accept? [y/N]`);
+          return /^y(es)?$/i.test(answer?.trim() ?? '');
+        },
       }),
     );
     return;

package/src/kingdom.ts

@@ -1,18 +1,6 @@
-import { rm } from 'node:fs/promises';
-import { join } from 'node:path';
-import {
-  collectPairing,
-  generateSignetKey,
-  kingdomUrl,
-  requestPairing,
-  SignetClient,
-  saveCollectedSignet,
-  writePrivateJson,
-} from '@inixiative/signet';
+import { pairInstallation, SignetClient } from '@inixiative/signet';
 import type { ArchiveDestination } from './config';
 
-const pollMs = 3000;
-
 /** Libraries this Archive's Signet may write to, as Kingdom describes them. */
 export async function writableLibraries(credentialFile: string) {
   const description = await (await SignetClient.fromFile(credentialFile)).describe();
@@ -27,65 +15,49 @@ export async function writableLibraries(credentialFile: string) {
   );
 }
 
-/**
- * Pairs this Archive with Kingdom as a local Archive integration bound to its sourceId. The owner
- * approves the review code in Kingdom and chooses which hosted Archives it may write to.
- */
-export async function pairWithKingdom(input: {
+type Pairing = {
   kingdom: string;
   name: string;
   sourceId: string;
   directory: string;
   onReview: (review: { reviewCode: string; review: string; expiresAt: string }) => void;
-  sleep?: (ms: number) => Promise<unknown>;
-}) {
-  const kingdom = kingdomUrl(input.kingdom);
-  const keyFile = join(input.directory, `key-${crypto.randomUUID()}.json`);
-  await writePrivateJson(keyFile, generateSignetKey());
-  try {
-    return await awaitPairing(kingdom, keyFile, input);
-  } catch (error) {
-    await rm(keyFile, { force: true });
-    throw error;
-  }
-}
+  confirmOwner: (owner: { ownerName: string | null; owner: unknown }) => Promise<boolean>;
+  onError?: (error: unknown) => void;
+  socketOptions?: { pollMs?: number; retryBaseMs?: number; authTimeoutMs?: number };
+};
 
-async function awaitPairing(
-  kingdom: string,
-  keyFile: string,
-  input: Parameters<typeof pairWithKingdom>[0],
-) {
-  const pending = await requestPairing(kingdom, keyFile, {
-    provider: 'archive',
-    deviceId: input.sourceId,
+/**
+ * Pairs this Archive with Kingdom as an Installation: a person claims the review code, the Archive
+ * confirms the owner locally, then collects the Signet for its local Archive integration.
+ */
+export async function pairWithKingdom(input: Pairing) {
+  const paired = await pairInstallation({
+    url: input.kingdom,
+    root: input.directory,
+    kind: 'archive',
     name: input.name,
-    resources: [],
-    expiresAt: null,
-    maxRequests: null,
-    maxConcurrent: 4,
-  });
-  input.onReview({
-    reviewCode: pending.reviewCode,
-    review: `${kingdom}/dashboard?reviewSignet=${pending.reviewCode}`,
-    expiresAt: pending.expiresAt,
+    sourceId: input.sourceId,
+    terms: {
+      name: input.name,
+      lifecycle: 'ongoing',
+      resources: [],
+      expiresAt: null,
+      maxRequests: null,
+      maxConcurrent: 4,
+    },
+    onReview: input.onReview,
+    confirmOwner: input.confirmOwner,
+    onError: input.onError,
+    socketOptions: input.socketOptions,
   });
-  const sleep = input.sleep ?? Bun.sleep;
-  while (Date.parse(pending.expiresAt) > Date.now()) {
-    const collected = await collectPairing(kingdom, keyFile, pending.deviceCode);
-    if (collected) {
-      const credentialFile = join(input.directory, `signet-${collected.signetId}.json`);
-      await saveCollectedSignet(credentialFile, kingdom, keyFile, collected);
-      return {
-        paired: true,
-        integrationId: collected.integrationId,
-        credentialFile,
-        libraries: await writableLibraries(credentialFile),
-        next: 'archive connect --kind kingdom --url KINGDOM --credential-file FILE --integration-id ID --resource-id ID --project-id PROJECT',
-      };
-    }
-    await sleep(pollMs);
-  }
-  throw new Error('The review code expired before it was approved; run archive pair again');
+  return {
+    paired: true,
+    owner: paired.ownerName,
+    integrationId: paired.integrationId,
+    credentialFile: paired.credentialFile,
+    libraries: await writableLibraries(paired.credentialFile),
+    next: 'archive connect --kind kingdom --url KINGDOM --credential-file FILE --integration-id ID --resource-id ID --project-id PROJECT',
+  };
 }
 
 export async function verifyKingdomDestination(