@agentshouse/kit 0.1.0-alpha.25 → 0.1.0-alpha.27

package/bin/kit.js

@@ -5,12 +5,12 @@ import { join, resolve } from "node:path";
 import { connectHouse, loginHouse, storedEnvironment, storedHouse } from "../src/login.js";
 import { apply } from "../src/apply.js";
 import { captureSource, resetSource, retrySourceOriginals, sourceStatus } from "../src/source.js";
+import { accountEntries, accountStatus, captureAccount } from "../src/google/entries.js";
 import { setupEnvironment } from "../src/setup.js";
 import { signInConnector } from "../src/connector-login.js";
 import { attachSession } from "../src/attach.js";
 import { runResident, runWorkers } from "../src/worker.js";
 import { openSession, releaseControl, requestDrain } from "../src/house.js";
-import { GOOGLE_OAUTH_CLIENT } from "../src/instance/google.js";
 import { reportHost } from "../src/host.js";
 import { signInAgent, updateAgents } from "../src/agents.js";
 import { serveWorkspaces } from "../src/workspace.js";
@@ -37,8 +37,8 @@ const AGENTS_USAGE =
   "usage: kit agents update [--config <path>] | kit agents sign-in <kind> [--config <path>]";
 const WORKSPACE_USAGE = "usage: kit workspace host [--config <path>] [--passes <count>]";
 const SOURCE_USAGE =
-  "usage: kit source <capture|reset|retry-files> <instance> [service] [--config <path>]\n" +
-  "       kit source status <instance> [service] [--config <path>]\n" +
+  "usage: kit source <capture|status> <account|instance> [service] [--config <path>]\n" +
+  "       kit source <reset|retry-files> <instance> [service] [--config <path>]\n" +
   "       kit source sign-in <instance> [--config <path>]";
 const SETUP_USAGE = "usage: kit setup [--config <path>]";
 const REPOSITORY_USAGE =
@@ -108,13 +108,6 @@ function write(line) {
   process.stdout.write(`${line}\n`);
 }
 
-function builtGoogleOAuthClient() {
-  if (GOOGLE_OAUTH_CLIENT === null) {
-    throw new KitRefusal("google_oauth_client_unconfigured", "run npm run build");
-  }
-  return GOOGLE_OAUTH_CLIENT;
-}
-
 async function runLogin(args, directory) {
   const { values } = declared(args, ["--house", "--manual", "--host-browser", "--environment"], 0, { flags: ["--host-browser"] });
   if (values["--manual"] && values["--host-browser"]) throw new Error(LOGIN_USAGE);
@@ -188,15 +181,12 @@ async function runSetup(args, directory) {
   process.once("SIGINT", cancel);
   let setup;
   try {
-    setup = await setupEnvironment(
-      {
-        house,
-        directory,
-        configuration: values["--config"] ?? join(directory, "kit.json"),
-        signal: cancellation.signal,
-      },
-      { googleOAuthClient: builtGoogleOAuthClient },
-    );
+    setup = await setupEnvironment({
+      house,
+      directory,
+      configuration: values["--config"] ?? join(directory, "kit.json"),
+      signal: cancellation.signal,
+    });
   } finally {
     process.removeListener("SIGINT", cancel);
   }
@@ -268,22 +258,27 @@ async function runSourceCapture(args, directory) {
   const house = await storedHouse(directory);
   const cancellation = new AbortController();
   process.once("SIGINT", () => cancellation.abort());
-  const result = await captureSource(
-    {
-      house,
-      directory,
-      configuration: values["--config"] ?? join(directory, "kit.json"),
-      instance: rest[0],
-      service: rest[1] ?? null,
-      signal: cancellation.signal,
-    },
-    { googleOAuthClient: builtGoogleOAuthClient },
-  );
+  const entries = await accountEntries(directory, rest[0]);
+  const options = {
+    house,
+    directory,
+    service: rest[1] ?? null,
+    signal: cancellation.signal,
+  };
+  const result =
+    entries.length > 0
+      ? await captureAccount({ ...options, account: rest[0], entries })
+      : await captureSource({
+          ...options,
+          configuration: values["--config"] ?? join(directory, "kit.json"),
+          instance: rest[0],
+        });
   for (const delivered of result.services) {
     const category =
       delivered.health.category === null ? "" : ` (${delivered.health.category})`;
+    const cause = delivered.health.cause === undefined ? "" : `, cause ${delivered.health.cause}`;
     write(
-      `Delivered ${delivered.delivered} items for ${result.instance}/${delivered.service} in ${delivered.batches} batches; health ${delivered.health.state}${category}.`,
+      `Delivered ${delivered.delivered} items for ${result.instance}/${delivered.service} in ${delivered.batches} batches; health ${delivered.health.state}${category}${cause}.`,
     );
     if (delivered.refused !== null) {
       write(
@@ -332,22 +327,32 @@ async function runSourceRetryFiles(args, directory) {
 async function runSourceStatus(args, directory) {
   const { values, rest } = declared(args, ["--config"], 2);
   if (rest.length === 0) throw new Error(SOURCE_USAGE);
-  const result = await sourceStatus({
-    directory,
-    configuration: values["--config"] ?? join(directory, "kit.json"),
-    instance: rest[0],
-    service: rest[1] ?? null,
-  });
+  const entries = await accountEntries(directory, rest[0]);
+  const result =
+    entries.length > 0
+      ? await accountStatus({ directory, account: rest[0], entries, service: rest[1] ?? null })
+      : await sourceStatus({
+          directory,
+          configuration: values["--config"] ?? join(directory, "kit.json"),
+          instance: rest[0],
+          service: rest[1] ?? null,
+        });
   for (const reported of result.services) {
     const category = reported.health.category === null ? "" : ` (${reported.health.category})`;
+    const cause = reported.health.cause === undefined ? "" : `, cause ${reported.health.cause}`;
     const observed =
       reported.health.observed_at === null ? "never observed" : reported.health.observed_at;
+    const signedIn =
+      reported.signed_in === undefined ? "" : reported.signed_in ? "signed in; " : "signed out; ";
     write(
       `${result.instance}/${reported.service} -> ${reported.source_ref} in ${reported.rooms.join(", ")}: ` +
-        `${reported.health.state}${category} at ${observed}; ` +
+        `${signedIn}${reported.health.state}${category}${cause} at ${observed}; ` +
         `cursor ${reported.checkpoint?.cursor ?? "none"}, ${reported.gaps.length} gaps, ` +
         `${reported.dropped.length} dropped items, ${reported.originals.length} unsaved originals.`,
     );
+    if (reported.enable !== null && reported.enable !== undefined) {
+      write(`Enable the ${reported.enable} in the Google Cloud project of ${result.instance}'s OAuth client.`);
+    }
   }
   if (result.services.some((reported) => reported.health.state !== "ok")) process.exitCode = 1;
 }
@@ -425,14 +430,11 @@ function writeConversationFiles(supervised) {
 async function runWorkerRun(args, directory) {
   const { values } = declared(args, ["--config"], 0);
   const house = await storedHouse(directory);
-  const supervised = await runWorkers(
-    {
-      house,
-      directory,
-      configuration: values["--config"] ?? join(directory, "kit.json"),
-    },
-    { googleOAuthClient: builtGoogleOAuthClient },
-  );
+  const supervised = await runWorkers({
+    house,
+    directory,
+    configuration: values["--config"] ?? join(directory, "kit.json"),
+  });
   write(`Worker runtime ready on tmux ${supervised.tmux} in namespace ${supervised.namespace}.`);
   if (supervised.epochReport !== null) {
     write(`House started a new log epoch; reported ${supervised.epochReport.length} held Runs and House settled each.`);

package/bootstrap.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "version": "0.1.0-alpha.25",
+  "version": "0.1.0-alpha.27",
   "hosts": {
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.25/connect-linux.sh)",
+      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.27/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.25/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.27/connect-linux.sh"
       },
       "workspace": {
         "argument": "--workspace",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.1.0-alpha.25",
+  "version": "0.1.0-alpha.27",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/adapter-mcp.js

@@ -1,12 +1,15 @@
+import { readFileSync } from "node:fs";
 import {
   COMMAND_ADAPTER_INITIALIZE_TIMEOUT_MS,
   HOW_WE_WORK_PATH,
   MCP_PROTOCOL_VERSION,
   SHELL_RENDER,
 } from "./contract.js";
-import { answerText, bridgeCall } from "./mcp.js";
+import { answerText, bridgeCall, editRefusal } from "./mcp.js";
 import { KitRefusal } from "./refusal.js";
 
+const HOW_WE_WORK_TEXT = readFileSync(new URL("how-we-work.md", import.meta.url), "utf8");
+
 function readableDiscovery(discovery) {
   const identity = discovery?._meta?.["io.modelcontextprotocol/serverInfo"];
   return Array.isArray(discovery?.supportedVersions) &&
@@ -84,3 +87,22 @@ export async function commandHouseHowWeWork(bridge) {
   } while (cursor !== null);
   return pages.join("\n");
 }
+
+export async function commandHouseCreateHowWeWork(bridge) {
+  const frame = await bridgeCall(bridge, {
+    method: "tools/call",
+    params: {
+      name: "edit",
+      arguments: { changes: [{ op: "create", path: HOW_WE_WORK_PATH, content: HOW_WE_WORK_TEXT }] },
+    },
+  });
+  if (frame.error !== undefined) {
+    throw new KitRefusal("kit_how_we_work_unwritable", frame.error.message ?? null);
+  }
+  if (frame.result?.isError !== true) return true;
+  const text = answerText(frame.result);
+  const { code, conflicts } = editRefusal(text);
+  if (code === "room_not_found" || code === "operation_denied") return false;
+  if (code === "edit_conflict" && conflicts?.some((conflict) => conflict.code === "path_exists")) return true;
+  throw new KitRefusal("kit_how_we_work_unwritable", text);
+}

package/src/bridge.js

@@ -228,6 +228,10 @@ export async function openBridge(options) {
       else void Promise.resolve(reported).finally(() => state.interrupts.delete(frame.interrupt));
       return;
     }
+    if (frame.type === "how_we_work") {
+      void options.howWeWork?.();
+      return;
+    }
     if (frame.type === "turn_ended") {
       state.stop = {
         providerContinuation: frame.provider_continuation === true,

package/src/configuration.js

@@ -7,18 +7,10 @@ import {
   MIGRATOR_TIMEOUT_MS,
 } from "./contract.js";
 import { declarationReader } from "./declaration.js";
-import { GOOGLE_DRIVE_ID } from "./google/id.js";
 import { KitRefusal } from "./refusal.js";
 
-const PRESETS = new Set(["custom", "google"]);
 const AGENT_CLIENTS = new Set(["claude-code"]);
-const GOOGLE_CURATED_SERVICES = new Set(["gmail", "calendar", "drive"]);
 const ENVIRONMENT_VALUE_MAX = 4096;
-const GOOGLE_API_HOST = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*\.googleapis\.com$/;
-const GOOGLE_API_PATH = /^\/[A-Za-z0-9._~!$&'()*+,;=:@%/-]+$/;
-const GOOGLE_API_SCOPE = /^https:\/\/www\.googleapis\.com\/auth\/[A-Za-z0-9._-]+$/;
-const EXTRACTION_PATH = /^(?:[A-Za-z_][A-Za-z0-9_-]*|\d+)(?:\.(?:[A-Za-z_][A-Za-z0-9_-]*|\d+))*$/;
-const QUERY_NAME = /^[A-Za-z][A-Za-z0-9_.-]{0,127}$/;
 
 const { refuse, plain, closed, text, positiveCount, filled } = declarationReader(
   "kit_configuration_invalid",
@@ -116,225 +108,33 @@ function backfillOf(value, declaration) {
   return { kind: named[0], bound: positiveCount(backfill[named[0]], declaration) };
 }
 
-function textList(value, declaration) {
-  return filled(value, declaration).map((entry, position) =>
-    text(entry, `${declaration}[${position}]`, 512),
-  );
-}
-
-function textArray(value, declaration) {
-  if (!Array.isArray(value)) refuse(declaration);
-  return value.map((entry, position) => text(entry, `${declaration}[${position}]`, 512));
-}
-
-function googleSelectionOf(value, declaration, service) {
-  if (service === "gmail") {
-    const selection = closed(value, ["labels"], declaration);
-    return { labels: textList(selection.labels, `${declaration}.labels`) };
-  }
-  if (service === "calendar") {
-    const selection = closed(value, ["calendars"], declaration);
-    return { calendars: textList(selection.calendars, `${declaration}.calendars`) };
-  }
-  if (service === "drive") {
-    const selection = closed(value, ["files", "folders"], declaration);
-    const files =
-      selection.files === undefined ? [] : textArray(selection.files, `${declaration}.files`);
-    const folders =
-      selection.folders === undefined ? [] : textArray(selection.folders, `${declaration}.folders`);
-    if (files.length + folders.length === 0) refuse(declaration);
-    files.forEach((id, position) => {
-      if (!GOOGLE_DRIVE_ID.test(id)) refuse(`${declaration}.files[${position}]`);
-    });
-    folders.forEach((id, position) => {
-      if (!GOOGLE_DRIVE_ID.test(id)) refuse(`${declaration}.folders[${position}]`);
-    });
-    return { files, folders };
-  }
-  refuse(declaration);
-}
-
-function extractionPath(value, declaration) {
-  const path = text(value, declaration, 512);
-  if (!EXTRACTION_PATH.test(path)) refuse(declaration);
-  return path;
-}
-
-function queryOf(value, declaration) {
-  const query = plain(value, declaration);
-  const parsed = {};
-  for (const [name, entry] of Object.entries(query)) {
-    if (!QUERY_NAME.test(name) || typeof entry !== "string" || entry.length > 2048) {
-      refuse(`${declaration}.${name}`);
-    }
-    parsed[name] = entry;
-  }
-  return parsed;
-}
-
-function declaredServiceOf(value, declaration) {
-  const declared = closed(
-    value,
-    ["host", "path", "query", "page_size", "page_token", "items", "fields", "scopes"],
-    declaration,
-  );
-  const host = text(declared.host, `${declaration}.host`, 253);
-  if (!GOOGLE_API_HOST.test(host)) refuse(`${declaration}.host`);
-  const path = text(declared.path, `${declaration}.path`, 2048);
-  if (!GOOGLE_API_PATH.test(path) || path.includes("..") || path.includes("//")) {
-    refuse(`${declaration}.path`);
-  }
-  const tokens = closed(
-    declared.page_token,
-    ["request", "response", "checkpoint_request", "checkpoint_response"],
-    `${declaration}.page_token`,
-  );
-  const pageToken = {
-    request: text(tokens.request, `${declaration}.page_token.request`, 128),
-    response: extractionPath(tokens.response, `${declaration}.page_token.response`),
-    checkpointRequest: text(
-      tokens.checkpoint_request,
-      `${declaration}.page_token.checkpoint_request`,
-      128,
-    ),
-    checkpointResponse: extractionPath(
-      tokens.checkpoint_response,
-      `${declaration}.page_token.checkpoint_response`,
-    ),
-  };
-  if (
-    !QUERY_NAME.test(pageToken.request) ||
-    !QUERY_NAME.test(pageToken.checkpointRequest) ||
-    pageToken.request === pageToken.checkpointRequest
-  ) {
-    refuse(`${declaration}.page_token`);
-  }
-  const fields = closed(
-    declared.fields,
-    [
-      "native_id",
-      "native_version",
-      "provider_modified_at",
-      "observed_at",
-      "body",
-      "container",
-      "author",
-      "url",
-    ],
-    `${declaration}.fields`,
-  );
-  const pageSize = text(declared.page_size, `${declaration}.page_size`, 128);
-  if (!QUERY_NAME.test(pageSize)) refuse(`${declaration}.page_size`);
-  const scopes = textList(declared.scopes, `${declaration}.scopes`).map((scope, position) => {
-    if (!GOOGLE_API_SCOPE.test(scope)) refuse(`${declaration}.scopes[${position}]`);
-    return scope;
-  });
-  return {
-    host,
-    path,
-    query: queryOf(declared.query, `${declaration}.query`),
-    pageSize,
-    scopes: [...new Set(scopes)],
-    pageToken,
-    items: extractionPath(declared.items, `${declaration}.items`),
-    fields: {
-      nativeId: extractionPath(fields.native_id, `${declaration}.fields.native_id`),
-      nativeVersion:
-        fields.native_version === undefined
-          ? null
-          : extractionPath(fields.native_version, `${declaration}.fields.native_version`),
-      providerModifiedAt:
-        fields.provider_modified_at === undefined
-          ? null
-          : extractionPath(
-              fields.provider_modified_at,
-              `${declaration}.fields.provider_modified_at`,
-            ),
-      observedAt: extractionPath(fields.observed_at, `${declaration}.fields.observed_at`),
-      body: textList(fields.body, `${declaration}.fields.body`).map((path, position) =>
-        extractionPath(path, `${declaration}.fields.body[${position}]`),
-      ),
-      container: extractionPath(fields.container, `${declaration}.fields.container`),
-      author:
-        fields.author === undefined
-          ? null
-          : extractionPath(fields.author, `${declaration}.fields.author`),
-      url:
-        fields.url === undefined ? null : extractionPath(fields.url, `${declaration}.fields.url`),
-    },
-  };
-}
-
-function serviceOf(value, declaration, preset) {
+function serviceOf(value, declaration) {
   const service = closed(
     value,
-    ["service", "source_ref", "rooms", "backfill", "connector", "selection", "declaration"],
+    ["service", "source_ref", "rooms", "backfill", "connector"],
     declaration,
   );
-  const name = declaredId(service.service, `${declaration}.service`);
-  if (preset === "custom" && service.connector === undefined) refuse(`${declaration}.connector`);
-  if (preset === "custom" && service.selection !== undefined) refuse(`${declaration}.selection`);
-  if (preset === "custom" && service.declaration !== undefined) refuse(`${declaration}.declaration`);
-  if (preset === "google" && service.connector !== undefined) refuse(`${declaration}.connector`);
-  if (preset === "google" && GOOGLE_CURATED_SERVICES.has(name) && service.declaration !== undefined) {
-    refuse(`${declaration}.declaration`);
-  }
-  if (preset === "google" && !GOOGLE_CURATED_SERVICES.has(name)) {
-    if (service.selection !== undefined) refuse(`${declaration}.selection`);
-    if (service.declaration === undefined) refuse(`${declaration}.declaration`);
-  }
   return {
-    service: name,
+    service: declaredId(service.service, `${declaration}.service`),
     sourceRef: text(service.source_ref, `${declaration}.source_ref`, 512),
     rooms: filled(service.rooms, `${declaration}.rooms`).map((room, position) =>
       text(room, `${declaration}.rooms[${position}]`, 512),
     ),
     backfill: backfillOf(service.backfill, `${declaration}.backfill`),
-    selection:
-      preset === "google" && GOOGLE_CURATED_SERVICES.has(name)
-        ? googleSelectionOf(service.selection, `${declaration}.selection`, name)
-        : null,
-    connector: preset === "custom" ? connectorOf(service.connector, `${declaration}.connector`) : null,
-    declaration:
-      preset === "google" && !GOOGLE_CURATED_SERVICES.has(name)
-        ? declaredServiceOf(service.declaration, `${declaration}.declaration`)
-        : null,
+    connector: connectorOf(service.connector, `${declaration}.connector`),
   };
 }
 
 function instanceOf(value, declaration) {
-  const instance = closed(value, ["id", "preset", "services", "scopes"], declaration);
-  const preset = declaredId(instance.preset, `${declaration}.preset`);
-  if (!PRESETS.has(preset)) refuse(`${declaration}.preset`);
-  if (preset !== "google" && instance.scopes !== undefined) refuse(`${declaration}.scopes`);
-  const scopes =
-    instance.scopes === undefined
-      ? []
-      : textList(instance.scopes, `${declaration}.scopes`).map((scope, position) => {
-          if (!GOOGLE_API_SCOPE.test(scope)) refuse(`${declaration}.scopes[${position}]`);
-          return scope;
-        });
+  const instance = closed(value, ["id", "preset", "services"], declaration);
   const services = filled(instance.services, `${declaration}.services`).map((service, position) =>
-    serviceOf(service, `${declaration}.services[${position}]`, preset),
+    serviceOf(service, `${declaration}.services[${position}]`),
   );
   services.forEach((service, position) => {
     const first = services.findIndex((candidate) => candidate.service === service.service);
     if (first !== position) refuse(`${declaration}.services[${position}].service`);
   });
-  services.forEach((service, position) => {
-    if (
-      service.declaration !== null &&
-      service.declaration.scopes.some((scope) => !scopes.includes(scope))
-    ) {
-      refuse(`${declaration}.services[${position}].declaration.scopes`);
-    }
-  });
-  return {
-    id: declaredId(instance.id, `${declaration}.id`),
-    preset,
-    services,
-    ...(preset === "google" ? { scopes: [...new Set(scopes)] } : {}),
-  };
+  return { id: declaredId(instance.id, `${declaration}.id`), preset: instance.preset, services };
 }
 
 function absolutePath(value, declaration) {
@@ -388,6 +188,7 @@ export function parseConfiguration(document) {
       "migrators",
       "clients",
       "host",
+      "skills",
     ],
     "configuration",
   );
@@ -397,10 +198,12 @@ export function parseConfiguration(document) {
   if (!EXECUTION_AUTHORITIES.includes(declared.execution_authority)) {
     refuse("execution_authority");
   }
+  const skills = declared.skills === undefined ? true : declared.skills;
+  if (typeof skills !== "boolean") refuse("skills");
   if (!Array.isArray(declared.instances)) refuse("instances");
   if (!Array.isArray(declared.migrators)) refuse("migrators");
-  const instances = declared.instances.map((instance, position) =>
-    instanceOf(instance, `instances[${position}]`),
+  const instances = declared.instances.flatMap((instance, position) =>
+    instance?.preset === "custom" ? [instanceOf(instance, `instances[${position}]`)] : [],
   );
   instances.forEach((instance, position) => {
     const first = instances.findIndex((candidate) => candidate.id === instance.id);
@@ -428,6 +231,7 @@ export function parseConfiguration(document) {
     migrators,
     clients,
     host: hostOf(declared.host, "host"),
+    skills,
   };
 }
 

package/src/connector-login.js

@@ -1,91 +1,10 @@
 import { readConfiguration, sourceInstance } from "./configuration.js";
 import { authorizeCustom, customAuthorizationStatus } from "./custom/authorization.js";
-import { googleAuthorization, authorizeGoogle, GOOGLE_SCOPES } from "./google/oauth.js";
-import { KitRefusal } from "./refusal.js";
 
-function googleServiceScopes(service) {
-  const curated = GOOGLE_SCOPES[service.service];
-  return curated === undefined ? service.declaration.scopes : [curated];
-}
-
-function googleServiceAuthorized(authorization, scopes) {
-  return authorization.grants.some((grant) =>
-    scopes.every((scope) => grant.scopes.includes(scope)),
-  );
-}
-
-function googleConsent(service, context) {
-  return async ({ url }) => {
-    const collected = await context.present(
-      {
-        steps: [
-          { kind: "visit", label: `Sign in to Google and allow access for ${service.service}`, url },
-          {
-            kind: "collect",
-            label: "The address your browser ended on",
-            name: "address",
-            description:
-              "After you allow access, Google sends your browser to a 127.0.0.1 address that does not open. Copy that whole address from the address bar and paste it here.",
-          },
-        ],
-      },
-      context.signal,
-    );
-    return collected.address;
-  };
-}
-
-const CONNECTOR_LOGINS = {
-  custom: {
-    status: customAuthorizationStatus,
-    login: authorizeCustom,
-  },
-  google: {
-    status: async (instance, context) => {
-      const authorization = await googleAuthorization(context.directory, instance.id);
-      if (authorization === null) return false;
-      return instance.services.every((service) =>
-        googleServiceAuthorized(authorization, googleServiceScopes(service)),
-      );
-    },
-    guided: async (instance, context) => {
-      for (const service of instance.services) {
-        try {
-          await authorizeGoogle(
-            {
-              directory: context.directory,
-              instance: instance.id,
-              client: context.dependencies.googleOAuthClient(),
-              scopes: googleServiceScopes(service),
-              approve: googleConsent(service, context),
-            },
-            context.dependencies.googleDependencies ?? {},
-          );
-        } catch (error) {
-          if (context.signal.aborted) return "cancelled";
-          if (error instanceof KitRefusal && error.code === "google_authorization_declined") {
-            return "cancelled";
-          }
-          return "failed";
-        }
-      }
-      return "ready";
-    },
-  },
-};
-
-export function connectorLogin(instance, dependencies = {}) {
-  return { ...CONNECTOR_LOGINS, ...(dependencies.connectorLogins ?? {}) }[instance.preset];
-}
-
-export async function signInConnector(options, dependencies = {}) {
+export async function signInConnector(options) {
   const configuration = await readConfiguration(options.configuration);
   const instance = sourceInstance(configuration, options.instance);
-  const gateway = connectorLogin(instance, dependencies);
-  if (gateway.login === undefined) {
-    throw new KitRefusal("kit_connector_login_guided", `${instance.id} signs in through House setup`);
-  }
   const context = { directory: options.directory, signal: options.signal };
-  if (await gateway.status(instance, context)) return "skipped";
-  return (await gateway.login(instance, context)) ? "ready" : "needs_attention";
+  if (await customAuthorizationStatus(instance, context)) return "skipped";
+  return (await authorizeCustom(instance, context)) ? "ready" : "needs_attention";
 }

package/src/contract.js

@@ -259,6 +259,10 @@ export const KIT_LOGIN_REPORT_PATH = "/kit/logins/report";
 export const GUIDED_LOGIN_TIMEOUT_MS = 10 * 60 * 1000;
 export const GUIDED_LOGIN_OUTPUT_MAX_BYTES = 64 * 1024;
 
+export const KIT_SOURCES_DESIRED_PATH = "/kit/sources/desired";
+export const KIT_SOURCES_REPORT_PATH = "/kit/sources/report";
+export const SOURCE_CAPTURE_INTERVAL_MS = 15 * 60 * 1000;
+
 export const EXECUTION_AUTHORITIES = ["allow", "refuse"];
 
 export const PERMISSION_OPTION_KINDS = Object.freeze({

package/src/delivery.js

@@ -54,10 +54,8 @@ const FAILURE_CATEGORIES = {
   google_provider_unavailable: "provider",
   google_provider_response_invalid: "provider",
   google_checkpoint_invalid: "provider",
-  google_service_unsupported: "config",
-  google_oauth_client_unconfigured: "config",
-  google_drive_selection_exceeded: "config",
   google_drive_item_missing: "provider",
+  api_disabled: "config",
 };
 
 export function fileDescriptor(file) {
@@ -184,8 +182,7 @@ export function stallOf(code, houseRetry = null) {
 
 export function healthOfRun(stall) {
   if (stall === null) return { state: "ok", category: null };
-  return {
-    state: stall.disposition === "retry" ? "retrying" : "failed",
-    category: stall.category ?? FAILURE_CATEGORIES[stall.code] ?? "internal",
-  };
+  const category = stall.category ?? FAILURE_CATEGORIES[stall.code] ?? "internal";
+  if (stall.disposition === "retry") return { state: "retrying", category };
+  return { state: "failed", category, cause: stall.code };
 }