incremnt 0.7.2 → 0.8.0

package/src/transport.js

@@ -1,7 +1,11 @@
 import { readSnapshot, resolveSnapshotSource } from './local.js';
 import { createRemoteTransport } from './remote.js';
-import { executeCoachReadTool, executeReadCommand } from './queries.js';
+import { askMissingObservationFollowUpContext, askObservationFollowUpContext, askRoutedContext } from './ask-coach.js';
+import { sanitizeHistory } from './prompt-security.js';
+import { executeCoachReadTool, executeReadCommand, shouldKeepCurrentCoachObservation } from './queries.js';
 import { isSessionExpired } from './state.js';
+import { fetchRemoteContract, refreshRemoteSession } from './auth.js';
+import { resolveConfiguredBaseUrl } from './service-url.js';
 
 function prefersLocal(options) {
   return Boolean(options.input || process.env.INCREMNT_SNAPSHOT || process.env.ONEMORE_SNAPSHOT);
@@ -13,6 +17,19 @@ function snapshotNotFoundError() {
   return error;
 }
 
+function assertValidAskPlanQuestion(question) {
+  if (!question || typeof question !== 'string' || question.trim().length === 0) {
+    const error = new Error('question is required');
+    error.code = 'VALIDATION_ERROR';
+    throw error;
+  }
+  if (question.length > 500) {
+    const error = new Error('question must be 500 characters or fewer');
+    error.code = 'VALIDATION_ERROR';
+    throw error;
+  }
+}
+
 function createLocalTransport(snapshotSource) {
   return {
     kind: 'local',
@@ -41,6 +58,44 @@ function createLocalTransport(snapshotSource) {
       const snapshot = await readSnapshot(snapshotSource.path);
       return executeCoachReadTool(snapshot, toolName, input);
     },
+    async planAskInteraction(input = {}) {
+      if (!snapshotSource) {
+        throw snapshotNotFoundError();
+      }
+      assertValidAskPlanQuestion(input.question);
+
+      const snapshot = await readSnapshot(snapshotSource.path);
+      const exclude = new Set(String(input.exclude ?? '').split(',').map((item) => item.trim()).filter(Boolean));
+      if (input.coachObservation) {
+        const observationId = String(input.coachObservation.id ?? '').trim();
+        const snapshotObservation = (snapshot.coachObservations ?? [])
+          .find((observation) => (
+            String(observation?.id ?? '') === observationId &&
+            shouldKeepCurrentCoachObservation(observation, { includeOutcomeHistory: true })
+          ));
+        const routedContext = snapshotObservation
+          ? askObservationFollowUpContext(snapshot, input.question, snapshotObservation, {
+              exclude,
+              intent: input.coachObservation.intent
+            })
+          : askMissingObservationFollowUpContext(snapshot, input.question, input.coachObservation, {
+              exclude,
+              intent: input.coachObservation.intent
+            });
+        return {
+          contextBundle: routedContext.contextBundle,
+          metadata: routedContext.metadata
+        };
+      }
+      const routedContext = askRoutedContext(snapshot, input.question, {
+        exclude,
+        history: sanitizeHistory(input.history)
+      });
+      return {
+        contextBundle: routedContext.contextBundle,
+        metadata: routedContext.metadata
+      };
+    },
     async executeWriteCommand() {
       const error = new Error('Write commands require a remote session. Run incremnt login first.');
       error.code = 'WRITE_REQUIRES_REMOTE';
@@ -55,10 +110,71 @@ export async function createTransport(options, sessionState) {
     return createLocalTransport(snapshotSource);
   }
 
+  const envAgentToken = String(process.env.INCREMNT_AGENT_TOKEN ?? '').trim();
+  if (envAgentToken) {
+    const baseUrl = resolveConfiguredBaseUrl(options, sessionState.session);
+    if (baseUrl) {
+      return {
+        ...createRemoteTransport({
+          exists: false,
+          path: sessionState.path,
+          session: {
+            version: 1,
+            mode: 'remote',
+            account: null,
+            auth: {
+              accessToken: envAgentToken,
+              refreshToken: null,
+              expiresAt: null,
+              type: 'agent-token',
+              source: 'env',
+              access: null
+            },
+            transport: {
+              baseUrl,
+              contractVersion: null,
+              capabilities: null,
+              uncheckedContract: true
+            }
+          }
+        }, {
+          credentialSource: 'env',
+          resolveContract: () => fetchRemoteContract(baseUrl, envAgentToken)
+        }),
+        expired: false,
+        snapshotSource: null
+      };
+    }
+  }
+
   if (sessionState.session) {
-    const expired = isSessionExpired(sessionState.session);
+    let session = sessionState.session;
+    let expired = isSessionExpired(session);
+    const isAgentToken = session.auth?.type === 'agent-token';
+    const baseUrl = session.transport?.baseUrl;
+
+    if (expired && !isAgentToken && baseUrl && session.auth?.accessToken) {
+      try {
+        const refreshed = await refreshRemoteSession(baseUrl, session.auth.accessToken, session);
+        session = refreshed.session;
+        expired = false;
+      } catch (error) {
+        if (error?.code === 'SESSION_EXPIRED') {
+          expired = true;
+        } else {
+          throw error;
+        }
+      }
+    }
+
     return {
-      ...createRemoteTransport(sessionState, { expired }),
+      ...createRemoteTransport({
+        ...sessionState,
+        session
+      }, {
+        expired,
+        credentialSource: session.auth?.source ?? 'session'
+      }),
       expired,
       snapshotSource: null
     };