@ours.network/codex 1.1.0 → 1.2.0-nightly.1

package/src/profile.mjs

@@ -1,7 +1,9 @@
 import { join } from 'node:path';
 import { homedir } from 'node:os';
+import { randomUUID } from 'node:crypto';
 
-import { assertDaemonStateDir, resolveDaemonConfig } from '@ours.network/sdk';
+import { assertDaemonStateDir, attachOursClient, resolveDaemonConfig } from '@ours.network/sdk';
+import { hostProfileSelectionFromEnv } from '../../core/src/host-client/index.ts';
 
 function validPort(value) {
   const port = Number(value);
@@ -26,8 +28,21 @@ export function parseOursArgs(argv = []) {
   return { port, codexArgs };
 }
 
-export async function resolveDaemonProfile({ argv = [], env = process.env, fetch: fetchImpl = globalThis.fetch } = {}) {
+export async function resolveDaemonProfile({ argv = [], env = process.env, fetch: fetchImpl = globalThis.fetch, attach = attachOursClient } = {}) {
   const parsed = parseOursArgs(argv);
+  const hostSelection = hostProfileSelectionFromEnv(env);
+  if (hostSelection !== null) {
+    const { profile: hostProfile, configPath } = hostSelection;
+    if (parsed.port != null) throw new Error('ours: --ours-port conflicts with host-profile mode');
+    const client = await attach({ ...hostProfile, sessionMode: 'external', leaseToken: randomUUID(), env: {} });
+    let info;
+    try {
+      info = await client.version();
+      await client.identities();
+      await client.unread();
+    } finally { await client.close(); }
+    return { profile: hostProfile, info, baseUrl: hostProfile.endpoint, configPath, codexArgs: parsed.codexArgs };
+  }
   const selection = resolveDaemonConfig({
     ...(parsed.port == null ? {} : { port: parsed.port }),
     env,

package/src/watcher.mjs

@@ -1,10 +1,15 @@
+import { randomUUID } from 'node:crypto';
+import { attachOursClient } from '@ours.network/sdk';
+
 export const WAKE_PROMPT = 'New ours mail is available for the identity already bound to this session. Use the ours skill and get_messages now, then handle the unread mail. Do not change identities or reveal message bodies outside the normal get_messages result.';
 
 export class MonitorWatcher {
-  constructor({ baseUrl, token = null, fetch: fetchImpl = globalThis.fetch, appServer, stateStore = { save: async () => {} }, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) }) {
+  constructor({ baseUrl, token = null, profile = null, clientFactory = attachOursClient, fetch: fetchImpl = globalThis.fetch, appServer, stateStore = { save: async () => {} }, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) }) {
     this.baseUrl = baseUrl;
     this.headers = token ? { 'x-ours-api-token': token } : {};
     this.fetch = fetchImpl;
+    this.profile = profile;
+    this.clientFactory = clientFactory;
     this.appServer = appServer;
     this.stateStore = stateStore;
     this.sleep = sleep;
@@ -23,6 +28,11 @@ export class MonitorWatcher {
     });
   }
 
+  async #client() {
+    this.clientPromise ??= this.clientFactory({ ...this.profile, sessionMode: 'external', leaseToken: randomUUID(), env: {} });
+    return this.clientPromise;
+  }
+
   async #json(path, signal) {
     const response = await this.fetch(`${this.baseUrl}${path}`, { headers: this.headers, signal });
     if (response.status === 401 || response.status === 403) {
@@ -62,11 +72,24 @@ export class MonitorWatcher {
 
   async pollOnce({ identity, threadId, cursor }, signal) {
     const since = cursor == null ? 'tip' : encodeURIComponent(cursor);
-    const data = await this.#json(`/identities/${encodeURIComponent(identity)}/notifications?since=${since}`, signal);
+    let data;
+    let unread;
+    try {
+      if (this.profile) {
+        const client = await this.#client();
+        data = await client.readNotificationPage(identity, { since: cursor == null ? 'tip' : Number(cursor), signal });
+        if (cursor == null) unread = await client.unread();
+      } else {
+        data = await this.#json(`/identities/${encodeURIComponent(identity)}/notifications?since=${since}`, signal);
+        if (cursor == null) unread = await this.#json('/unread', signal);
+      }
+    } catch (error) {
+      if (error?.status === 401 || error?.status === 403 || /HTTP (401|403)|authentication/i.test(error?.message || '')) this.authFailed = true;
+      throw error;
+    }
     const next = { identity, threadId, cursor: String(data.cursor ?? cursor ?? '') };
     await this.stateStore.save(next);
     if (cursor == null) {
-      const unread = await this.#json('/unread', signal);
       const entry = unread.identities?.find((item) => item.name === identity);
       if (entry && (Number(entry.count) > 0 || Number(entry.files) > 0)) await this.#wake(threadId);
     } else if (Array.isArray(data.events) && data.events.length > 0) {
@@ -106,5 +129,8 @@ export class MonitorWatcher {
     this.controller = null;
     this.pending = false;
     this.queued = false;
+    const clientPromise = this.clientPromise;
+    this.clientPromise = null;
+    return clientPromise ? clientPromise.then((client) => client.close()).catch(() => {}) : Promise.resolve();
   }
 }