@agentshouse/kit 0.1.0-alpha.3 → 0.1.0-alpha.31

package/src/workspace.js

@@ -28,7 +28,7 @@ import {
   releaseControl,
   reportWorkspaceOutcome,
 } from "./house.js";
-import { KitRefusal } from "./refusal.js";
+import { houseFailed, KitRefusal } from "./refusal.js";
 
 const REQUIRED_CONTROLLERS = ["cpu", "memory"];
 const MEMINFO = "/proc/meminfo";
@@ -461,40 +461,48 @@ export async function serveWorkspaces(options, dependencies = {}) {
   const withdrawn = [];
   let reconciled = [];
   const passes = options.passes ?? Number.POSITIVE_INFINITY;
-  for (let pass = 0; pass < passes; pass += 1) {
-    const work = await maintainControl(
-      session,
-      async (signal) => {
-        const acquired = await acquireWorkspaces(session, WORKSPACE_ACQUIRE_MAX, signal);
-        reconciled = await reconcileWorkspaces(host, acquired.workspaces);
-        for (const operation of acquired.operations) {
-          let report;
-          try {
-            report = await performOperation(host, settings, operation);
-          } catch (error) {
-            if (!(error instanceof KitRefusal)) throw error;
-            report = { outcome: "failed", refusal: error.message };
-          }
-          try {
-            await reportWorkspaceOutcome(session, operation.operation, report, signal);
-          } catch (error) {
-            if (!(error instanceof KitRefusal) || error.code !== WORKSPACE_OPERATION_WITHDRAWN) {
-              throw error;
+  try {
+    for (let pass = 0; pass < passes; pass += 1) {
+      const work = await maintainControl(
+        session,
+        async (signal) => {
+          const acquired = await acquireWorkspaces(session, WORKSPACE_ACQUIRE_MAX, signal);
+          reconciled = await reconcileWorkspaces(host, acquired.workspaces);
+          for (const operation of acquired.operations) {
+            let report;
+            try {
+              report = await performOperation(host, settings, operation);
+            } catch (error) {
+              if (!(error instanceof KitRefusal)) throw error;
+              report = { outcome: "failed", refusal: error.message };
             }
-            withdrawn.push({ operation: operation.operation, kind: operation.kind });
-            continue;
+            try {
+              await reportWorkspaceOutcome(session, operation.operation, report, signal);
+            } catch (error) {
+              if (!(error instanceof KitRefusal) || error.code !== WORKSPACE_OPERATION_WITHDRAWN) {
+                throw error;
+              }
+              withdrawn.push({ operation: operation.operation, kind: operation.kind });
+              continue;
+            }
+            settled.push({ operation: operation.operation, kind: operation.kind, ...report });
           }
-          settled.push({ operation: operation.operation, kind: operation.kind, ...report });
-        }
-        return acquired;
-      },
-      options.signal,
-      { release: false },
-    );
-    if (pass + 1 < passes && work.operations.length === 0) {
-      await host.wait(WORKSPACE_POLL_MS);
+          return acquired;
+        },
+        options.signal,
+        { release: false },
+      ).catch((error) => {
+        if (!houseFailed(error)) throw error;
+        return null;
+      });
+      if (pass + 1 < passes && (work === null || work.operations.length === 0)) {
+        await host.wait(WORKSPACE_POLL_MS);
+      }
     }
+  } catch (error) {
+    if (!(error instanceof KitRefusal) || error.code !== "kit_command_cancelled") throw error;
+  } finally {
+    await releaseControl(session);
   }
-  await releaseControl(session);
   return { settled, reconciled, withdrawn };
 }

package/src/google/declared.js

@@ -1,146 +0,0 @@
-import { ITEM_BODY_MAX_BYTES } from "../contract.js";
-import { KitRefusal } from "../refusal.js";
-import { googleJson } from "./gateway.js";
-
-function valueAt(value, path) {
-  let current = value;
-  for (const segment of path.split(".")) {
-    if (current === null || current === undefined || typeof current !== "object") return undefined;
-    current = current[segment];
-  }
-  return current;
-}
-
-function requiredText(value, declaration) {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new KitRefusal("google_provider_response_invalid", declaration);
-  }
-  return value;
-}
-
-function optionalText(value, declaration) {
-  if (value === undefined || value === null) return null;
-  return requiredText(value, declaration);
-}
-
-function cursorOf(value) {
-  if (value === null) return { pageToken: null, checkpoint: null };
-  let cursor;
-  try {
-    cursor = JSON.parse(value);
-  } catch {
-    throw new KitRefusal("google_checkpoint_invalid", "declared service");
-  }
-  if (
-    typeof cursor !== "object" ||
-    cursor === null ||
-    (cursor.pageToken !== null && typeof cursor.pageToken !== "string") ||
-    (cursor.checkpoint !== null && typeof cursor.checkpoint !== "string")
-  ) {
-    throw new KitRefusal("google_checkpoint_invalid", "declared service");
-  }
-  return cursor;
-}
-
-function composedBody(item, paths) {
-  const parts = paths.map((path) => valueAt(item, path));
-  if (parts.some((part) => !["string", "number", "boolean"].includes(typeof part))) {
-    throw new KitRefusal("google_provider_response_invalid", "declared body");
-  }
-  const body = parts.map((part) => `${part}`).join("\n\n");
-  if (Buffer.byteLength(body, "utf8") > ITEM_BODY_MAX_BYTES) {
-    throw new KitRefusal("google_provider_response_invalid", "declared body");
-  }
-  return body;
-}
-
-function normalizedItem(service, item) {
-  const fields = service.declaration.fields;
-  const observedAt = requiredText(valueAt(item, fields.observedAt), "declared observed time");
-  if (Number.isNaN(Date.parse(observedAt))) {
-    throw new KitRefusal("google_provider_response_invalid", "declared observed time");
-  }
-  const container = requiredText(valueAt(item, fields.container), "declared container");
-  const nativeVersion =
-    fields.nativeVersion === null
-      ? null
-      : optionalText(valueAt(item, fields.nativeVersion), "declared native version");
-  const providerModifiedAt =
-    fields.providerModifiedAt === null
-      ? null
-      : optionalText(
-          valueAt(item, fields.providerModifiedAt),
-          "declared provider modification time",
-        );
-  if (providerModifiedAt !== null && Number.isNaN(Date.parse(providerModifiedAt))) {
-    throw new KitRefusal("google_provider_response_invalid", "declared provider modification time");
-  }
-  return {
-    namespace: `google/${service.service}`,
-    nativeObjectId: requiredText(valueAt(item, fields.nativeId), "declared native id"),
-    nativeVersion,
-    providerModifiedAt:
-      providerModifiedAt === null ? null : new Date(providerModifiedAt).toISOString(),
-    observedAt: new Date(observedAt).toISOString(),
-    body: composedBody(item, fields.body),
-    author:
-      fields.author === null
-        ? null
-        : optionalText(valueAt(item, fields.author), "declared author"),
-    url:
-      fields.url === null ? null : optionalText(valueAt(item, fields.url), "declared url"),
-    attachments: [],
-    container: `google/${service.service}/${container}`,
-  };
-}
-
-export async function declaredPage(options, dependencies = {}) {
-  const declared = options.service.declaration;
-  const cursor = cursorOf(options.cursor);
-  const url = new URL(declared.path, `https://${declared.host}`);
-  for (const [name, value] of Object.entries(declared.query)) url.searchParams.set(name, value);
-  url.searchParams.set(declared.pageSize, `${options.limit}`);
-  if (cursor.pageToken !== null) {
-    url.searchParams.set(declared.pageToken.request, cursor.pageToken);
-  }
-  if (cursor.checkpoint !== null) {
-    url.searchParams.set(declared.pageToken.checkpointRequest, cursor.checkpoint);
-  }
-  const answer = await googleJson(
-    {
-      directory: options.directory,
-      instance: options.instance,
-      client: options.client,
-      requiredScopes: declared.scopes,
-      url: url.toString(),
-      signal: options.signal,
-    },
-    dependencies,
-  );
-  const entries = valueAt(answer, declared.items);
-  if (!Array.isArray(entries) || entries.length > options.limit) {
-    throw new KitRefusal("google_provider_response_invalid", "declared items");
-  }
-  const pageToken = valueAt(answer, declared.pageToken.response);
-  let next;
-  if (pageToken !== undefined && pageToken !== null) {
-    next = {
-      pageToken: requiredText(pageToken, "declared page token"),
-      checkpoint: cursor.checkpoint,
-    };
-  } else {
-    next = {
-      pageToken: null,
-      checkpoint: requiredText(
-        valueAt(answer, declared.pageToken.checkpointResponse),
-        "declared checkpoint",
-      ),
-    };
-  }
-  return {
-    items: entries.map((entry) => normalizedItem(options.service, entry)),
-    dropped: [],
-    cursor: JSON.stringify(next),
-    more: pageToken !== undefined && pageToken !== null,
-  };
-}

package/src/google/id.js

@@ -1 +0,0 @@
-export const GOOGLE_DRIVE_ID = /^[A-Za-z0-9_-]{1,512}$/;

package/src/instance/google.js

@@ -1 +0,0 @@
-export const GOOGLE_OAUTH_CLIENT = Object.freeze({"id":"911965338518-867gdvuddb7kdkjo3qvpv6gds369alb7.apps.googleusercontent.com","secret":"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"});

package/src/starter-set.js

@@ -1,17 +0,0 @@
-import { cp, mkdir, symlink, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const AGENTS_INSTRUCTION = "The agents.house `house` CLI is available: run `house --help`.\n";
-const GRILLING_SOURCE = fileURLToPath(new URL("starter-set/grilling/", import.meta.url));
-
-export async function seedStarterSet(target) {
-  await mkdir(target, { recursive: true });
-  await writeFile(join(target, "AGENTS.md"), AGENTS_INSTRUCTION);
-  await symlink("AGENTS.md", join(target, "CLAUDE.md"));
-  const skills = join(target, ".agents", "skills");
-  await mkdir(skills, { recursive: true });
-  await cp(GRILLING_SOURCE, join(skills, "grilling"), { recursive: true });
-  await mkdir(join(target, ".claude"), { recursive: true });
-  await symlink(join("..", ".agents", "skills"), join(target, ".claude", "skills"));
-}