@ours.network/fleet 0.18.0-nightly.6 → 0.18.0

package/dist/owner-channel/channel.d.ts

@@ -1,8 +1,10 @@
+import { type ChildProcessWithoutNullStreams } from 'node:child_process';
 import { type OwnerChannelConfig } from '../config.js';
+import { type FetchLike } from '../monitor.js';
 import { type SessionHandle } from '../session/types.js';
 import { type OwnerFleetOps } from './commands.js';
 import type { ManagedFleetSpawnResult } from '../fleet-proxy.js';
-import { type OursOps } from './ours-client.js';
+import { type OursToolClient } from './mcp.js';
 import { type OwnerUpdatePhase } from './notices.js';
 import { type OwnerEntry } from './state.js';
 import { type OwnerTaskPhase } from './tasks.js';
@@ -15,8 +17,15 @@ export interface OwnerChannelOptions {
     session: SessionHandle;
     stateDir: string;
     env?: Record<string, string>;
+    command?: string;
     log(line: string): void;
-    client?: OursOps;
+    client?: OursToolClient;
+    /** Legacy child-process test seam; production uses the direct notification API. */
+    watch?: (identity: string) => ChildProcessWithoutNullStreams;
+    /** Test seam for the production direct notification long-poll. */
+    watchFetch?: FetchLike;
+    /** Test seam for the long-poll stall bound; production uses OWNER_WATCH_STALL_MS. */
+    watchStallMs?: number;
     /** Test seam; production uses the detached ours-fleet CLI (`fleetCliOps`). */
     fleet?: OwnerFleetOps;
     /** Forwarded to fleet CLI invocations spawned for owner commands. */
@@ -109,13 +118,7 @@ export type { OwnerUpdatePhase } from './notices.js';
 export interface OwnerContact {
     cid: string;
     name: string;
-    /** Structural, from which daemon collection the row came: established or pending. */
     status: string;
-    /**
-     * Retained for the `ours-fleet owner contact list` column. The daemon's typed
-     * contact view has no such field, so it is always absent; it is not inferred
-     * from anything a contact controls.
-     */
     kind?: string;
     human?: {
         cid?: string;
@@ -133,7 +136,6 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private readonly authorizations;
     private readonly conversations;
     private readonly tasks;
-    private readonly messageRecovery;
     private readonly attachmentRecovery;
     private readonly attachmentConfig;
     private readonly attachmentRoot;
@@ -142,7 +144,7 @@ export declare class OwnerChannel implements OwnerChannelHandle {
      * (a crash must replay them) but must not be queued twice while live.
      */
     private readonly inFlight;
-    /** Wires already NACKed to the managed agent, so a history replay stays quiet. */
+    /** Wires already NACKed to the managed agent, so a deferred replay stays quiet. */
     private readonly relayNacks;
     /**
      * fleet.yaml declares the restart baseline; `/comments on|off` changes only
@@ -153,6 +155,7 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private readonly commentsBaseline;
     private commentsEnabled;
     private stopping;
+    private watchProcess?;
     private watchTask?;
     private watchAbort?;
     private drainTask?;
@@ -171,12 +174,6 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     manage(request: OwnerChannelManagementRequest): Promise<OwnerChannelManagementResult>;
     notifyFleetSpawn(event: ManagedFleetSpawnResult): Promise<void>;
     private manageNow;
-    /**
-     * The daemon reports established contacts and pending introductions as two
-     * separate collections, so the status is structural rather than a word parsed
-     * out of a rendered line. Nothing here can be spoofed by a contact's own
-     * display name.
-     */
     private contacts;
     private contact;
     private assertCid;
@@ -190,15 +187,6 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private safeTaskReport;
     private safeProactiveMessage;
     private drainAll;
-    /**
-     * Claim the exact oldest unread SQLite batch before marking it read.
-     * The journal contains only wire IDs and sequence numbers; bodies remain in
-     * the daemon's persistent history and are recovered with getHistoryItem.
-     */
-    private claimMessages;
-    private messageClaim;
-    private historyMessage;
-    private attachmentMetadata;
     private attachmentGroups;
     private handleAttachmentGroup;
     private handle;
@@ -236,7 +224,7 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private managedAttachmentReplyWire;
     /**
      * One bounded NACK per wire: an unroutable or refused relay must be visible
-     * to the authenticated agent, while its history replays stay quiet. NACK
+     * to the authenticated agent, while its deferred replays stay quiet. NACK
      * delivery is best-effort — it must never make the failure worse.
      */
     private nackManagedAgent;
@@ -250,6 +238,16 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private warnOwnerOfUnauthorizedSender;
     private effectiveOwners;
     private authorizationIntegrity;
+    /**
+     * Report what the session actually did with the prompt, not what the config
+     * asked for. `interrupt: true` used to be reported as "your request
+     * interrupted the previous task" unconditionally; the session now answers
+     * whether anything was cancelled, whether the request is queued behind
+     * earlier prompts, or whether it is held until the current task reaches a
+     * safe stopping point. Backends that report no delivery state keep the old
+     * queuedBehind-based wording.
+     */
+    private acceptanceNotice;
     private complete;
     private commentsState;
     /** Model-authored commentary only; raw protocol/tool data never reaches here. */
@@ -269,12 +267,15 @@ export declare class OwnerChannel implements OwnerChannelHandle {
     private progressPhase;
     private watchLoop;
     /**
-     * `recovered` distinguishes a first-ever start from unreadable persisted
-     * diagnostics. Notification correctness does not depend on this state: every
-     * establishment drains and then replays SDK hints from offset zero.
+     * `recovered` distinguishes a first-ever start (no state, nothing lost) from a
+     * cursor we HAD and can no longer read. Only the latter is a recovery, and the
+     * caller needs to know because the reason it reports is the only evidence a
+     * durable cursor was ever lost.
      */
     private readWatchState;
     private writeWatchState;
+    /** Compatibility path for injected child-process tests; production is direct. */
+    private legacyWatchLoop;
     private errorText;
     private logError;
 }