@agentshouse/kit 0.1.0-alpha.16 → 0.1.0-alpha.18

package/README.md

@@ -10,7 +10,7 @@ On Linux `amd64` or `arm64` with a working Docker Engine, run the published,
 versioned bootstrap once:
 
 ```sh
-bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.16/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.18/connect-linux.sh)
 ```
 
 The release asset pins one immutable multi-architecture image digest. It creates
@@ -105,6 +105,14 @@ Forwarding installs no host-native Kit and gives the container no Docker socket
 or further mount; it refuses when no Kit is installed or the installed one
 differs from this bootstrap's.
 
+The owner's working copy push is forwarded the same way: run
+`bash <(curl -fsSL …/connect-linux.sh) house git push [commit] --owner` from a
+directory beneath the workspace root, such as a Room copy under
+`working-copies/rooms/`. The bootstrap runs the container's `house` in the
+matching directory beneath `/agents/house`, through the resident's lease when
+the container runs, and refuses a directory outside the workspace before
+anything reaches House.
+
 ## Building the package
 
 The repository checkout is the development source. Build the package
@@ -760,11 +768,13 @@ prompt's stop reason through the contract's own table to one of four turn
 outcomes: completed, interrupted, refused by the provider, or exhausted. A stop
 reason the contract does not name, including a vendor-specific one a different
 contract names, fails the turn as `kit_adapter_contract_mismatch` rather than
-being guessed. It sends the request
-as the first prompt block, followed by current House guidance fetched through
-the Run connection. Missing or unreadable guidance refuses the turn; the
-launcher does not copy the private Routine instruction into the acquisition
-request. It forwards only adapter-classified User-visible assistant
+being guessed. After committing the Run, and again on every resumption, the
+Kit reads what the Session was started for from House's
+`/kit/runs/<run>/request` with the Session credential: the Routine Request with
+its input, references, requester and the pinned revision's instruction, or the
+sealed conversation turn. It sends that as the first prompt block, followed by
+current House guidance fetched through the Run connection, so the Agent calls
+nothing to learn it. An unreadable request or guidance refuses the turn. It forwards only adapter-classified User-visible assistant
 text back over the local channel, and leaves reasoning, tool traces, and
 terminal output where they are. The supervised process's own House calls travel
 that same channel through the `house` CLI. The Kit holds the WorkerRunToken, replaces it in place when
@@ -827,7 +837,9 @@ nonzero exit status. The CLI holds
 no credential: it calls over its Session's bridge, which attaches the Session
 credential and refuses a caller without that Session's nonce as
 `kit_bridge_unauthorized`. House network calls use only the selected
-`2026-07-28` profile.
+`2026-07-28` profile. `house git push` is the one local verb House does not list;
+[working copies](#working-copies) describe it, and `house --help` and
+`house git push --help` explain it.
 
 Two verbs name files on the Session's own computer: `upload_attachment` takes
 one `path`, and `append_record` takes `attachments` as local paths. The CLI
@@ -910,8 +922,8 @@ receiving a complete byte stream, validating any reported size, and writing the
 file. A lost acknowledgement preserves the completed local file for House's
 idempotent admission and later cleanup. Failed files remain pending; House's
 all-files-ready gate keeps their turn unprocessed.
-The provider receives absolute local paths beside the owning messages, both in
-its initial prompt and in `session_get_request`. The cache persists across
+The provider receives absolute local paths beside the owning messages in its
+first prompt. The cache persists across
 turns; only House-authorized terminal Run cleanup removes its Run directory.
 
 The accepted attachment's retained original is separate from that cache. The Kit
@@ -936,8 +948,8 @@ outcome it handled, and exits non-zero while any of them is unsaved.
 One `kit worker run` then takes one House-authorized resumption, or otherwise
 acquires one waiting Run, and supervises exactly that WorkerSession. A resumed
 conversation loads its retained native provider session through ACP
-`session/load`, receives the current input from House through
-`session_get_request`, and executes one turn. Historical output replayed during
+`session/load`, receives the current input House answers for the Run in its
+first prompt, and executes one turn. Historical output replayed during
 loading is not emitted as new assistant output. Missing or rejected provider
 continuation never starts a replacement provider conversation in the same Run.
 
@@ -1246,14 +1258,54 @@ current grant. Every other file is read-only House content: the generated
 grants anything, and House refuses a change to a read-only path however it is
 committed.
 
-Local edits, staging and commits change nothing in House. `refs/house/received`
-records the House content last received. The per-file manifest, with each
-file's House revision, digest and writability, and the commit it corresponds to
-stay in Kit home under `state/working-copies/`, outside the repository. A local
-commit is a local tree, never a House revision.
+Local edits, staging and commits change nothing in House until a commit is
+pushed. `refs/house/received` records the House content last received; each
+commit Kit wrote there, and each commit it acknowledged for a push, is a House
+state. The House revision of every file content Kit received, keyed by path and
+Git blob, stays in Kit home under `state/working-copies/`, outside the
+repository. A local commit is a local tree, never a House revision.
+
+`house git push [commit]`, run anywhere inside a copy or one of its linked
+worktrees, submits one commit, `HEAD` by default, resolved once. Kit compares
+that commit's tree with the newest House state in its history, so every linked
+worktree keeps its own base, and sends the difference as one ordinary House edit:
+a changed field, section or preamble against its own prior value, any other
+change as the whole file against its exact revision, a new file as a create and
+a committed deletion as a removal. Staged and unstaged work, and files absent
+only from the working tree, are never sent. Native `git push` reaches no House
+remote. Inside an Agent Session the push goes through that Session's bridge,
+under its own authority and provenance; outside one it needs
+`house git push [commit] --owner`, which the resident Kit carries out under its
+control lease when a resident runs, and which otherwise acquires and releases
+its own. A Session refuses `--owner`, and a missing bridge is never replaced by
+owner authority.
+
+House decides before any local Git step. A refusal changes nothing in House;
+after `edit_conflict` Kit records the current content House names for the
+refused paths in `refs/house/received`, reading by revision any content the
+refusal does not carry, so the agent merges or rebases onto it with native Git,
+commits, and pushes again. After acceptance Kit records House's result for the
+pushed paths, the contents an owner push receives or each accepted revision
+read by name, in a commit that covers the pushed one and in
+`refs/house/received`; a read-only path House regenerates, such as the Wiki
+index, stays out of Git. Kit then
+fast-forwards a clean branch still at the pushed commit, or rebases only its
+later commits. A result not yet readable, uncommitted tracked changes,
+a moved branch or a rebase conflict leave the branch as it was, with no stash or
+reset, and the push answers that House accepted it while local integration is
+pending; the next `house git push` finishes that integration without another
+House edit. A push whose answer was lost is recorded in Kit home before it is
+sent, and the next push by the same Session, or by the owner for an owner push,
+resends it under its original operation. Another caller cannot
+recover it: while the pushing Session lives it is refused as
+`kit_working_copy_push_pending`, and once that Session has ended Kit reads House
+again and drops it. When a retained push's operation has expired, Kit reads the
+Room again: if House holds the pushed content the push finishes as accepted,
+otherwise it is dropped and the next push submits it as a new operation.
 
 Deselecting a Room, or losing read access to it, marks its copy inactive:
-launches omit it and nothing local is deleted. Selecting it again reads the Room
+launches omit it, a new push is refused as `kit_working_copy_inactive`, and
+nothing local is deleted; a push already sent still settles and integrates. Selecting it again reads the Room
 again, advances `refs/house/received`, and replaces only the read-only content
 Kit wrote, never the branch, the index or a tracked file. A Room the owner may
 read without sync is refused as `operation_denied` and stays uncopied, while its

package/bin/connect-linux.sh

@@ -9,6 +9,7 @@ MANUAL=0
 WORKSPACE_SELECTED=0
 HOUSE_SELECTED=0
 FORWARDING=0
+FORWARDED=kit
 FORWARD=()
 
 refuse() {
@@ -41,8 +42,9 @@ start_resident() {
   docker run -d --name "$NAME" --restart unless-stopped --user "$(id -u):$(id -g)" --mount "$KIT_HOME_MOUNT" --mount "$WORKSPACE_MOUNT" --label "agentshouse.house=$HOUSE" --env HOME=/kit-home --env HOUSE_KIT_HOME=/kit-home --env HOUSE_KIT_CONTAINER=1 "$IMAGE" resident --house "$HOUSE" >/dev/null
 }
 
-if [[ "${1:-}" == kit ]]; then
+if [[ "${1:-}" == kit || "${1:-}" == house ]]; then
   FORWARDING=1
+  FORWARDED="$1"
   FORWARD=("${@:2}")
   set --
 fi
@@ -129,10 +131,18 @@ if docker container inspect "$NAME" >/dev/null 2>&1; then
   [[ "$(docker inspect --format '{{index .Config.Labels "agentshouse.house"}}' "$NAME")" == "$HOUSE" ]] || refuse 'the installed Kit uses another House origin'
   [[ -f "$KIT_HOME/credential" && -f "$KIT_HOME/environment" && -f "$KIT_HOME/house" ]] || refuse 'the installed Kit has no enrolled authority'
   if ((FORWARDING)); then
-    if [[ "${FORWARD[0]:-}" == login ]]; then
+    if [[ "$FORWARDED" == kit && "${FORWARD[0]:-}" == login ]]; then
       login_kit "${FORWARD[@]:1}"
       exit 0
     fi
+    PLACED=()
+    ENTRY=()
+    if [[ "$FORWARDED" == house ]]; then
+      HERE=$(pwd -P)
+      [[ "$HERE" == "$WORKSPACE" || "$HERE" == "$WORKSPACE"/* ]] || refuse "the current directory is outside the workspace $WORKSPACE"
+      PLACED=(--workdir "/agents/house${HERE#"$WORKSPACE"}")
+      ENTRY=(--entrypoint house)
+    fi
     TERMINAL=()
     if [[ -t 0 && -t 1 ]]; then TERMINAL=(-t); fi
     if [[ -t 0 && ! -t 1 ]]; then
@@ -141,9 +151,9 @@ if docker container inspect "$NAME" >/dev/null 2>&1; then
       stty -echo
     fi
     if [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]; then
-      docker exec -i "${TERMINAL[@]}" "$NAME" kit "${FORWARD[@]}"
+      docker exec -i "${TERMINAL[@]}" "${PLACED[@]}" "$NAME" "$FORWARDED" "${FORWARD[@]}"
     else
-      "${DOCKER_RUN[@]:0:2}" -i "${TERMINAL[@]}" "${DOCKER_RUN[@]:2}" "${FORWARD[@]}"
+      "${DOCKER_RUN[@]:0:2}" -i "${TERMINAL[@]}" "${PLACED[@]}" "${ENTRY[@]}" "${DOCKER_RUN[@]:2}" "${FORWARD[@]}"
     fi
     exit
   fi

package/bootstrap.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.1.0-alpha.16",
+  "version": "0.1.0-alpha.18",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -9,6 +9,7 @@
   "private": false,
   "type": "module",
   "bin": {
+    "house": "src/session-bin/house",
     "kit": "bin/kit.js"
   },
   "exports": {

package/src/adapter-mcp.js

@@ -29,16 +29,3 @@ export async function commandHouseInstructions(bridge) {
   }
   return frame.result.instructions;
 }
-
-export async function commandHouseRequest(bridge) {
-  const frame = await commandHouseReply(bridge, { method: "tools/call", params: { name: "session_get_request", arguments: {} } });
-  if (frame.error !== undefined || frame.result?.isError === true) throw new KitRefusal("kit_run_input_unreadable");
-  try {
-    const content = frame.result.content;
-    const input = JSON.parse(content.find((item) => item.type === "text").text);
-    if (typeof input !== "object" || input === null || Array.isArray(input)) throw new Error();
-    return input;
-  } catch {
-    throw new KitRefusal("kit_run_input_unreadable");
-  }
-}

package/src/bridge.js

@@ -18,7 +18,7 @@ import {
 import { operationId } from "./operation.js";
 import { houseFailed } from "./refusal.js";
 
-function bridgedFrame(request, operation) {
+export function bridgedFrame(request, operation) {
   if (typeof request.method !== "string") return request;
   const params = typeof request.params === "object" && request.params !== null ? request.params : {};
   const declared = typeof params._meta === "object" && params._meta !== null ? params._meta : {};

package/src/contract.js

@@ -1,6 +1,6 @@
 import { CLAUDE_PASTED_CODE, CODEX_DEVICE_CODE, GROK_DEVICE_CODE } from "./agent-logins.js";
 
-export const KIT_CONTRACT_VERSION = "2026-09-28-working-copies";
+export const KIT_CONTRACT_VERSION = "2026-09-28-first-prompt";
 export const KIT_CAPTURE_BATCH_MAX = 100;
 export const COMMAND_INPUT_MAX_BYTES = 4 * 1024;
 export const AUTHORIZATION_OUTPUT_MAX_BYTES = 4 * 1024;
@@ -40,6 +40,10 @@ export function runOutcomePath(run) {
   return `/kit/runs/${encodeURIComponent(run)}/outcome`;
 }
 
+export function runRequestPath(run) {
+  return `/kit/runs/${encodeURIComponent(run)}/request`;
+}
+
 export const KIT_SESSIONS_REPORT_PATH = "/kit/sessions/report";
 export const KIT_SESSIONS_REPORT_MAX = 256;
 
@@ -288,17 +292,21 @@ export const KIT_DOOR_DISCOVER_PATH = "/kit/door/discover";
 export const KIT_DOOR_BOOTSTRAP_PATH = "/kit/door/bootstrap";
 export const KIT_DOOR_ENUMERATE_PATH = "/kit/door/enumerate";
 export const KIT_DOOR_BATCH_PATH = "/kit/door/batch";
+export const KIT_DOOR_REVISIONS_PATH = "/kit/door/revisions";
 export const EXPLICIT_SYNC_VERSION = "explicit-sync/2";
 export const KIT_DOOR_UNMOUNT_PATH = "/kit/door/unmount";
 
 export const KIT_WORKING_COPY_SELECTION_PATH = "/kit/working-copy/selection";
-export const WORKING_COPY_VERSION = "working-copy-state/1";
+export const WORKING_COPY_VERSION = "working-copy-state/2";
 export const WORKING_COPIES_HOME = "working-copies";
 export const WORKING_COPY_ROOM_HOMES = ["capture", "library", "collaboration"];
 export const WORKING_COPY_PRIVATE_HOMES = ["library", "collaboration", "rooms", "agents", "house"];
 export const WORKING_COPY_RECEIVED_REF = "refs/house/received";
 export const WORKING_COPY_BRANCH = "main";
 export const ROOM_REFERENCE = /^r_[0-9a-z]+\.[0-9a-z]$/;
+export const WORKING_COPY_PUSH_METHOD = "house/git/push";
+export const WORKING_COPY_PUSH_HELP =
+  "Submit a Room commit to House; default HEAD. Use --owner only outside an Agent Session. Native git push is not a House remote.";
 
 export const MIGRATOR_CONTRACT = "kit-migrator/1";
 export const MIGRATOR_CATEGORY = "migrator";

package/src/house-main.js

@@ -1,9 +1,19 @@
-import { resolve } from "node:path";
-import { BRIDGE_NONCE_ENVIRONMENT, BRIDGE_SOCKET_ENVIRONMENT } from "./contract.js";
-import { bridgeCall } from "./mcp.js";
-import { KitRefusal } from "./refusal.js";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import {
+  BRIDGE_NONCE_ENVIRONMENT,
+  BRIDGE_SOCKET_ENVIRONMENT,
+  WORKING_COPY_PUSH_HELP,
+  WORKING_COPY_PUSH_METHOD,
+} from "./contract.js";
+import { storedHouse } from "./login.js";
+import { answerText, bridgeCall } from "./mcp.js";
+import { formatCommandError, KitRefusal } from "./refusal.js";
+import { ownerPush } from "./working-copy.js";
 
 const HELP = ["--help", "-h"];
+const OWNER = "--owner";
+const GIT_PUSH_USAGE = `usage: house git push [commit] [${OWNER}]`;
 const usage = (verb) => `usage: house ${verb} ['<arguments as one JSON object>' | - for standard input]`;
 
 async function answered(method, params) {
@@ -49,10 +59,59 @@ function located(verb, args) {
   return args;
 }
 
+function printed(result) {
+  const text = answerText(result);
+  return result?.isError === true ? { err: text, status: 1 } : { out: text };
+}
+
+async function ownerPushed(request) {
+  const directory = process.env.HOUSE_KIT_HOME ?? join(homedir(), ".house-kit");
+  const cancellation = new AbortController();
+  const cancel = () => cancellation.abort();
+  process.once("SIGINT", cancel);
+  process.once("SIGTERM", cancel);
+  try {
+    const pushed = await ownerPush(
+      { house: await storedHouse(directory), directory, signal: cancellation.signal },
+      request,
+    );
+    return pushed.refused ? { err: pushed.text, status: 1 } : { out: pushed.text };
+  } catch (refusal) {
+    return { err: formatCommandError(refusal), status: 1 };
+  } finally {
+    process.removeListener("SIGINT", cancel);
+    process.removeListener("SIGTERM", cancel);
+  }
+}
+
+async function gitPush([action, ...rest]) {
+  if (action !== "push") throw new KitRefusal("kit_house_arguments_invalid", GIT_PUSH_USAGE);
+  if (rest.some((argument) => HELP.includes(argument))) return { out: `${GIT_PUSH_USAGE}\n\n${WORKING_COPY_PUSH_HELP}` };
+  const owner = rest.includes(OWNER);
+  const named = rest.filter((argument) => argument !== OWNER);
+  if (named.length > 1 || named.some((argument) => argument.startsWith("-"))) {
+    throw new KitRefusal("kit_house_arguments_invalid", GIT_PUSH_USAGE);
+  }
+  const request = { cwd: process.cwd(), commit: named[0] ?? "HEAD" };
+  if (process.env[BRIDGE_SOCKET_ENVIRONMENT] === undefined) {
+    if (!owner) throw new KitRefusal("kit_bridge_unavailable");
+    return ownerPushed(request);
+  }
+  if (owner) throw new KitRefusal("kit_house_arguments_invalid", `${OWNER} is only for use outside an Agent Session`);
+  return printed(await answered(WORKING_COPY_PUSH_METHOD, request));
+}
+
 async function house([verb, argument, ...rest]) {
+  if (verb === "git") return gitPush([argument, ...rest].filter((part) => part !== undefined));
   if (verb === undefined || HELP.includes(verb)) {
     const tools = await listed();
-    return { out: [usage("<verb>"), ...tools.map((tool) => `${tool.name}\n${tool.description}`)].join("\n\n") };
+    return {
+      out: [
+        usage("<verb>"),
+        ...tools.map((tool) => `${tool.name}\n${tool.description}`),
+        `git push [commit]\n${WORKING_COPY_PUSH_HELP}`,
+      ].join("\n\n"),
+    };
   }
   if (HELP.includes(argument)) {
     const tool = (await listed()).find((one) => one.name === verb);
@@ -61,9 +120,7 @@ async function house([verb, argument, ...rest]) {
   }
   if (rest.length > 0) throw new KitRefusal("kit_house_arguments_invalid", usage(verb));
   const args = located(verb, await argumentsOf(verb, argument));
-  const result = await answered("tools/call", { name: verb, arguments: args });
-  const text = (result?.content ?? []).filter((item) => item.type === "text").map((item) => item.text).join("\n");
-  return result?.isError === true ? { err: text, status: 1 } : { out: text };
+  return printed(await answered("tools/call", { name: verb, arguments: args }));
 }
 
 house(process.argv.slice(2)).then(