@deepagents/context 0.37.1 → 0.38.0

package/dist/index.js

@@ -1313,7 +1313,7 @@ function reminder(textOrFragment, options) {
   if (typeof text === "string") {
     assertReminderText(text);
   }
-  const asPart = options?.asPart ?? fromFragment2;
+  const asPart = options?.asPart ?? false;
   if (options && "when" in options && options.when) {
     return {
       name: "reminder",
@@ -2893,6 +2893,7 @@ var ContextEngine = class _ContextEngine {
             content: plainText,
             lastMessageAt,
             lastMessage,
+            currentMessage: original,
             chat: this.#chatData,
             usage,
             branch: this.#branchName,
@@ -4432,8 +4433,7 @@ function getLocaleFromMessage(message2) {
 }
 function resolveTz(options, ctx) {
   if (options?.tz) return options.tz;
-  const locale = getLocaleFromMessage(ctx.lastMessage);
-  return locale?.timeZone ?? "UTC";
+  return getLocaleFromMessage(ctx.currentMessage)?.timeZone ?? getLocaleFromMessage(ctx.lastMessage)?.timeZone ?? "UTC";
 }
 function toDateParts(date, tz) {
   const parts = new Intl.DateTimeFormat("en-CA", {
@@ -4581,7 +4581,7 @@ function dateReminder(options) {
       return `${diff}Date: ${currentDate}
 Day of Week: ${currentDay}`;
     },
-    { when: dayChanged(options), asPart: true }
+    { when: dayChanged(options), asPart: false }
   );
 }
 function timeReminder(options) {
@@ -4599,7 +4599,7 @@ function timeReminder(options) {
       }
       return `${diff}Time: ${currentTime}`;
     },
-    { when: hourChanged(options), asPart: true }
+    { when: hourChanged(options), asPart: false }
   );
 }
 function monthReminder(options) {
@@ -4617,7 +4617,7 @@ function monthReminder(options) {
       }
       return `${diff}Month: ${currentMonth}`;
     },
-    { when: monthChanged(options), asPart: true }
+    { when: monthChanged(options), asPart: false }
   );
 }
 function yearReminder(options) {
@@ -4635,7 +4635,7 @@ function yearReminder(options) {
       }
       return `${diff}Year: ${currentYear}`;
     },
-    { when: yearChanged(options), asPart: true }
+    { when: yearChanged(options), asPart: false }
   );
 }
 function seasonReminder(options) {
@@ -4653,36 +4653,30 @@ function seasonReminder(options) {
       }
       return `${diff}Season: ${currentSeason}`;
     },
-    { when: seasonChanged(options), asPart: true }
+    { when: seasonChanged(options), asPart: false }
   );
 }
-function localeReminder(options) {
-  const language = options?.language ?? "English (US)";
-  const timeZone = options?.timeZone ?? "UTC";
+function localeReminder() {
   const whenFn = (ctx) => {
-    const prev = getLocaleFromMessage(ctx.lastMessage);
-    if (!prev) return true;
-    return prev.language !== language || prev.timeZone !== timeZone;
+    const current = getLocaleFromMessage(ctx.currentMessage);
+    if (!current) return false;
+    const last = getLocaleFromMessage(ctx.lastMessage);
+    if (!last) return true;
+    return current.language !== last.language || current.timeZone !== last.timeZone;
   };
   return reminder(
     (ctx) => {
-      const prev = getLocaleFromMessage(ctx.lastMessage);
-      let diff = "";
-      if (prev) {
-        diff = formatDiff([
-          diffLine("language", prev.language, language),
-          diffLine("timezone", prev.timeZone, timeZone)
-        ]);
-      }
-      return {
-        text: `${diff}Language: ${language}
-Timezone: ${timeZone}`,
-        metadata: {
-          [LOCALE_METADATA_KEY]: { language, timeZone }
-        }
-      };
+      const current = getLocaleFromMessage(ctx.currentMessage);
+      if (!current) return "";
+      const last = getLocaleFromMessage(ctx.lastMessage);
+      const diff = last ? formatDiff([
+        diffLine("language", last.language, current.language),
+        diffLine("timezone", last.timeZone, current.timeZone)
+      ]) : "";
+      return `${diff}Language: ${current.language}
+Timezone: ${current.timeZone}`;
     },
-    { when: whenFn, asPart: true }
+    { when: whenFn, asPart: false }
   );
 }
 function temporalReminder(options) {
@@ -6332,11 +6326,10 @@ function createShallowRouter(backend, ext, cwd) {
     executeCommand: async (raw) => {
       const preHook = ext.onBeforeBashCall ? (await ext.onBeforeBashCall({ command: raw })).command : raw;
       let transformed;
-      let tokens;
+      let dispatch;
       try {
         transformed = ext.plugins.length > 0 ? transformer.transform(preHook).script : preHook;
-        const firstCmd = parse(transformed).statements[0]?.pipelines[0]?.commands[0];
-        tokens = firstCmd?.type === "SimpleCommand" ? tokenizeFirstCommand(transformed) : [];
+        dispatch = extractDispatchTarget(parse(transformed), cwd);
       } catch (err) {
         return {
           stdout: "",
@@ -6345,12 +6338,12 @@ function createShallowRouter(backend, ext, cwd) {
           exitCode: 2
         };
       }
-      const [name, ...args] = tokens;
+      const [name, ...args] = dispatch?.tokens ?? [];
       const cmd = name ? byName.get(name) : void 0;
       if (cmd) {
         return cmd.handler(args, {
           sandbox: backend,
-          cwd,
+          cwd: dispatch?.cwd ?? cwd,
           env: ext.env,
           stdin: ""
         });
@@ -6359,20 +6352,49 @@ function createShallowRouter(backend, ext, cwd) {
     }
   };
 }
-function tokenizeFirstCommand(commandLine) {
-  const ast = parse(commandLine);
-  const first = ast.statements[0]?.pipelines[0]?.commands[0];
-  if (!first || first.type !== "SimpleCommand") return [];
-  if (ast.statements.length > 1) return [];
-  if (ast.statements[0].pipelines.length > 1) return [];
-  if (ast.statements[0].pipelines[0].commands.length > 1) return [];
-  if (first.redirections.length > 0) return [];
-  const name = asStaticWordText(first.name);
-  if (!name) return [];
+function extractDispatchTarget(ast, defaultCwd) {
+  if (ast.statements.length !== 1) return null;
+  const statement = ast.statements[0];
+  if (statement.background) return null;
+  if (statement.operators.length === 0 && statement.pipelines.length === 1) {
+    const tokens = tokenizeSimplePipeline(statement.pipelines[0]);
+    return tokens ? { tokens, cwd: defaultCwd } : null;
+  }
+  if (statement.operators.length === 1 && statement.operators[0] === "&&" && statement.pipelines.length === 2) {
+    const cd = simpleCommandFromPipeline(statement.pipelines[0]);
+    const cdCwd = readCdTarget(cd);
+    if (!cdCwd) return null;
+    const tokens = tokenizeSimplePipeline(statement.pipelines[1]);
+    return tokens ? { tokens, cwd: cdCwd } : null;
+  }
+  return null;
+}
+function simpleCommandFromPipeline(pipeline) {
+  if (!pipeline) return null;
+  if (pipeline.negated || pipeline.timed || pipeline.commands.length !== 1) {
+    return null;
+  }
+  const command = pipeline.commands[0];
+  return command?.type === "SimpleCommand" ? command : null;
+}
+function readCdTarget(command) {
+  if (!command) return null;
+  if (command.redirections.length > 0 || command.args.length !== 1) {
+    return null;
+  }
+  const name = asStaticWordText(command.name);
+  if (name !== "cd") return null;
+  return asStaticWordText(command.args[0]);
+}
+function tokenizeSimplePipeline(pipeline) {
+  const command = simpleCommandFromPipeline(pipeline);
+  if (!command || command.redirections.length > 0) return null;
+  const name = asStaticWordText(command.name);
+  if (!name) return null;
   const args = [];
-  for (const arg of first.args) {
+  for (const arg of command.args) {
     const text = asStaticWordText(arg);
-    if (text == null) return [];
+    if (text == null) return null;
     args.push(text);
   }
   return [name, ...args];