@hasna/testers 0.0.33 → 0.0.34

package/dist/mcp/index.js

@@ -5399,9 +5399,9 @@ async function syncTransfer(source, target, options, _direction) {
           const batch = rows.slice(offset, offset + batchSize);
           try {
             if (isAsyncAdapter(target)) {
-              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch);
+              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             } else {
-              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch);
+              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             }
             result.rowsWritten += batch.length;
           } catch (err) {
@@ -5448,7 +5448,7 @@ async function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
-async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch) {
+async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
@@ -5458,20 +5458,22 @@ async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, ba
   }).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
   await target.run(sql, ...params);
 }
-function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch) {
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
   const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => coerceForSqlite(row[c])));
   target.run(sql, ...params);
 }
@@ -5696,7 +5698,7 @@ class SyncProgressTracker {
     }
   }
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config = getCloudConfig();
     const lines = [
@@ -5729,8 +5731,13 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
+    if (opts.migrations?.length) {
+      for (const sql of opts.migrations) {
+        await cloud.run(sql);
+      }
+    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -5752,7 +5759,7 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -34698,27 +34705,34 @@ var init_v3 = __esm(() => {
 
 // node_modules/@ai-sdk/provider-utils/node_modules/eventsource-parser/dist/index.js
 function noop(_arg) {}
-function createParser(callbacks) {
-  if (typeof callbacks == "function")
-    throw new TypeError("`callbacks` must be an object, got a function instead. Did you mean `{onEvent: fn}`?");
-  const { onEvent = noop, onError = noop, onRetry = noop, onComment } = callbacks, pendingFragments = [];
-  let isFirstChunk = true, id, data = "", dataLines = 0, eventType;
+function createParser(config2) {
+  if (typeof config2 == "function")
+    throw new TypeError("`config` must be an object, got a function instead. Did you mean `createParser({onEvent: fn})`?");
+  const { onEvent = noop, onError = noop, onRetry = noop, onComment, maxBufferSize } = config2, pendingFragments = [];
+  let pendingFragmentsLength = 0, isFirstChunk = true, id, data = "", dataLines = 0, eventType, terminated = false;
   function feed(chunk) {
+    if (terminated)
+      throw new Error("Cannot feed parser: it was terminated after exceeding the configured max buffer size. Call `reset()` to resume parsing.");
     if (isFirstChunk && (isFirstChunk = false, chunk.charCodeAt(0) === 239 && chunk.charCodeAt(1) === 187 && chunk.charCodeAt(2) === 191 && (chunk = chunk.slice(3))), pendingFragments.length === 0) {
       const trailing2 = processLines(chunk);
-      trailing2 !== "" && pendingFragments.push(trailing2);
+      trailing2 !== "" && (pendingFragments.push(trailing2), pendingFragmentsLength = trailing2.length), checkBufferSize();
       return;
     }
     if (chunk.indexOf(`
 `) === -1 && chunk.indexOf("\r") === -1) {
-      pendingFragments.push(chunk);
+      pendingFragments.push(chunk), pendingFragmentsLength += chunk.length, checkBufferSize();
       return;
     }
     pendingFragments.push(chunk);
     const input = pendingFragments.join("");
-    pendingFragments.length = 0;
+    pendingFragments.length = 0, pendingFragmentsLength = 0;
     const trailing = processLines(input);
-    trailing !== "" && pendingFragments.push(trailing);
+    trailing !== "" && (pendingFragments.push(trailing), pendingFragmentsLength = trailing.length), checkBufferSize();
+  }
+  function checkBufferSize() {
+    maxBufferSize !== undefined && (pendingFragmentsLength + data.length <= maxBufferSize || (terminated = true, pendingFragments.length = 0, pendingFragmentsLength = 0, id = undefined, data = "", dataLines = 0, eventType = undefined, onError(new ParseError(`Buffered data exceeded max buffer size of ${maxBufferSize} characters`, {
+      type: "max-buffer-size-exceeded"
+    }))));
   }
   function processLines(chunk) {
     let searchIndex = 0;
@@ -34830,7 +34844,7 @@ ${value}`, dataLines++;
       const incompleteLine = pendingFragments.join("");
       parseLine(incompleteLine, 0, incompleteLine.length);
     }
-    isFirstChunk = true, id = undefined, data = "", dataLines = 0, eventType = undefined, pendingFragments.length = 0;
+    isFirstChunk = true, id = undefined, data = "", dataLines = 0, eventType = undefined, pendingFragments.length = 0, pendingFragmentsLength = 0, terminated = false;
   }
   return { feed, reset };
 }
@@ -34854,7 +34868,7 @@ var EventSourceParserStream;
 var init_stream = __esm(() => {
   init_dist3();
   EventSourceParserStream = class EventSourceParserStream extends TransformStream {
-    constructor({ onError, onRetry, onComment } = {}) {
+    constructor({ onError, onRetry, onComment, maxBufferSize } = {}) {
       let parser;
       super({
         start(controller) {
@@ -34863,10 +34877,11 @@ var init_stream = __esm(() => {
               controller.enqueue(event);
             },
             onError(error40) {
-              onError === "terminate" ? controller.error(error40) : typeof onError == "function" && onError(error40);
+              typeof onError == "function" && onError(error40), (onError === "terminate" || error40.type === "max-buffer-size-exceeded") && controller.error(error40);
             },
             onRetry,
-            onComment
+            onComment,
+            maxBufferSize
           });
         },
         transform(chunk) {
@@ -36305,7 +36320,7 @@ var DelayedPromise = class {
     });
   }
   return () => `${prefix}${separator}${generator()}`;
-}, generateId, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.26", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
+}, generateId, FETCH_FAILED_ERROR_MESSAGES, BUN_ERROR_CODES, VERSION = "4.0.27", getOriginalFetch = () => globalThis.fetch, getFromApi = async ({
   url: url2,
   headers = {},
   successfulResponseHandler,
@@ -38444,7 +38459,7 @@ var import_oidc, import_oidc2, marker17 = "vercel.ai.gateway.error", symbol18, _
       "ai-model-id": this.modelId
     };
   }
-}, gatewayRerankingResponseSchema, parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION2 = "3.0.110", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
+}, gatewayRerankingResponseSchema, parallelSearchInputSchema, parallelSearchOutputSchema, parallelSearchToolFactory, parallelSearch = (config2 = {}) => parallelSearchToolFactory(config2), perplexitySearchInputSchema, perplexitySearchOutputSchema, perplexitySearchToolFactory, perplexitySearch = (config2 = {}) => perplexitySearchToolFactory(config2), gatewayTools, VERSION2 = "3.0.120", AI_GATEWAY_PROTOCOL_VERSION = "0.0.1", gateway;
 var init_dist5 = __esm(() => {
   init_dist4();
   init_dist2();
@@ -38483,13 +38498,15 @@ var init_dist5 = __esm(() => {
       message,
       statusCode = 500,
       cause,
-      generationId
+      generationId,
+      isRetryable = statusCode != null && (statusCode === 408 || statusCode === 409 || statusCode === 429 || statusCode >= 500)
     }) {
       super(generationId ? `${message} [${generationId}]` : message);
       this[_a17] = true;
       this.statusCode = statusCode;
       this.cause = cause;
       this.generationId = generationId;
+      this.isRetryable = isRetryable;
     }
     static isInstance(error40) {
       return _GatewayError.hasMarker(error40);
@@ -39012,62 +39029,11 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
   gateway = createGatewayProvider();
 });
 
-// node_modules/@opentelemetry/api/build/src/platform/node/globalThis.js
-var require_globalThis = __commonJS((exports) => {
-  Object.defineProperty(exports, "__esModule", { value: true });
-  exports._globalThis = undefined;
-  exports._globalThis = typeof globalThis === "object" ? globalThis : global;
-});
-
-// node_modules/@opentelemetry/api/build/src/platform/node/index.js
-var require_node = __commonJS((exports) => {
-  var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
-    if (k2 === undefined)
-      k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() {
-      return m[k];
-    } });
-  } : function(o, m, k, k2) {
-    if (k2 === undefined)
-      k2 = k;
-    o[k2] = m[k];
-  });
-  var __exportStar = exports && exports.__exportStar || function(m, exports2) {
-    for (var p in m)
-      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
-        __createBinding(exports2, m, p);
-  };
-  Object.defineProperty(exports, "__esModule", { value: true });
-  __exportStar(require_globalThis(), exports);
-});
-
-// node_modules/@opentelemetry/api/build/src/platform/index.js
-var require_platform = __commonJS((exports) => {
-  var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
-    if (k2 === undefined)
-      k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() {
-      return m[k];
-    } });
-  } : function(o, m, k, k2) {
-    if (k2 === undefined)
-      k2 = k;
-    o[k2] = m[k];
-  });
-  var __exportStar = exports && exports.__exportStar || function(m, exports2) {
-    for (var p in m)
-      if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p))
-        __createBinding(exports2, m, p);
-  };
-  Object.defineProperty(exports, "__esModule", { value: true });
-  __exportStar(require_node(), exports);
-});
-
 // node_modules/@opentelemetry/api/build/src/version.js
 var require_version = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.VERSION = undefined;
-  exports.VERSION = "1.9.0";
+  exports.VERSION = "1.9.1";
 });
 
 // node_modules/@opentelemetry/api/build/src/internal/semver.js
@@ -39145,12 +39111,11 @@ var require_semver = __commonJS((exports) => {
 var require_global_utils = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.unregisterGlobal = exports.getGlobal = exports.registerGlobal = undefined;
-  var platform_1 = require_platform();
   var version_1 = require_version();
   var semver_1 = require_semver();
   var major = version_1.VERSION.split(".")[0];
   var GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for(`opentelemetry.js.api.${major}`);
-  var _global = platform_1._globalThis;
+  var _global = typeof globalThis === "object" ? globalThis : typeof self === "object" ? self : typeof window === "object" ? window : typeof global === "object" ? global : {};
   function registerGlobal(type, instance, diag, allowOverride = false) {
     var _a16;
     const api2 = _global[GLOBAL_OPENTELEMETRY_API_KEY] = (_a16 = _global[GLOBAL_OPENTELEMETRY_API_KEY]) !== null && _a16 !== undefined ? _a16 : {
@@ -39222,8 +39187,7 @@ var require_ComponentLogger = __commonJS((exports) => {
     if (!logger) {
       return;
     }
-    args.unshift(namespace);
-    return logger[funcName](...args);
+    return logger[funcName](namespace, ...args);
   }
 });
 
@@ -39284,6 +39248,12 @@ var require_diag = __commonJS((exports) => {
   var API_NAME = "diag";
 
   class DiagAPI {
+    static instance() {
+      if (!this._instance) {
+        this._instance = new DiagAPI;
+      }
+      return this._instance;
+    }
     constructor() {
       function _logProxy(funcName) {
         return function(...args) {
@@ -39328,12 +39298,6 @@ var require_diag = __commonJS((exports) => {
       self2.warn = _logProxy("warn");
       self2.error = _logProxy("error");
     }
-    static instance() {
-      if (!this._instance) {
-        this._instance = new DiagAPI;
-      }
-      return this._instance;
-    }
   }
   exports.DiagAPI = DiagAPI;
 });
@@ -39355,7 +39319,7 @@ var require_baggage_impl = __commonJS((exports) => {
       return Object.assign({}, entry);
     }
     getAllEntries() {
-      return Array.from(this._entries.entries()).map(([k, v]) => [k, v]);
+      return Array.from(this._entries.entries());
     }
     setEntry(key, entry) {
       const newBaggage = new BaggageImpl(this._entries);
@@ -39447,7 +39411,7 @@ var require_context = __commonJS((exports) => {
 // node_modules/@opentelemetry/api/build/src/diag/consoleLogger.js
 var require_consoleLogger = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.DiagConsoleLogger = undefined;
+  exports.DiagConsoleLogger = exports._originalConsoleMethods = undefined;
   var consoleMap = [
     { n: "error", c: "error" },
     { n: "warn", c: "warn" },
@@ -39455,19 +39419,39 @@ var require_consoleLogger = __commonJS((exports) => {
     { n: "debug", c: "debug" },
     { n: "verbose", c: "trace" }
   ];
+  exports._originalConsoleMethods = {};
+  if (typeof console !== "undefined") {
+    const keys = [
+      "error",
+      "warn",
+      "info",
+      "debug",
+      "trace",
+      "log"
+    ];
+    for (const key of keys) {
+      if (typeof console[key] === "function") {
+        exports._originalConsoleMethods[key] = console[key];
+      }
+    }
+  }
 
   class DiagConsoleLogger {
     constructor() {
       function _consoleFunc(funcName) {
         return function(...args) {
-          if (console) {
-            let theFunc = console[funcName];
+          let theFunc = exports._originalConsoleMethods[funcName];
+          if (typeof theFunc !== "function") {
+            theFunc = exports._originalConsoleMethods["log"];
+          }
+          if (typeof theFunc !== "function" && console) {
+            theFunc = console[funcName];
             if (typeof theFunc !== "function") {
               theFunc = console.log;
             }
-            if (typeof theFunc === "function") {
-              return theFunc.apply(console, args);
-            }
+          }
+          if (typeof theFunc === "function") {
+            return theFunc.apply(console, args);
           }
         };
       }
@@ -39705,8 +39689,8 @@ var require_NonRecordingSpan = __commonJS((exports) => {
   var invalid_span_constants_1 = require_invalid_span_constants();
 
   class NonRecordingSpan {
-    constructor(_spanContext = invalid_span_constants_1.INVALID_SPAN_CONTEXT) {
-      this._spanContext = _spanContext;
+    constructor(spanContext = invalid_span_constants_1.INVALID_SPAN_CONTEXT) {
+      this._spanContext = spanContext;
     }
     spanContext() {
       return this._spanContext;
@@ -39782,14 +39766,126 @@ var require_spancontext_utils = __commonJS((exports) => {
   exports.wrapSpanContext = exports.isSpanContextValid = exports.isValidSpanId = exports.isValidTraceId = undefined;
   var invalid_span_constants_1 = require_invalid_span_constants();
   var NonRecordingSpan_1 = require_NonRecordingSpan();
-  var VALID_TRACEID_REGEX = /^([0-9a-f]{32})$/i;
-  var VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
+  var isHex = new Uint8Array([
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ]);
+  function isValidHex(id, length) {
+    if (typeof id !== "string" || id.length !== length)
+      return false;
+    let r = 0;
+    for (let i = 0;i < id.length; i += 4) {
+      r += (isHex[id.charCodeAt(i)] | 0) + (isHex[id.charCodeAt(i + 1)] | 0) + (isHex[id.charCodeAt(i + 2)] | 0) + (isHex[id.charCodeAt(i + 3)] | 0);
+    }
+    return r === length;
+  }
   function isValidTraceId(traceId) {
-    return VALID_TRACEID_REGEX.test(traceId) && traceId !== invalid_span_constants_1.INVALID_TRACEID;
+    return isValidHex(traceId, 32) && traceId !== invalid_span_constants_1.INVALID_TRACEID;
   }
   exports.isValidTraceId = isValidTraceId;
   function isValidSpanId(spanId) {
-    return VALID_SPANID_REGEX.test(spanId) && spanId !== invalid_span_constants_1.INVALID_SPANID;
+    return isValidHex(spanId, 16) && spanId !== invalid_span_constants_1.INVALID_SPANID;
   }
   exports.isValidSpanId = isValidSpanId;
   function isSpanContextValid(spanContext) {
@@ -39849,7 +39945,7 @@ var require_NoopTracer = __commonJS((exports) => {
   }
   exports.NoopTracer = NoopTracer;
   function isSpanContext(spanContext) {
-    return typeof spanContext === "object" && typeof spanContext["spanId"] === "string" && typeof spanContext["traceId"] === "string" && typeof spanContext["traceFlags"] === "number";
+    return spanContext !== null && typeof spanContext === "object" && "spanId" in spanContext && typeof spanContext["spanId"] === "string" && "traceId" in spanContext && typeof spanContext["traceId"] === "string" && "traceFlags" in spanContext && typeof spanContext["traceFlags"] === "number";
   }
 });
 
@@ -39861,8 +39957,8 @@ var require_ProxyTracer = __commonJS((exports) => {
   var NOOP_TRACER = new NoopTracer_1.NoopTracer;
 
   class ProxyTracer {
-    constructor(_provider, name15, version2, options) {
-      this._provider = _provider;
+    constructor(provider, name15, version2, options) {
+      this._provider = provider;
       this.name = name15;
       this.version = version2;
       this.options = options;
@@ -40022,7 +40118,7 @@ var require_tracestate_impl = __commonJS((exports) => {
       return this._internalState.get(key);
     }
     serialize() {
-      return this._keys().reduce((agg, key) => {
+      return Array.from(this._internalState.keys()).reduceRight((agg, key) => {
         agg.push(key + LIST_MEMBER_KEY_VALUE_SPLITTER + this.get(key));
         return agg;
       }, []).join(LIST_MEMBERS_SEPARATOR);
@@ -40030,7 +40126,7 @@ var require_tracestate_impl = __commonJS((exports) => {
     _parse(rawTraceState) {
       if (rawTraceState.length > MAX_TRACE_STATE_LEN)
         return;
-      this._internalState = rawTraceState.split(LIST_MEMBERS_SEPARATOR).reverse().reduce((agg, part) => {
+      this._internalState = rawTraceState.split(LIST_MEMBERS_SEPARATOR).reduceRight((agg, part) => {
         const listMember = part.trim();
         const i = listMember.indexOf(LIST_MEMBER_KEY_VALUE_SPLITTER);
         if (i !== -1) {
@@ -41130,7 +41226,10 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: mapToolResultOutput(part.output),
+                output: mapToolResultOutput({
+                  output: part.output,
+                  downloadedAssets
+                }),
                 providerOptions
               };
             }
@@ -41149,7 +41248,10 @@ function convertToLanguageModelMessage({
                 type: "tool-result",
                 toolCallId: part.toolCallId,
                 toolName: part.toolName,
-                output: mapToolResultOutput(part.output),
+                output: mapToolResultOutput({
+                  output: part.output,
+                  downloadedAssets
+                }),
                 providerOptions: part.providerOptions
               };
             }
@@ -41173,15 +41275,44 @@ function convertToLanguageModelMessage({
   }
 }
 async function downloadAssets(messages, download2, supportedUrls) {
-  const plannedDownloads = messages.filter((message) => message.role === "user").map((message) => message.content).filter((content) => Array.isArray(content)).flat().filter((part) => part.type === "image" || part.type === "file").map((part) => {
-    var _a21;
-    const mediaType = (_a21 = part.mediaType) != null ? _a21 : part.type === "image" ? "image/*" : undefined;
-    let data = part.type === "image" ? part.image : part.data;
-    if (typeof data === "string") {
-      try {
-        data = new URL(data);
-      } catch (ignored) {}
+  var _a21;
+  const downloadableFiles = [];
+  for (const message of messages) {
+    if (message.role === "user" && Array.isArray(message.content)) {
+      for (const part of message.content) {
+        if (part.type === "image" || part.type === "file") {
+          downloadableFiles.push({
+            data: part.type === "image" ? part.image : part.data,
+            mediaType: (_a21 = part.mediaType) != null ? _a21 : part.type === "image" ? "image/*" : undefined
+          });
+        }
+      }
+    }
+    if (message.role === "tool" || message.role === "assistant") {
+      if (!Array.isArray(message.content)) {
+        continue;
+      }
+      for (const part of message.content) {
+        if (part.type !== "tool-result") {
+          continue;
+        }
+        if (part.output.type !== "content") {
+          continue;
+        }
+        for (const contentPart of part.output.value) {
+          if (contentPart.type === "image-url" || contentPart.type === "file-url") {
+            downloadableFiles.push({
+              data: new URL(contentPart.url),
+              mediaType: contentPart.type === "image-url" ? "image/*" : undefined
+            });
+          }
+        }
+      }
     }
+  }
+  const plannedDownloads = downloadableFiles.map((part) => {
+    const mediaType = part.mediaType;
+    const { data } = convertToLanguageModelV3DataContent(part.data);
     return { mediaType, data };
   }).filter((part) => part.data instanceof URL).map((part) => ({
     url: part.data,
@@ -41255,13 +41386,41 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     }
   }
 }
-function mapToolResultOutput(output) {
+function mapToolResultOutput({
+  output,
+  downloadedAssets
+}) {
   if (output.type !== "content") {
     return output;
   }
   return {
     type: "content",
     value: output.value.map((item) => {
+      var _a21, _b16;
+      if (item.type === "image-url") {
+        const downloadedFile = downloadedAssets[new URL(item.url).toString()];
+        if (downloadedFile) {
+          return {
+            type: "image-data",
+            data: convertDataContentToBase64String(downloadedFile.data),
+            mediaType: (_a21 = downloadedFile.mediaType) != null ? _a21 : "image/*",
+            providerOptions: item.providerOptions
+          };
+        }
+        return item;
+      }
+      if (item.type === "file-url") {
+        const downloadedFile = downloadedAssets[new URL(item.url).toString()];
+        if (downloadedFile) {
+          return {
+            type: "file-data",
+            data: convertDataContentToBase64String(downloadedFile.data),
+            mediaType: (_b16 = downloadedFile.mediaType) != null ? _b16 : "application/octet-stream",
+            providerOptions: item.providerOptions
+          };
+        }
+        return item;
+      }
       if (item.type !== "media") {
         return item;
       }
@@ -41814,7 +41973,7 @@ function getRetryDelayInMs({
   error: error40,
   exponentialBackoffDelay
 }) {
-  const headers = error40.responseHeaders;
+  const headers = APICallError.isInstance(error40) ? error40.responseHeaders : APICallError.isInstance(error40.cause) ? error40.cause.responseHeaders : undefined;
   if (!headers)
     return exponentialBackoffDelay;
   let ms;
@@ -41864,7 +42023,7 @@ async function _retryWithExponentialBackoff(f, {
         errors: newErrors
       });
     }
-    if (error40 instanceof Error && APICallError.isInstance(error40) && error40.isRetryable === true && tryNumber <= maxRetries) {
+    if (error40 instanceof Error && (APICallError.isInstance(error40) && error40.isRetryable === true || GatewayError.isInstance(error40) && error40.isRetryable === true) && tryNumber <= maxRetries) {
       await delay(getRetryDelayInMs({
         error: error40,
         exponentialBackoffDelay: delayInMs
@@ -42082,7 +42241,8 @@ async function executeToolCall({
           input,
           error: error40,
           dynamic: tool2.type === "dynamic",
-          ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
+          ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {},
+          ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
         };
       }
       const durationMs = now2() - startTime;
@@ -42112,7 +42272,8 @@ async function executeToolCall({
         input,
         output,
         dynamic: tool2.type === "dynamic",
-        ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {}
+        ...toolCall.providerMetadata != null ? { providerMetadata: toolCall.providerMetadata } : {},
+        ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
       };
     }
   });
@@ -42477,15 +42638,6 @@ async function parsePartialJson(jsonText) {
   }
   return { value: undefined, state: "failed-parse" };
 }
-function mergeToolProviderMetadata(toolMetadata, callMetadata) {
-  if (toolMetadata == null) {
-    return callMetadata;
-  }
-  if (callMetadata == null) {
-    return toolMetadata;
-  }
-  return { ...toolMetadata, ...callMetadata };
-}
 async function parseToolCall({
   toolCall,
   tools,
@@ -42493,7 +42645,6 @@ async function parseToolCall({
   system,
   messages
 }) {
-  var _a21, _b16;
   try {
     if (tools == null) {
       if (toolCall.providerExecuted && toolCall.dynamic) {
@@ -42534,6 +42685,7 @@ async function parseToolCall({
   } catch (error40) {
     const parsedInput = await safeParseJSON({ text: toolCall.input });
     const input = parsedInput.success ? parsedInput.value : toolCall.input;
+    const tool2 = tools == null ? undefined : tools[toolCall.toolName];
     return {
       type: "tool-call",
       toolCallId: toolCall.toolCallId,
@@ -42542,9 +42694,10 @@ async function parseToolCall({
       dynamic: true,
       invalid: true,
       error: error40,
-      title: (_a21 = tools == null ? undefined : tools[toolCall.toolName]) == null ? undefined : _a21.title,
+      title: tool2 == null ? undefined : tool2.title,
       providerExecuted: toolCall.providerExecuted,
-      providerMetadata: mergeToolProviderMetadata((_b16 = tools == null ? undefined : tools[toolCall.toolName]) == null ? undefined : _b16.providerMetadata, toolCall.providerMetadata)
+      providerMetadata: toolCall.providerMetadata,
+      ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
     };
   }
 }
@@ -42591,14 +42744,14 @@ async function doParseToolCall({
       cause: parseResult.error
     });
   }
-  const mergedProviderMetadata = mergeToolProviderMetadata(tool2.providerMetadata, toolCall.providerMetadata);
   return tool2.type === "dynamic" ? {
     type: "tool-call",
     toolCallId: toolCall.toolCallId,
     toolName: toolCall.toolName,
     input: parseResult.value,
     providerExecuted: toolCall.providerExecuted,
-    providerMetadata: mergedProviderMetadata,
+    providerMetadata: toolCall.providerMetadata,
+    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
     dynamic: true,
     title: tool2.title
   } : {
@@ -42607,7 +42760,8 @@ async function doParseToolCall({
     toolName,
     input: parseResult.value,
     providerExecuted: toolCall.providerExecuted,
-    providerMetadata: mergedProviderMetadata,
+    providerMetadata: toolCall.providerMetadata,
+    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
     title: tool2.title
   };
 }
@@ -43439,7 +43593,8 @@ function asContent({
               error: part.result,
               providerExecuted: true,
               dynamic: part.dynamic,
-              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+              ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
             });
           } else {
             contentParts.push({
@@ -43450,7 +43605,8 @@ function asContent({
               output: part.result,
               providerExecuted: true,
               dynamic: part.dynamic,
-              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+              ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+              ...(tool2 == null ? undefined : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
             });
           }
           break;
@@ -43464,7 +43620,8 @@ function asContent({
             error: part.result,
             providerExecuted: true,
             dynamic: toolCall.dynamic,
-            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+            ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
           });
         } else {
           contentParts.push({
@@ -43475,7 +43632,8 @@ function asContent({
             output: part.result,
             providerExecuted: true,
             dynamic: toolCall.dynamic,
-            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {}
+            ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+            ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
           });
         }
         break;
@@ -43689,6 +43847,9 @@ function processUIMessageStream({
             if (options.title !== undefined) {
               anyPart.title = options.title;
             }
+            if (options.toolMetadata !== undefined) {
+              anyPart.toolMetadata = options.toolMetadata;
+            }
             anyPart.providerExecuted = (_a222 = anyOptions.providerExecuted) != null ? _a222 : part.providerExecuted;
             const providerMetadata = anyOptions.providerMetadata;
             if (providerMetadata != null) {
@@ -43705,6 +43866,7 @@ function processUIMessageStream({
               toolCallId: options.toolCallId,
               state: options.state,
               title: options.title,
+              ...options.toolMetadata !== undefined ? { toolMetadata: options.toolMetadata } : {},
               input: anyOptions.input,
               output: anyOptions.output,
               rawInput: anyOptions.rawInput,
@@ -43732,6 +43894,9 @@ function processUIMessageStream({
             if (options.title !== undefined) {
               anyPart.title = options.title;
             }
+            if (options.toolMetadata !== undefined) {
+              anyPart.toolMetadata = options.toolMetadata;
+            }
             anyPart.providerExecuted = (_b23 = anyOptions.providerExecuted) != null ? _b23 : part.providerExecuted;
             const providerMetadata = anyOptions.providerMetadata;
             if (providerMetadata != null) {
@@ -43754,6 +43919,7 @@ function processUIMessageStream({
               preliminary: anyOptions.preliminary,
               providerExecuted: anyOptions.providerExecuted,
               title: options.title,
+              ...options.toolMetadata !== undefined ? { toolMetadata: options.toolMetadata } : {},
               ...anyOptions.providerMetadata != null && (options.state === "output-available" || options.state === "output-error") ? { resultProviderMetadata: anyOptions.providerMetadata } : {},
               ...anyOptions.providerMetadata != null && !(options.state === "output-available" || options.state === "output-error") ? { callProviderMetadata: anyOptions.providerMetadata } : {}
             });
@@ -43898,7 +44064,8 @@ function processUIMessageStream({
               toolName: chunk.toolName,
               index: toolInvocations.length,
               dynamic: chunk.dynamic,
-              title: chunk.title
+              title: chunk.title,
+              toolMetadata: chunk.toolMetadata
             };
             if (chunk.dynamic) {
               updateDynamicToolPart({
@@ -43908,6 +44075,7 @@ function processUIMessageStream({
                 input: undefined,
                 providerExecuted: chunk.providerExecuted,
                 title: chunk.title,
+                toolMetadata: chunk.toolMetadata,
                 providerMetadata: chunk.providerMetadata
               });
             } else {
@@ -43918,6 +44086,7 @@ function processUIMessageStream({
                 input: undefined,
                 providerExecuted: chunk.providerExecuted,
                 title: chunk.title,
+                toolMetadata: chunk.toolMetadata,
                 providerMetadata: chunk.providerMetadata
               });
             }
@@ -43941,7 +44110,8 @@ function processUIMessageStream({
                 toolName: partialToolCall.toolName,
                 state: "input-streaming",
                 input: partialArgs,
-                title: partialToolCall.title
+                title: partialToolCall.title,
+                toolMetadata: partialToolCall.toolMetadata
               });
             } else {
               updateToolPart({
@@ -43949,7 +44119,8 @@ function processUIMessageStream({
                 toolName: partialToolCall.toolName,
                 state: "input-streaming",
                 input: partialArgs,
-                title: partialToolCall.title
+                title: partialToolCall.title,
+                toolMetadata: partialToolCall.toolMetadata
               });
             }
             write();
@@ -43964,7 +44135,8 @@ function processUIMessageStream({
                 input: chunk.input,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: chunk.title
+                title: chunk.title,
+                toolMetadata: chunk.toolMetadata
               });
             } else {
               updateToolPart({
@@ -43974,7 +44146,8 @@ function processUIMessageStream({
                 input: chunk.input,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: chunk.title
+                title: chunk.title,
+                toolMetadata: chunk.toolMetadata
               });
             }
             write();
@@ -43996,7 +44169,8 @@ function processUIMessageStream({
                 input: chunk.input,
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
-                providerMetadata: chunk.providerMetadata
+                providerMetadata: chunk.providerMetadata,
+                toolMetadata: chunk.toolMetadata
               });
             } else {
               updateToolPart({
@@ -44007,7 +44181,8 @@ function processUIMessageStream({
                 rawInput: chunk.input,
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
-                providerMetadata: chunk.providerMetadata
+                providerMetadata: chunk.providerMetadata,
+                toolMetadata: chunk.toolMetadata
               });
             }
             write();
@@ -44038,7 +44213,8 @@ function processUIMessageStream({
                 preliminary: chunk.preliminary,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title
+                title: toolInvocation.title,
+                toolMetadata: toolInvocation.toolMetadata
               });
             } else {
               updateToolPart({
@@ -44050,7 +44226,8 @@ function processUIMessageStream({
                 providerExecuted: chunk.providerExecuted,
                 preliminary: chunk.preliminary,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title
+                title: toolInvocation.title,
+                toolMetadata: toolInvocation.toolMetadata
               });
             }
             write();
@@ -44067,7 +44244,8 @@ function processUIMessageStream({
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title
+                title: toolInvocation.title,
+                toolMetadata: toolInvocation.toolMetadata
               });
             } else {
               updateToolPart({
@@ -44079,7 +44257,8 @@ function processUIMessageStream({
                 errorText: chunk.errorText,
                 providerExecuted: chunk.providerExecuted,
                 providerMetadata: chunk.providerMetadata,
-                title: toolInvocation.title
+                title: toolInvocation.title,
+                toolMetadata: toolInvocation.toolMetadata
               });
             }
             write();
@@ -44537,7 +44716,8 @@ function runToolsTransformation({
                 input: toolCall.input,
                 error: getErrorMessage2(toolCall.error),
                 dynamic: true,
-                title: toolCall.title
+                title: toolCall.title,
+                ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
               });
               break;
             }
@@ -44605,6 +44785,7 @@ function runToolsTransformation({
         }
         case "tool-result": {
           const toolName = chunk.toolName;
+          const toolCall = toolCallsByToolCallId.get(chunk.toolCallId);
           if (chunk.isError) {
             toolResultsStreamController.enqueue({
               type: "tool-error",
@@ -44614,7 +44795,8 @@ function runToolsTransformation({
               providerExecuted: true,
               error: chunk.result,
               dynamic: chunk.dynamic,
-              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {},
+              ...(toolCall == null ? undefined : toolCall.toolMetadata) != null ? { toolMetadata: toolCall.toolMetadata } : {}
             });
           } else {
             controller.enqueue({
@@ -44625,7 +44807,8 @@ function runToolsTransformation({
               output: chunk.result,
               providerExecuted: true,
               dynamic: chunk.dynamic,
-              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {}
+              ...chunk.providerMetadata != null ? { providerMetadata: chunk.providerMetadata } : {},
+              ...(toolCall == null ? undefined : toolCall.toolMetadata) != null ? { toolMetadata: toolCall.toolMetadata } : {}
             });
           }
           break;
@@ -45408,7 +45591,7 @@ async function embed({
         }),
         tracer,
         fn: async (doEmbedSpan) => {
-          var _a21;
+          var _a21, _b16;
           const modelResponse = await model.doEmbed({
             values: [value],
             abortSignal,
@@ -45429,7 +45612,7 @@ async function embed({
           return {
             embedding: embedding2,
             usage: usage2,
-            warnings: modelResponse.warnings,
+            warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
             providerMetadata: modelResponse.providerMetadata,
             response: modelResponse.response
           };
@@ -45525,7 +45708,7 @@ async function embedMany({
             }),
             tracer,
             fn: async (doEmbedSpan) => {
-              var _a222;
+              var _a222, _b16;
               const modelResponse = await model.doEmbed({
                 values,
                 abortSignal,
@@ -45546,7 +45729,7 @@ async function embedMany({
               return {
                 embeddings: embeddings3,
                 usage: usage2,
-                warnings: modelResponse.warnings,
+                warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
                 providerMetadata: modelResponse.providerMetadata,
                 response: modelResponse.response
               };
@@ -45603,7 +45786,7 @@ async function embedMany({
               }),
               tracer,
               fn: async (doEmbedSpan) => {
-                var _a222;
+                var _a222, _b16;
                 const modelResponse = await model.doEmbed({
                   values: chunk,
                   abortSignal,
@@ -45624,7 +45807,7 @@ async function embedMany({
                 return {
                   embeddings: embeddings2,
                   usage,
-                  warnings: modelResponse.warnings,
+                  warnings: (_b16 = modelResponse.warnings) != null ? _b16 : [],
                   providerMetadata: modelResponse.providerMetadata,
                   response: modelResponse.response
                 };
@@ -47738,7 +47921,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
   const bytes = typeof data === "string" ? convertBase64ToUint8Array(data) : data;
   const id3Size = (bytes[6] & 127) << 21 | (bytes[7] & 127) << 14 | (bytes[8] & 127) << 7 | bytes[9] & 127;
   return bytes.slice(id3Size + 10);
-}, VERSION3 = "6.0.175", download = async ({
+}, VERSION3 = "6.0.191", download = async ({
   url: url2,
   maxBytes,
   abortSignal
@@ -48246,7 +48429,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
     }
     return this._output;
   }
-}, JsonToSseTransformStream, UI_MESSAGE_STREAM_HEADERS, uiMessageChunkSchema, isToolOrDynamicToolUIPart, getToolOrDynamicToolName, originalGenerateId2, DefaultStreamTextResult = class {
+}, JsonToSseTransformStream, UI_MESSAGE_STREAM_HEADERS, toolMetadataSchema, uiMessageChunkSchema, isToolOrDynamicToolUIPart, getToolOrDynamicToolName, originalGenerateId2, DefaultStreamTextResult = class {
   constructor({
     model,
     telemetry,
@@ -49494,6 +49677,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               toolName: part.toolName,
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...dynamic != null ? { dynamic } : {},
               ...part.title != null ? { title: part.title } : {}
             });
@@ -49517,6 +49701,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                 input: part.input,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
                 ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+                ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
                 ...dynamic != null ? { dynamic } : {},
                 errorText: onError(part.error),
                 ...part.title != null ? { title: part.title } : {}
@@ -49529,6 +49714,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
                 input: part.input,
                 ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
                 ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+                ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
                 ...dynamic != null ? { dynamic } : {},
                 ...part.title != null ? { title: part.title } : {}
               });
@@ -49551,6 +49737,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               output: part.output,
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...part.preliminary != null ? { preliminary: part.preliminary } : {},
               ...dynamic != null ? { dynamic } : {}
             });
@@ -49564,6 +49751,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
               errorText: part.providerExecuted ? typeof part.error === "string" ? part.error : JSON.stringify(part.error) : onError(part.error),
               ...part.providerExecuted != null ? { providerExecuted: part.providerExecuted } : {},
               ...part.providerMetadata != null ? { providerMetadata: part.providerMetadata } : {},
+              ...part.toolMetadata != null ? { toolMetadata: part.toolMetadata } : {},
               ...dynamic != null ? { dynamic } : {}
             });
             break;
@@ -49737,10 +49925,21 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       ...options
     };
     const preparedCallArgs = (_d = await ((_c = (_b16 = this.settings).prepareCall) == null ? undefined : _c.call(_b16, baseCallArgs))) != null ? _d : baseCallArgs;
-    const { instructions, messages, prompt, ...callArgs } = preparedCallArgs;
+    const {
+      instructions,
+      allowSystemInMessages,
+      messages,
+      prompt,
+      ...callArgs
+    } = preparedCallArgs;
     return {
       ...callArgs,
-      ...{ system: instructions, messages, prompt }
+      ...{
+        system: instructions,
+        allowSystemInMessages,
+        messages,
+        prompt
+      }
     };
   }
   mergeOnStepFinishCallbacks(methodCallback) {
@@ -49781,7 +49980,7 @@ var import_api2, import_api3, __defProp3, __export3 = (target, all) => {
       onStepFinish: this.mergeOnStepFinishCallbacks(onStepFinish)
     });
   }
-}, uiMessagesSchema, DefaultEmbedResult = class {
+}, toolMetadataSchema2, uiMessagesSchema, DefaultEmbedResult = class {
   constructor(options) {
     this.value = options.value;
     this.embedding = options.embedding;
@@ -51289,6 +51488,7 @@ var init_dist6 = __esm(() => {
   init_dist5();
   init_dist2();
   init_dist2();
+  init_dist5();
   init_dist4();
   init_dist4();
   init_dist4();
@@ -52148,6 +52348,7 @@ var init_dist6 = __esm(() => {
     "x-vercel-ai-ui-message-stream": "v1",
     "x-accel-buffering": "no"
   };
+  toolMetadataSchema = exports_external3.record(exports_external3.string(), jsonValueSchema.optional());
   uiMessageChunkSchema = lazySchema(() => zodSchema(exports_external3.union([
     exports_external3.strictObject({
       type: exports_external3.literal("text-start"),
@@ -52175,6 +52376,7 @@ var init_dist6 = __esm(() => {
       toolName: exports_external3.string(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
+      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       title: exports_external3.string().optional()
     }),
@@ -52190,6 +52392,7 @@ var init_dist6 = __esm(() => {
       input: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
+      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       title: exports_external3.string().optional()
     }),
@@ -52200,6 +52403,7 @@ var init_dist6 = __esm(() => {
       input: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
+      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       errorText: exports_external3.string(),
       title: exports_external3.string().optional()
@@ -52215,6 +52419,7 @@ var init_dist6 = __esm(() => {
       output: exports_external3.unknown(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
+      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional(),
       preliminary: exports_external3.boolean().optional()
     }),
@@ -52224,6 +52429,7 @@ var init_dist6 = __esm(() => {
       errorText: exports_external3.string(),
       providerExecuted: exports_external3.boolean().optional(),
       providerMetadata: providerMetadataSchema.optional(),
+      toolMetadata: toolMetadataSchema.optional(),
       dynamic: exports_external3.boolean().optional()
     }),
     exports_external3.strictObject({
@@ -52311,6 +52517,7 @@ var init_dist6 = __esm(() => {
     prefix: "aitxt",
     size: 24
   });
+  toolMetadataSchema2 = exports_external3.record(exports_external3.string(), jsonValueSchema.optional());
   uiMessagesSchema = lazySchema(() => zodSchema(exports_external3.array(exports_external3.object({
     id: exports_external3.string(),
     role: exports_external3.enum(["system", "user", "assistant"]),
@@ -52362,6 +52569,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-streaming"),
         input: exports_external3.unknown().optional(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52374,6 +52582,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-available"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52386,6 +52595,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-requested"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52402,6 +52612,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-responded"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52418,6 +52629,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-available"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52436,8 +52648,9 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-error"),
-        input: exports_external3.unknown(),
+        input: exports_external3.unknown().optional(),
         rawInput: exports_external3.unknown().optional(),
         providerExecuted: exports_external3.boolean().optional(),
         output: exports_external3.never().optional(),
@@ -52454,6 +52667,7 @@ var init_dist6 = __esm(() => {
         type: exports_external3.literal("dynamic-tool"),
         toolName: exports_external3.string(),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-denied"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52469,6 +52683,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-streaming"),
         providerExecuted: exports_external3.boolean().optional(),
         callProviderMetadata: providerMetadataSchema.optional(),
@@ -52480,6 +52695,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("input-available"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -52491,6 +52707,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-requested"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52506,6 +52723,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("approval-responded"),
         input: exports_external3.unknown(),
         providerExecuted: exports_external3.boolean().optional(),
@@ -52521,6 +52739,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-available"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -52538,9 +52757,10 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-error"),
         providerExecuted: exports_external3.boolean().optional(),
-        input: exports_external3.unknown(),
+        input: exports_external3.unknown().optional(),
         rawInput: exports_external3.unknown().optional(),
         output: exports_external3.never().optional(),
         errorText: exports_external3.string(),
@@ -52555,6 +52775,7 @@ var init_dist6 = __esm(() => {
       exports_external3.object({
         type: exports_external3.string().startsWith("tool-"),
         toolCallId: exports_external3.string(),
+        toolMetadata: toolMetadataSchema2.optional(),
         state: exports_external3.literal("output-denied"),
         providerExecuted: exports_external3.boolean().optional(),
         input: exports_external3.unknown(),
@@ -53044,52 +53265,54 @@ import { promises as fsPromises } from "fs";
 import { createHash, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs2 } from "fs";
 import { homedir as homedir22 } from "os";
-import { dirname as dirname3, join as join52 } from "path";
+import { dirname as dirname3, join as join62 } from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 import { webcrypto as crypto2 } from "crypto";
-import { existsSync as existsSync42, writeFileSync as writeFileSync3, readFileSync as readFileSync22, mkdirSync as mkdirSync32 } from "fs";
-import { join as join42 } from "path";
+import { existsSync as existsSync5, writeFileSync as writeFileSync4, readFileSync as readFileSync3, mkdirSync as mkdirSync32 } from "fs";
+import { join as join52 } from "path";
 import { Database as Database4 } from "bun:sqlite";
 import { existsSync as existsSync11, mkdirSync as mkdirSync9 } from "fs";
 import { dirname as dirname4, join as join14, resolve as resolve2 } from "path";
-import { existsSync as existsSync22, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync22, writeFileSync as writeFileSync3 } from "fs";
 import { join as join22 } from "path";
-import { execSync as execSync2, execFileSync } from "child_process";
-import { existsSync as existsSync32, readFileSync as readFileSync4, writeFileSync as writeFileSync22, mkdirSync as mkdirSync22 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join32, dirname as dirname22 } from "path";
+import { execFileSync } from "child_process";
+import { writeFileSync as writeFileSync22, existsSync as existsSync32, readFileSync as readFileSync5 } from "fs";
+import { join as join32 } from "path";
 import { hostname as hostname3 } from "os";
+import { existsSync as existsSync42, readFileSync as readFileSync22, writeFileSync as writeFileSync32, mkdirSync as mkdirSync22 } from "fs";
+import { homedir as homedir11 } from "os";
+import { join as join42, dirname as dirname22 } from "path";
 import { Buffer as Buffer2 } from "buffer";
 import * as zlib from "zlib";
 import { Readable } from "stream";
 import { Writable } from "stream";
 import { createHash as createHash2 } from "crypto";
-import { mkdirSync as mkdirSync4, statSync, writeFileSync as writeFileSync42 } from "fs";
-import { dirname as dirname42, join as join62, relative as relative2 } from "path";
+import { mkdirSync as mkdirSync4, statSync, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname42, join as join72, relative as relative2 } from "path";
 import { readdir, readFile as readFile2 } from "fs/promises";
-import { existsSync as existsSync62, readdirSync as readdirSync3, readFileSync as readFileSync42, statSync as statSync2 } from "fs";
-import { basename, join as join72, resolve as resolve22 } from "path";
+import { existsSync as existsSync72, readdirSync as readdirSync3, readFileSync as readFileSync52, statSync as statSync2 } from "fs";
+import { basename, join as join82, resolve as resolve22 } from "path";
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync72, readFileSync as readFileSync5, writeFileSync as writeFileSync5, mkdirSync as mkdirSync52 } from "fs";
-import { dirname as dirname5, join as join82 } from "path";
+import { existsSync as existsSync82, readFileSync as readFileSync6, writeFileSync as writeFileSync6, mkdirSync as mkdirSync52 } from "fs";
+import { dirname as dirname5, join as join92 } from "path";
 import { execFileSync as execFileSync4 } from "child_process";
-import { existsSync as existsSync102 } from "fs";
-import { join as join112 } from "path";
+import { existsSync as existsSync112 } from "fs";
+import { join as join122 } from "path";
 import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync82 } from "fs";
-import { homedir as homedir32, hostname as hostname22, platform as platform2, type } from "os";
-import { join as join92 } from "path";
 import { existsSync as existsSync92 } from "fs";
-import { execSync as execSync22 } from "child_process";
+import { homedir as homedir32, hostname as hostname22, platform as platform2, type } from "os";
 import { join as join102 } from "path";
-import { execSync as execSync3 } from "child_process";
-import { readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync102 } from "fs";
+import { execSync as execSync2 } from "child_process";
+import { join as join112 } from "path";
+import { execSync as execSync22 } from "child_process";
+import { readFileSync as readFileSync7 } from "fs";
 import { mkdirSync as mkdirSync62 } from "fs";
-import { dirname as dirname6, join as join122 } from "path";
+import { dirname as dirname6, join as join132 } from "path";
 import { fileURLToPath } from "url";
-import { existsSync as existsSync112 } from "fs";
+import { existsSync as existsSync12 } from "fs";
 function __accessProp3(key) {
   return this[key];
 }
@@ -53266,14 +53489,25 @@ function uuid5() {
 function isGitRepo(path) {
   return existsSync22(join22(path, ".git"));
 }
+function getCurrentBranch(path) {
+  return execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+    cwd: path,
+    stdio: "pipe",
+    encoding: "utf-8",
+    env: process.env
+  }).trim();
+}
+function bootstrapPathsToStage(path) {
+  return BOOTSTRAP_PATHS.filter((entry) => existsSync22(join22(path, entry)));
+}
 function gitInit(project) {
   const { path, name: name21, id, slug } = project;
   if (isGitRepo(path))
     return;
-  execSync2("git init", { cwd: path, stdio: "pipe" });
+  execFileSync("git", ["init", "-b", "main"], { cwd: path, stdio: "pipe", env: process.env });
   const gitignorePath = join22(path, ".gitignore");
   if (!existsSync22(gitignorePath)) {
-    writeFileSync4(gitignorePath, GITIGNORE_TEMPLATE, "utf-8");
+    writeFileSync3(gitignorePath, GITIGNORE_TEMPLATE, "utf-8");
   }
   const projectJson = {
     id,
@@ -53282,26 +53516,18 @@ function gitInit(project) {
     created_at: project.created_at,
     integrations: project.integrations ?? {}
   };
-  writeFileSync4(join22(path, ".project.json"), JSON.stringify(projectJson, null, 2) + `
+  writeFileSync3(join22(path, ".project.json"), JSON.stringify(projectJson, null, 2) + `
 `, "utf-8");
-  execSync2("git add .gitignore .project.json", { cwd: path, stdio: "pipe" });
-  execSync2(`git commit -m "chore: init project ${name21}"`, {
+  const staged = bootstrapPathsToStage(path);
+  if (staged.length === 0)
+    return;
+  execFileSync("git", ["add", ...staged], { cwd: path, stdio: "pipe", env: process.env });
+  execFileSync("git", ["commit", "-m", `chore: init project ${name21}`], {
     cwd: path,
     stdio: "pipe",
     env: { ...process.env, GIT_AUTHOR_NAME: "open-projects", GIT_COMMITTER_NAME: "open-projects" }
   });
 }
-function getConfig() {
-  if (existsSync32(CONFIG_PATH3)) {
-    try {
-      const user = JSON.parse(readFileSync4(CONFIG_PATH3, "utf-8"));
-      return { ...DEFAULTS, ...user };
-    } catch {
-      return { ...DEFAULTS };
-    }
-  }
-  return { ...DEFAULTS };
-}
 function rowToWorkdir(row) {
   return {
     ...row,
@@ -53345,6 +53571,176 @@ function removeWorkdir(projectId, path, db2) {
   const d = db2 || getDatabase2();
   d.run("DELETE FROM project_workdirs WHERE project_id = ? AND path = ?", [projectId, path]);
 }
+function markWorkdirGenerated(projectId, path, db2) {
+  const d = db2 || getDatabase2();
+  d.run("UPDATE project_workdirs SET claude_md_generated = 1, agents_md_generated = 1 WHERE project_id = ? AND path = ?", [projectId, path]);
+}
+function buildWorkdirList(workdirs, currentPath) {
+  return workdirs.map((w) => {
+    const isCurrent = w.path === currentPath;
+    const primary = w.is_primary ? " (primary)" : "";
+    const current = isCurrent ? " \u2190 you are here" : "";
+    return `- \`${w.path}\` [${w.label}]${primary}${current}  *(machine: ${w.machine_id})*`;
+  }).join(`
+`);
+}
+function claudeMdContent(project, workdir, allWorkdirs) {
+  const otherDirs = allWorkdirs.filter((w) => w.path !== workdir.path);
+  const otherSection = otherDirs.length ? `
+## Other Working Directories
+${buildWorkdirList(otherDirs, workdir.path)}
+` : "";
+  const integrations = Object.keys(project.integrations).length ? `
+## Integrations
+${Object.entries(project.integrations).filter(([, v]) => v).map(([k, v]) => `- **${k}:** \`${v}\``).join(`
+`)}
+` : "";
+  const tags = project.tags.length ? `
+**Tags:** ${project.tags.join(", ")}` : "";
+  return `# Project: ${project.name}
+
+> ${project.description ?? `Working directory for project **${project.name}**`}
+${tags}
+
+## Working Directory
+
+You are working in the **${workdir.label}** directory for this project:
+
+\`\`\`
+${workdir.path}
+\`\`\`
+
+**Write all code to this directory.** Do not write to other project directories unless explicitly instructed.
+
+## Project Metadata
+
+| Field | Value |
+|-------|-------|
+| ID | \`${project.id}\` |
+| Slug | \`${project.slug}\` |
+| Label | \`${workdir.label}\` |
+| Machine | \`${workdir.machine_id}\` |
+| Status | ${project.status} |
+${project.git_remote ? `| Git Remote | ${project.git_remote} |` : ""}
+${project.s3_bucket ? `| S3 Bucket | \`${project.s3_bucket}\` |` : ""}
+${integrations}${otherSection}
+## All Working Directories
+
+${buildWorkdirList(allWorkdirs, workdir.path)}
+
+## Instructions for AI Agents
+
+1. **Write code in \`${workdir.path}\`** \u2014 this is your working directory for this session.
+2. Use \`projects sync ${project.slug}\` to push changes to S3.
+3. Use \`projects git ${project.slug} <args>\` to run git commands.
+4. If you need to switch to a different workdir, call \`projects_open\` with the project ID.
+
+---
+*Generated by open-projects. Regenerate: \`projects workdir generate ${project.slug}\`*
+`.trimStart();
+}
+function agentsMdContent(project, workdir, allWorkdirs) {
+  const otherDirs = allWorkdirs.filter((w) => w.path !== workdir.path);
+  return `---
+project_id: ${project.id}
+project_slug: ${project.slug}
+project_name: ${project.name}
+working_directory: ${workdir.path}
+label: ${workdir.label}
+machine_id: ${workdir.machine_id}
+is_primary: ${workdir.is_primary}
+---
+
+# ${project.name} \u2014 Agent Instructions
+
+## Scope
+
+This agent session is scoped to the **${workdir.label}** working directory:
+
+\`\`\`
+${workdir.path}
+\`\`\`
+
+**Only write files inside this directory** unless the user explicitly asks you to work elsewhere.
+${otherDirs.length ? `
+## Other workdirs for this project
+
+${otherDirs.map((w) => `- \`${w.path}\` [${w.label}] on ${w.machine_id}`).join(`
+`)}
+` : ""}
+## Quick Reference
+
+\`\`\`bash
+# Open this project
+cd ${workdir.path}
+
+# Sync to S3
+projects sync ${project.slug}
+
+# Git operations
+projects git ${project.slug} status
+projects git ${project.slug} log --oneline -10
+\`\`\`
+${Object.keys(project.integrations).length ? `
+## Service IDs
+
+${Object.entries(project.integrations).filter(([, v]) => v).map(([k, v]) => `- **${k}:** \`${v}\``).join(`
+`)}
+` : ""}
+---
+*Generated by open-projects ${new Date().toISOString().slice(0, 10)}*
+`.trimStart();
+}
+function generateForWorkdir(project, workdir, allWorkdirs, options = {}) {
+  const claudeMd = claudeMdContent(project, workdir, allWorkdirs);
+  const agentsMd = agentsMdContent(project, workdir, allWorkdirs);
+  const claudePath = join32(workdir.path, "CLAUDE.md");
+  const agentsPath = join32(workdir.path, "AGENTS.md");
+  let written = false;
+  if (!options.dryRun && existsSync32(workdir.path)) {
+    if (existsSync32(claudePath) && !options.force) {
+      const existing = readFileSync5(claudePath, "utf-8");
+      if (existing.includes("Generated by open-projects")) {
+        writeFileSync22(claudePath, claudeMd, "utf-8");
+      } else {
+        const separator = `
+
+---
+
+<!-- open-projects -->
+`;
+        const marker21 = "<!-- open-projects -->";
+        if (existing.includes(marker21)) {
+          const before = existing.slice(0, existing.indexOf(marker21) - separator.length + 1);
+          writeFileSync22(claudePath, before + separator + claudeMd, "utf-8");
+        } else {
+          writeFileSync22(claudePath, existing.trimEnd() + separator + claudeMd, "utf-8");
+        }
+      }
+    } else {
+      writeFileSync22(claudePath, claudeMd, "utf-8");
+    }
+    writeFileSync22(agentsPath, agentsMd, "utf-8");
+    markWorkdirGenerated(project.id, workdir.path, options.db);
+    written = true;
+  }
+  return { path: workdir.path, claude_md: claudeMd, agents_md: agentsMd, written };
+}
+function generateAllWorkdirs(project, options = {}) {
+  const workdirs = listWorkdirs(project.id, options.db);
+  return workdirs.map((w) => generateForWorkdir(project, w, workdirs, options));
+}
+function getConfig() {
+  if (existsSync42(CONFIG_PATH3)) {
+    try {
+      const user = JSON.parse(readFileSync22(CONFIG_PATH3, "utf-8"));
+      return { ...DEFAULTS, ...user };
+    } catch {
+      return { ...DEFAULTS };
+    }
+  }
+  return { ...DEFAULTS };
+}
 function generateProjectId() {
   return `prj_${nanoid3()}`;
 }
@@ -53352,12 +53748,10 @@ function slugify2(name21) {
   return name21.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
 }
 function scaffoldProject(path) {
-  if (existsSync42(path))
-    return;
   mkdirSync32(path, { recursive: true });
   const config2 = getConfig();
   for (const dir of config2.scaffold_dirs || ["data", "scripts", "assets", "docs"]) {
-    mkdirSync32(join42(path, dir), { recursive: true });
+    mkdirSync32(join52(path, dir), { recursive: true });
   }
 }
 function ensureUniqueSlug(base, db2, excludeId) {
@@ -53408,6 +53802,9 @@ function createProject2(input, db2) {
   try {
     addWorkdir({ project_id: id, path: input.path, label: "main", is_primary: true }, d);
   } catch {}
+  try {
+    generateAllWorkdirs(project, { db: d });
+  } catch {}
   const shouldGitInit = input.git_init !== false;
   if (shouldGitInit) {
     try {
@@ -53513,10 +53910,10 @@ function setIntegrations(id, integrations, db2) {
     id
   ]);
   try {
-    const jsonPath = join42(project.path, ".project.json");
-    if (existsSync42(jsonPath)) {
-      const existing = JSON.parse(readFileSync22(jsonPath, "utf-8"));
-      writeFileSync3(jsonPath, JSON.stringify({ ...existing, integrations: merged }, null, 2) + `
+    const jsonPath = join52(project.path, ".project.json");
+    if (existsSync5(jsonPath)) {
+      const existing = JSON.parse(readFileSync3(jsonPath, "utf-8"));
+      writeFileSync4(jsonPath, JSON.stringify({ ...existing, integrations: merged }, null, 2) + `
 `, "utf-8");
     }
   } catch {}
@@ -54590,7 +54987,7 @@ async function collectLocalFiles(rootPath) {
   async function walk(dir) {
     const entries = await readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join62(dir, entry.name);
+      const fullPath = join72(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(fullPath);
       } else if (entry.isFile()) {
@@ -54662,7 +55059,7 @@ async function syncProject(project, options = {}) {
           continue;
         }
         try {
-          const data = await readFile2(join62(project.path, relPath));
+          const data = await readFile2(join72(project.path, relPath));
           await client.send(new PutObjectCommand({
             Bucket: bucket,
             Key: s3Key,
@@ -54700,9 +55097,9 @@ async function syncProject(project, options = {}) {
             chunks.push(chunk);
           }
           const data = Buffer.concat(chunks);
-          const localPath = join62(project.path, relPath);
+          const localPath = join72(project.path, relPath);
           mkdirSync4(dirname42(localPath), { recursive: true });
-          writeFileSync42(localPath, data);
+          writeFileSync5(localPath, data);
           log(`pull: ${relPath} (${data.length}B)`);
           result.pulled++;
           result.bytes += data.length;
@@ -54723,18 +55120,18 @@ async function syncProject(project, options = {}) {
   return result;
 }
 function inferProjectName(projectPath) {
-  const pkgPath = join72(projectPath, "package.json");
-  if (existsSync62(pkgPath)) {
+  const pkgPath = join82(projectPath, "package.json");
+  if (existsSync72(pkgPath)) {
     try {
-      const pkg = JSON.parse(readFileSync42(pkgPath, "utf-8"));
+      const pkg = JSON.parse(readFileSync52(pkgPath, "utf-8"));
       if (pkg.name)
         return pkg.name.replace(/^@[^/]+\//, "");
     } catch {}
   }
-  const projPath = join72(projectPath, ".project.json");
-  if (existsSync62(projPath)) {
+  const projPath = join82(projectPath, ".project.json");
+  if (existsSync72(projPath)) {
     try {
-      const p2 = JSON.parse(readFileSync42(projPath, "utf-8"));
+      const p2 = JSON.parse(readFileSync52(projPath, "utf-8"));
       if (p2.name)
         return p2.name;
     } catch {}
@@ -54742,11 +55139,11 @@ function inferProjectName(projectPath) {
   return basename(projectPath);
 }
 function inferGitRemote(projectPath) {
-  const gitConfigPath = join72(projectPath, ".git", "config");
-  if (!existsSync62(gitConfigPath))
+  const gitConfigPath = join82(projectPath, ".git", "config");
+  if (!existsSync72(gitConfigPath))
     return;
   try {
-    const config2 = readFileSync42(gitConfigPath, "utf-8");
+    const config2 = readFileSync52(gitConfigPath, "utf-8");
     const match = config2.match(/\[remote "origin"\][\s\S]*?url\s*=\s*(.+)/);
     return match?.[1]?.trim();
   } catch {
@@ -54756,7 +55153,7 @@ function inferGitRemote(projectPath) {
 async function importProject(projectPath, options = {}) {
   const absPath = resolve22(projectPath);
   const log = options.onProgress ?? (() => {});
-  if (!existsSync62(absPath)) {
+  if (!existsSync72(absPath)) {
     return { error: `Path does not exist: ${absPath}` };
   }
   const stat = statSync2(absPath);
@@ -54791,7 +55188,7 @@ async function importBulk(dirPath, options = {}) {
   const absDir = resolve22(dirPath);
   const result = { imported: [], skipped: [], errors: [] };
   const log = options.onProgress ?? (() => {});
-  if (!existsSync62(absDir)) {
+  if (!existsSync72(absDir)) {
     result.errors.push({ path: absDir, error: "Directory does not exist" });
     return result;
   }
@@ -54799,7 +55196,7 @@ async function importBulk(dirPath, options = {}) {
   const dirs = entries.filter((e2) => e2.isDirectory() && !e2.name.startsWith("."));
   log(`Found ${dirs.length} subdirectories in ${absDir}`);
   for (const entry of dirs) {
-    const subPath = join72(absDir, entry.name);
+    const subPath = join82(absDir, entry.name);
     const res = await importProject(subPath, options);
     if (res.project) {
       result.imported.push(res.project);
@@ -54834,7 +55231,8 @@ function publishProject(name21, path, options = {}) {
       } else {
         execFileSync2("git", ["remote", "add", "origin", remote], { cwd: path, stdio: "pipe", env: process.env });
       }
-      execFileSync2("git", ["push", "-u", "origin", "main", "--quiet"], { cwd: path, stdio: "pipe", env: process.env });
+      const branch = getCurrentBranch(path);
+      execFileSync2("git", ["push", "-u", "origin", branch, "--quiet"], { cwd: path, stdio: "pipe", env: process.env });
       pushed = true;
     } catch {}
   }
@@ -54860,14 +55258,14 @@ function getGitHubUrl(path) {
   }
 }
 function getScheduleConfig() {
-  if (!existsSync72(CONFIG_PATH22)) {
+  if (!existsSync82(CONFIG_PATH22)) {
     return { enabled: false, interval: "daily", direction: "both" };
   }
-  return JSON.parse(readFileSync5(CONFIG_PATH22, "utf-8"));
+  return JSON.parse(readFileSync6(CONFIG_PATH22, "utf-8"));
 }
 function saveScheduleConfig(config2) {
   mkdirSync52(dirname5(CONFIG_PATH22), { recursive: true });
-  writeFileSync5(CONFIG_PATH22, JSON.stringify(config2, null, 2) + `
+  writeFileSync6(CONFIG_PATH22, JSON.stringify(config2, null, 2) + `
 `, "utf-8");
 }
 async function syncAll(direction = "both", onProgress) {
@@ -54897,7 +55295,7 @@ async function syncAll(direction = "both", onProgress) {
 function getMachineProfile() {
   const host = (process.env["HOSTNAME"] || hostname22()).split(".")[0] || hostname22();
   const currentPlatform = platform2();
-  const workspaceRoot = currentPlatform === "darwin" ? join92(homedir32(), "Workspace") : join92(homedir32(), "workspace");
+  const workspaceRoot = currentPlatform === "darwin" ? join102(homedir32(), "Workspace") : join102(homedir32(), "workspace");
   return {
     hostname: host,
     platform: currentPlatform,
@@ -54924,7 +55322,7 @@ function commandAvailability(command, versionArgs = ["--version"]) {
   return { command, available: true, path: commandPath, version: version2 };
 }
 function pathExists(path) {
-  return existsSync82(path);
+  return existsSync92(path);
 }
 function classifyMachine(host, currentPlatform) {
   if (host === "apple01")
@@ -54938,10 +55336,10 @@ function classifyMachine(host, currentPlatform) {
   return "unknown";
 }
 function gitStatus(path) {
-  if (!existsSync92(join102(path, ".git")))
+  if (!existsSync102(join112(path, ".git")))
     return "not a repo";
   try {
-    const out = execSync22("git status --porcelain", { cwd: path, stdio: "pipe", encoding: "utf-8" }).trim();
+    const out = execSync2("git status --porcelain", { cwd: path, stdio: "pipe", encoding: "utf-8" }).trim();
     if (!out)
       return "clean";
     const n2 = out.split(`
@@ -54952,17 +55350,17 @@ function gitStatus(path) {
   }
 }
 function dirSize(path) {
-  if (!existsSync92(path))
+  if (!existsSync102(path))
     return 0;
   try {
-    const out = execSync22(`du -sb -- "${path}" 2>/dev/null || du -sk -- "${path}" 2>/dev/null`, { stdio: "pipe", encoding: "utf-8" }).trim();
+    const out = execSync2(`du -sb -- "${path}" 2>/dev/null || du -sk -- "${path}" 2>/dev/null`, { stdio: "pipe", encoding: "utf-8" }).trim();
     return parseInt(out.split("\t")[0] ?? "0", 10);
   } catch {
     return 0;
   }
 }
 function getProjectStatus(project) {
-  const pathExists2 = existsSync92(project.path);
+  const pathExists2 = existsSync102(project.path);
   const workdirs = listWorkdirs(project.id);
   const lastSync = getDatabase2().query("SELECT completed_at FROM sync_log WHERE project_id = ? AND status = 'completed' ORDER BY completed_at DESC LIMIT 1").get(project.id)?.completed_at ?? null;
   return {
@@ -54975,18 +55373,21 @@ function getProjectStatus(project) {
   };
 }
 function run(cmd) {
-  return execSync3(cmd, { encoding: "utf-8", stdio: "pipe" }).trim();
+  return execSync22(cmd, { encoding: "utf-8", stdio: "pipe" }).trim();
 }
 function getTmuxSessionName(project) {
-  const raw = project.slug || project.name;
-  if (project.path?.includes("opensourcedev")) {
-    const normalized = raw.replace(/^proj-/, "");
-    return normalized.startsWith("open-") ? normalized : `open-${normalized}`;
-  }
-  return raw;
+  return project.slug || project.name;
 }
 function listSessions() {
-  const output = run("tmux list-sessions -F '#{session_name}:#{session_group}:#{session_windows}:#{session_attached}'");
+  let output = "";
+  try {
+    output = run("tmux list-sessions -F '#{session_name}:#{session_group}:#{session_windows}:#{session_attached}'");
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (message.includes("no server running"))
+      return [];
+    throw err;
+  }
   return output.split(`
 `).filter(Boolean).map((line) => {
     const [name21, group, windows, attached] = line.split(":");
@@ -55094,7 +55495,7 @@ function getProjectLocations(project) {
   const currentMachine = getMachineId();
   return listWorkdirs(project.id).map((workdir) => ({
     ...workdir,
-    exists: existsSync102(workdir.path),
+    exists: existsSync112(workdir.path),
     currentMachine: workdir.machine_id === currentMachine,
     recommended: workdir.is_primary || workdir.path === project.path
   }));
@@ -55131,7 +55532,7 @@ function buildProjectContext(project) {
   };
 }
 function getGitContext(path) {
-  if (!existsSync102(join112(path, ".git"))) {
+  if (!existsSync112(join122(path, ".git"))) {
     return { isRepo: false, branch: null, dirtyCount: null, remote: null };
   }
   return {
@@ -55174,7 +55575,7 @@ function setupMachineReport(options = {}) {
   const dryRun = options.dryRun !== false;
   const checks3 = [];
   const dbDir = dirname6(getDbPath2());
-  const cloudConfig = join122(process.env["HOME"] || "~", ".hasna", "cloud", "config.json");
+  const cloudConfig = join132(process.env["HOME"] || "~", ".hasna", "cloud", "config.json");
   checks3.push(pathCheck("PROJECTS_DATA_DIR", "projects data dir", dbDir, options));
   checks3.push(pathCheck("WORKSPACE_ROOT", "workspace root", machine.workspaceRoot, options));
   checks3.push(commandCheck("bun", ["--version"], "Bun runtime"));
@@ -55235,8 +55636,8 @@ function commandCheck(command, versionArgs, label, missingStatus = "error") {
 }
 function packageVersion() {
   try {
-    const pkgPath = join122(dirname6(fileURLToPath(import.meta.url)), "..", "..", "package.json");
-    return JSON.parse(readFileSync6(pkgPath, "utf-8")).version || "0.0.0";
+    const pkgPath = join132(dirname6(fileURLToPath(import.meta.url)), "..", "..", "package.json");
+    return JSON.parse(readFileSync7(pkgPath, "utf-8")).version || "0.0.0";
   } catch {
     return "0.0.0";
   }
@@ -55250,7 +55651,7 @@ function findStaleIssues(project) {
   const issues = [];
   const currentMachine = getMachineId();
   for (const p2 of projects) {
-    if (p2.status === "active" && !existsSync112(p2.path)) {
+    if (p2.status === "active" && !existsSync12(p2.path)) {
       issues.push({
         code: "PROJECT_PATH_MISSING",
         severity: "error",
@@ -55261,7 +55662,7 @@ function findStaleIssues(project) {
       });
     }
     for (const workdir of listWorkdirs(p2.id)) {
-      if (workdir.machine_id === currentMachine && !existsSync112(workdir.path)) {
+      if (workdir.machine_id === currentMachine && !existsSync12(workdir.path)) {
         issues.push({
           code: "WORKDIR_PATH_MISSING",
           severity: "warn",
@@ -56203,7 +56604,7 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
   }
   const credentials = await fromWebToken({
     ...init,
-    webIdentityToken: import_shared_ini_file_loader10.externalDataInterceptor?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync3(webIdentityTokenFile, { encoding: "ascii" }),
+    webIdentityToken: import_shared_ini_file_loader10.externalDataInterceptor?.getTokenRecord?.()[webIdentityTokenFile] ?? readFileSync4(webIdentityTokenFile, { encoding: "ascii" }),
     roleArn,
     roleSessionName
   })(awsIdentityProperties);
@@ -56290,7 +56691,7 @@ coverage/
 # Cache
 .cache/
 .turbo/
-`, CONFIG_PATH3, DEFAULTS, nanoid3, import_protocol_http, addExpectContinueMiddlewareOptions, getAddExpectContinuePlugin = (options) => ({
+`, BOOTSTRAP_PATHS, CONFIG_PATH3, DEFAULTS, nanoid3, import_protocol_http, addExpectContinueMiddlewareOptions, getAddExpectContinuePlugin = (options) => ({
   applyToStack: (clientStack) => {
     clientStack.add(addExpectContinueMiddleware(options), addExpectContinueMiddlewareOptions);
   }
@@ -74101,7 +74502,7 @@ More information can be found at: https://a.co/c895JFp`);
     };
   });
   require_dist_cjs41 = __commonJS3((exports) => {
-    var __dirname2 = "/home/hasna/workspace/hasna/opensource/open-projects/node_modules/@aws-sdk/util-user-agent-node/dist-cjs";
+    var __dirname2 = "/Users/hasna/Workspace/hasna/opensource/open-projects/node_modules/@aws-sdk/util-user-agent-node/dist-cjs";
     var node_os = __require3("os");
     var node_process = __require3("process");
     var utilConfigProvider = require_dist_cjs28();
@@ -77771,10 +78172,10 @@ More information can be found at: https://a.co/c895JFp`);
         await fs2.writeFile(tokenFilePath, JSON.stringify(token, null, 2), "utf8");
       }
       getTokenFilePath() {
-        const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join52(homedir22(), ".aws", "login", "cache");
+        const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join62(homedir22(), ".aws", "login", "cache");
         const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
         const loginSessionSha256 = createHash("sha256").update(loginSessionBytes).digest("hex");
-        return join52(directory, `${loginSessionSha256}.json`);
+        return join62(directory, `${loginSessionSha256}.json`);
       }
       derToRawSignature(derSignature) {
         let offset = 2;
@@ -78075,7 +78476,18 @@ More information can be found at: https://a.co/c895JFp`);
   INSERT OR IGNORE INTO _migrations (id) VALUES (4);
   `
   ];
-  CONFIG_PATH3 = join32(homedir11(), ".hasna", "projects", "config.json");
+  BOOTSTRAP_PATHS = [
+    ".gitignore",
+    ".project.json",
+    "CLAUDE.md",
+    "AGENTS.md",
+    "README.md",
+    "docs",
+    "data",
+    "scripts",
+    "assets"
+  ];
+  CONFIG_PATH3 = join42(homedir11(), ".hasna", "projects", "config.json");
   DEFAULTS = {
     default_path: process.cwd(),
     default_github_org: "hasnaxyz",
@@ -83861,7 +84273,7 @@ More information can be found at: https://a.co/c895JFp`);
   }).s("AmazonS3", "PutObject", {}).n("S3Client", "PutObjectCommand").sc(PutObject$).build() {
   };
   MAX_FILE_SIZE = 100 * 1024 * 1024;
-  CONFIG_PATH22 = join82(process.env["HOME"] || "~", ".hasna", "projects", "scheduler.json");
+  CONFIG_PATH22 = join92(process.env["HOME"] || "~", ".hasna", "projects", "scheduler.json");
   SPARK_MACHINES = new Set(["spark01", "spark02"]);
 });
 
@@ -84852,12 +85264,12 @@ __export(exports_contacts_connector, {
 });
 function getContactsDb() {
   const { Database: Database5 } = __require("bun:sqlite");
-  const { existsSync: existsSync5 } = __require("fs");
+  const { existsSync: existsSync13 } = __require("fs");
   const { join: join15 } = __require("path");
   const { homedir: homedir7 } = __require("os");
   const envPath = process.env["HASNA_CONTACTS_DB_PATH"] ?? process.env["OPEN_CONTACTS_DB"];
   const dbPath = envPath ?? join15(homedir7(), ".hasna", "contacts", "contacts.db");
-  if (!existsSync5(dbPath))
+  if (!existsSync13(dbPath))
     return null;
   const db2 = new Database5(dbPath, { readonly: true });
   return db2;
@@ -86537,12 +86949,12 @@ function buildServer() {
       }
       if (!resolvedUrl)
         return errorResponse(new Error("No URL provided and no default environment set. Pass url or env."));
-      const { execSync: execSync4 } = await import("child_process");
+      const { execSync: execSync3 } = await import("child_process");
       let diffOutput = "";
       try {
         const ref = baseRef ?? "HEAD";
-        const stagedOut = execSync4(`git diff --cached --name-only`, { cwd: process.cwd(), encoding: "utf-8" }).trim();
-        const unstagedOut = execSync4(`git diff --name-only ${ref}`, { cwd: process.cwd(), encoding: "utf-8" }).trim();
+        const stagedOut = execSync3(`git diff --cached --name-only`, { cwd: process.cwd(), encoding: "utf-8" }).trim();
+        const unstagedOut = execSync3(`git diff --name-only ${ref}`, { cwd: process.cwd(), encoding: "utf-8" }).trim();
         diffOutput = [stagedOut, unstagedOut].filter(Boolean).join(`
 `);
       } catch {
@@ -86679,8 +87091,8 @@ function buildServer() {
       let allFiles = [...filePaths];
       if (includeAutoDetect) {
         try {
-          const { execSync: execSync4 } = await import("child_process");
-          const diffOutput = execSync4("git diff --name-only HEAD", { encoding: "utf-8", cwd: process.cwd() }).trim();
+          const { execSync: execSync3 } = await import("child_process");
+          const diffOutput = execSync3("git diff --name-only HEAD", { encoding: "utf-8", cwd: process.cwd() }).trim();
           const gitFiles = diffOutput.split(`
 `).filter(Boolean);
           allFiles = [...new Set([...allFiles, ...gitFiles])];
@@ -87225,7 +87637,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // src/mcp/http.ts
 import { createServer } from "http";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-var DEFAULT_MCP_HTTP_PORT = 8840;
+var DEFAULT_MCP_HTTP_PORT = 8880;
 var DEFAULT_HOST = "127.0.0.1";
 function resolveMcpHttpPort(explicitPort) {
   if (explicitPort !== undefined && !Number.isNaN(explicitPort))
@@ -87247,8 +87659,8 @@ function parseCliPort(args) {
   }
   return;
 }
-function isHttpMode(args) {
-  return args.includes("--http") || process.env.MCP_HTTP === "1";
+function isStdioMode(args) {
+  return args.includes("--stdio") || process.env.MCP_STDIO === "1";
 }
 async function readJsonBody(req) {
   const chunks = [];
@@ -87336,14 +87748,14 @@ process.on("uncaughtException", (err) => {
 });
 async function main() {
   const args = process.argv.slice(2);
-  if (isHttpMode(args)) {
-    await startMcpHttpServer({ name: "testers", port: parseCliPort(args) });
+  if (isStdioMode(args)) {
+    const { buildServer: buildServer2 } = await Promise.resolve().then(() => (init_server(), exports_server));
+    const server = buildServer2();
+    const transport = new StdioServerTransport;
+    await server.connect(transport);
     return;
   }
-  const { buildServer: buildServer2 } = await Promise.resolve().then(() => (init_server(), exports_server));
-  const server = buildServer2();
-  const transport = new StdioServerTransport;
-  await server.connect(transport);
+  await startMcpHttpServer({ name: "testers", port: parseCliPort(args) });
 }
 main().catch((error40) => {
   console.error("Failed to start testers:", error40);