@openai/agents-core 0.11.0 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/metadata.js CHANGED
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.METADATA = void 0;
5
5
  exports.METADATA = {
6
6
  "name": "@openai/agents-core",
7
- "version": "0.11.0",
7
+ "version": "0.11.1",
8
8
  "versions": {
9
- "@openai/agents-core": "0.11.0",
9
+ "@openai/agents-core": "0.11.1",
10
10
  "openai": "^6.35.0"
11
11
  }
12
12
  };
package/dist/metadata.mjs CHANGED
@@ -1,9 +1,9 @@
1
1
  // This file is automatically generated
2
2
  export const METADATA = {
3
3
  "name": "@openai/agents-core",
4
- "version": "0.11.0",
4
+ "version": "0.11.1",
5
5
  "versions": {
6
- "@openai/agents-core": "0.11.0",
6
+ "@openai/agents-core": "0.11.1",
7
7
  "openai": "^6.35.0"
8
8
  }
9
9
  };
@@ -68,8 +68,8 @@ function mergeManifestDelta(base, update) {
68
68
  ...structuredClone(update.entries),
69
69
  },
70
70
  environment: {
71
- ...(0, environment_1.serializeManifestEnvironment)(base),
72
- ...(0, environment_1.serializeManifestEnvironment)(update),
71
+ ...cloneManifestEnvironment(base),
72
+ ...cloneManifestEnvironment(update),
73
73
  },
74
74
  users: (0, manifestCollections_1.mergeNamedObjects)(base.users, update.users),
75
75
  groups: (0, manifestCollections_1.mergeNamedObjects)(base.groups, update.groups),
@@ -79,6 +79,12 @@ function mergeManifestDelta(base, update) {
79
79
  : base.remoteMountCommandAllowlist,
80
80
  });
81
81
  }
82
+ function cloneManifestEnvironment(manifest) {
83
+ return Object.fromEntries(Object.entries(manifest.environment).map(([key, value]) => [
84
+ key,
85
+ value.init(),
86
+ ]));
87
+ }
82
88
  function mergeManifestEntryDelta(base, path, entry) {
83
89
  return mergeManifestDelta(base, new manifest_1.Manifest({
84
90
  root: base.root,
@@ -1 +1 @@
1
- {"version":3,"file":"manifestPersistence.js","sourceRoot":"","sources":["../../../../src/sandbox/sandboxes/shared/manifestPersistence.ts"],"names":[],"mappings":";;AAkBA,8CAEC;AAED,0DAaC;AAED,kDAIC;AAED,8EAOC;AAED,gFA6BC;AAED,gDAsBC;AAED,0DAcC;AAzHD,oDAAoD;AACpD,gDAA0C;AAC1C,6EAG0C;AAC1C,6FAAgG;AAChG,6DAGkC;AAClC,qDAAiE;AAOjE,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,OAAO,mBAAmB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAgB,uBAAuB,CACrC,QAAkB;IAElB,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO,EAAE,6BAA6B,CAAC,QAAQ,CAAC,OAAO,CAAC;QACxD,WAAW,EAAE,sCAAsC,CAAC,QAAQ,CAAC;QAC7D,KAAK,EAAE,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC1D,2BAA2B,EAAE,CAAC,GAAG,QAAQ,CAAC,2BAA2B,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CACjC,KAA0C;IAE1C,OAAO,IAAI,mBAAQ,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,iCAAiC,CAC/C,KAA+B;IAE/B,MAAM,WAAW,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,SAAgB,kCAAkC,CAChD,KAA+B;IAE/B,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;IACnD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,UAAU,GAAkC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,GAAG;YAChB,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK;SAC9C,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9D,IAAI,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChE,SAAS;QACX,CAAC;QACD,oFAAoF;QACpF,iEAAiE;QACjE,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAc,EAAE,MAAgB;IACjE,OAAO,IAAI,mBAAQ,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;QACvC,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;SACnC;QACD,WAAW,EAAE;YACX,GAAG,IAAA,0CAA4B,EAAC,IAAI,CAAC;YACrC,GAAG,IAAA,0CAA4B,EAAC,MAAM,CAAC;SACxC;QACD,KAAK,EAAE,IAAA,uCAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QAClD,MAAM,EAAE,IAAA,uCAAiB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACrD,eAAe,EAAE,IAAA,2CAAqB,EACpC,IAAI,CAAC,eAAe,EACpB,MAAM,CAAC,eAAe,CACvB;QACD,2BAA2B,EAAE,sCAAsC,CAAC,MAAM,CAAC;YACzE,CAAC,CAAC,MAAM,CAAC,2BAA2B;YACpC,CAAC,CAAC,IAAI,CAAC,2BAA2B;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CACrC,IAAc,EACd,IAAY,EACZ,KAAY;IAEZ,OAAO,kBAAkB,CACvB,IAAI,EACJ,IAAI,mBAAQ,CAAC;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC;SAC/B;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,QAAkB;IAElB,MAAM,WAAW,GAAG,IAAA,0CAA4B,EAAC,QAAQ,CAAC,CAAC;IAC3D,6DAA6D;IAC7D,oDAAoD;IACpD,gDAAgD;IAChD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAChC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,CACjD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAAC,MAAgB;IAC9D,OAAO,IAAA,kEAAoC,EACzC,MAAM,CAAC,2BAA2B,CACnC,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,OAA8B,EAC9B,iBAAiB,GAAG,KAAK;IAEzB,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,MAAM,cAAc,GAAG,2BAA2B,CAChD,KAAK,EACL,iBAAiB,CAClB,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,2BAA2B,CAClC,KAAY,EACZ,iBAA0B;IAE1B,MAAM,kBAAkB,GAAG,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAC,kBAAkB;YACxB,CAAC,CAAE;gBACC,GAAG,KAAK;gBACR,OAAO,EAAE,kCAAkC,CAAC,KAAK,CAAC,OAAO,CAAC;aACtC;YACxB,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,CAAC,kBAAkB,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAG,6BAA6B,CAC5C,KAAK,CAAC,QAAQ,EACd,kBAAkB,CACnB,CAAC;IACF,IAAI,kBAAkB,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAChC,KAA8B;IAE9B,OAAO;QACL,GAAG,KAAK;QACR,OAAO,EAAE,4BAA4B,CACnC,KAAK,CAAC,OAA4C,CACnD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,OAA0C;IAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI;QACJ,0BAA0B,CAAC,KAAK,CAAC;KAClC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAY;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAI,KAA+B,CAAC,OAAO,CAAC;QACzD,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC;gBACvC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,OAAO;SAClB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE,4BAA4B,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvD,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;AACtB,CAAC;AAOD,SAAS,kCAAkC,CACzC,OAA4B;IAE5B,OAAO,OAAO,OAAO,KAAK,QAAQ;QAChC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,iCAAwB,EAAC,OAAO,CAAC;SACxC,CAAC;AACR,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAc;IAEd,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACb,KAA4B,CAAC,IAAI,KAAK,QAAQ;QAC/C,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC7C,MAAM,UAAU,GACd,UAGD,CAAC,MAAM,CAAC;IACT,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"manifestPersistence.js","sourceRoot":"","sources":["../../../../src/sandbox/sandboxes/shared/manifestPersistence.ts"],"names":[],"mappings":";;AAkBA,8CAEC;AAED,0DAaC;AAED,kDAIC;AAED,8EAOC;AAED,gFA6BC;AAED,gDAsBC;AAaD,0DAcC;AApID,oDAAoD;AACpD,gDAAyD;AACzD,6EAG0C;AAC1C,6FAAgG;AAChG,6DAGkC;AAClC,qDAAiE;AAOjE,SAAgB,iBAAiB,CAAC,QAAkB;IAClD,OAAO,mBAAmB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAgB,uBAAuB,CACrC,QAAkB;IAElB,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO,EAAE,6BAA6B,CAAC,QAAQ,CAAC,OAAO,CAAC;QACxD,WAAW,EAAE,sCAAsC,CAAC,QAAQ,CAAC;QAC7D,KAAK,EAAE,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC1D,2BAA2B,EAAE,CAAC,GAAG,QAAQ,CAAC,2BAA2B,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CACjC,KAA0C;IAE1C,OAAO,IAAI,mBAAQ,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,iCAAiC,CAC/C,KAA+B;IAE/B,MAAM,WAAW,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,SAAgB,kCAAkC,CAChD,KAA+B;IAE/B,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;IACnD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,UAAU,GAAkC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,GAAG;YAChB,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK;SAC9C,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9D,IAAI,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChE,SAAS;QACX,CAAC;QACD,oFAAoF;QACpF,iEAAiE;QACjE,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAc,EAAE,MAAgB;IACjE,OAAO,IAAI,mBAAQ,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;QACvC,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;SACnC;QACD,WAAW,EAAE;YACX,GAAG,wBAAwB,CAAC,IAAI,CAAC;YACjC,GAAG,wBAAwB,CAAC,MAAM,CAAC;SACpC;QACD,KAAK,EAAE,IAAA,uCAAiB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QAClD,MAAM,EAAE,IAAA,uCAAiB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACrD,eAAe,EAAE,IAAA,2CAAqB,EACpC,IAAI,CAAC,eAAe,EACpB,MAAM,CAAC,eAAe,CACvB;QACD,2BAA2B,EAAE,sCAAsC,CAAC,MAAM,CAAC;YACzE,CAAC,CAAC,MAAM,CAAC,2BAA2B;YACpC,CAAC,CAAC,IAAI,CAAC,2BAA2B;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAC/B,QAAkB;IAElB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACzD,GAAG;QACH,KAAK,CAAC,IAAI,EAAE;KACb,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CACrC,IAAc,EACd,IAAY,EACZ,KAAY;IAEZ,OAAO,kBAAkB,CACvB,IAAI,EACJ,IAAI,mBAAQ,CAAC;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC;SAC/B;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,QAAkB;IAElB,MAAM,WAAW,GAAG,IAAA,0CAA4B,EAAC,QAAQ,CAAC,CAAC;IAC3D,6DAA6D;IAC7D,oDAAoD;IACpD,gDAAgD;IAChD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAChC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,CACjD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAAC,MAAgB;IAC9D,OAAO,IAAA,kEAAoC,EACzC,MAAM,CAAC,2BAA2B,CACnC,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,OAA8B,EAC9B,iBAAiB,GAAG,KAAK;IAEzB,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,MAAM,cAAc,GAAG,2BAA2B,CAChD,KAAK,EACL,iBAAiB,CAClB,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,2BAA2B,CAClC,KAAY,EACZ,iBAA0B;IAE1B,MAAM,kBAAkB,GAAG,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAC,kBAAkB;YACxB,CAAC,CAAE;gBACC,GAAG,KAAK;gBACR,OAAO,EAAE,kCAAkC,CAAC,KAAK,CAAC,OAAO,CAAC;aACtC;YACxB,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,CAAC,kBAAkB,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAG,6BAA6B,CAC5C,KAAK,CAAC,QAAQ,EACd,kBAAkB,CACnB,CAAC;IACF,IAAI,kBAAkB,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAChC,KAA8B;IAE9B,OAAO;QACL,GAAG,KAAK;QACR,OAAO,EAAE,4BAA4B,CACnC,KAAK,CAAC,OAA4C,CACnD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,OAA0C;IAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI;QACJ,0BAA0B,CAAC,KAAK,CAAC;KAClC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAY;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAI,KAA+B,CAAC,OAAO,CAAC;QACzD,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC;gBACvC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,OAAO;SAClB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE,4BAA4B,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvD,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;AACtB,CAAC;AAOD,SAAS,kCAAkC,CACzC,OAA4B;IAE5B,OAAO,OAAO,OAAO,KAAK,QAAQ;QAChC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAA,iCAAwB,EAAC,OAAO,CAAC;SACxC,CAAC;AACR,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAc;IAEd,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACb,KAA4B,CAAC,IAAI,KAAK,QAAQ;QAC/C,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC7C,MAAM,UAAU,GACd,UAGD,CAAC,MAAM,CAAC;IACT,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -59,8 +59,8 @@ export function mergeManifestDelta(base, update) {
59
59
  ...structuredClone(update.entries),
60
60
  },
61
61
  environment: {
62
- ...serializeManifestEnvironment(base),
63
- ...serializeManifestEnvironment(update),
62
+ ...cloneManifestEnvironment(base),
63
+ ...cloneManifestEnvironment(update),
64
64
  },
65
65
  users: mergeNamedObjects(base.users, update.users),
66
66
  groups: mergeNamedObjects(base.groups, update.groups),
@@ -70,6 +70,12 @@ export function mergeManifestDelta(base, update) {
70
70
  : base.remoteMountCommandAllowlist,
71
71
  });
72
72
  }
73
+ function cloneManifestEnvironment(manifest) {
74
+ return Object.fromEntries(Object.entries(manifest.environment).map(([key, value]) => [
75
+ key,
76
+ value.init(),
77
+ ]));
78
+ }
73
79
  export function mergeManifestEntryDelta(base, path, entry) {
74
80
  return mergeManifestDelta(base, new Manifest({
75
81
  root: base.root,
@@ -1 +1 @@
1
- {"version":3,"file":"manifestPersistence.mjs","sourceRoot":"","sources":["../../../../src/sandbox/sandboxes/shared/manifestPersistence.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manifestPersistence.mjs","sourceRoot":"","sources":["../../../../src/sandbox/sandboxes/shared/manifestPersistence.ts"],"names":[],"mappings":"OAAO,EAAE,OAAO,EAAc;OACvB,EAAE,QAAQ,EAAiB;OAC3B,EACL,iBAAiB,EACjB,qBAAqB,GACtB;OACM,EAAE,oCAAoC,EAAE;OACxC,EACL,4BAA4B,GAE7B;OACM,EAAE,wBAAwB,EAAE;AAOnC,MAAM,UAAU,iBAAiB,CAAC,QAAkB;IAClD,OAAO,mBAAmB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAAkB;IAElB,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,OAAO,EAAE,6BAA6B,CAAC,QAAQ,CAAC,OAAO,CAAC;QACxD,WAAW,EAAE,sCAAsC,CAAC,QAAQ,CAAC;QAC7D,KAAK,EAAE,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC1D,2BAA2B,EAAE,CAAC,GAAG,QAAQ,CAAC,2BAA2B,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAA0C;IAE1C,OAAO,IAAI,QAAQ,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,KAA+B;IAE/B,MAAM,WAAW,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CACtE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,KAA+B;IAE/B,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;IACnD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,MAAM,UAAU,GAAkC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,GAAG;YAChB,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK;SAC9C,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC9D,IAAI,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChE,SAAS;QACX,CAAC;QACD,oFAAoF;QACpF,iEAAiE;QACjE,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAc,EAAE,MAAgB;IACjE,OAAO,IAAI,QAAQ,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;QACvC,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC;SACnC;QACD,WAAW,EAAE;YACX,GAAG,wBAAwB,CAAC,IAAI,CAAC;YACjC,GAAG,wBAAwB,CAAC,MAAM,CAAC;SACpC;QACD,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QAClD,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACrD,eAAe,EAAE,qBAAqB,CACpC,IAAI,CAAC,eAAe,EACpB,MAAM,CAAC,eAAe,CACvB;QACD,2BAA2B,EAAE,sCAAsC,CAAC,MAAM,CAAC;YACzE,CAAC,CAAC,MAAM,CAAC,2BAA2B;YACpC,CAAC,CAAC,IAAI,CAAC,2BAA2B;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAC/B,QAAkB;IAElB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACzD,GAAG;QACH,KAAK,CAAC,IAAI,EAAE;KACb,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,IAAc,EACd,IAAY,EACZ,KAAY;IAEZ,OAAO,kBAAkB,CACvB,IAAI,EACJ,IAAI,QAAQ,CAAC;QACX,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE;YACP,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC;SAC/B;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,QAAkB;IAElB,MAAM,WAAW,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IAC3D,6DAA6D;IAC7D,oDAAoD;IACpD,gDAAgD;IAChD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAChC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,CACjD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAAC,MAAgB;IAC9D,OAAO,oCAAoC,CACzC,MAAM,CAAC,2BAA2B,CACnC,CAAC;AACJ,CAAC;AAED,SAAS,6BAA6B,CACpC,OAA8B,EAC9B,iBAAiB,GAAG,KAAK;IAEzB,MAAM,gBAAgB,GAA0B,EAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,MAAM,cAAc,GAAG,2BAA2B,CAChD,KAAK,EACL,iBAAiB,CAClB,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,2BAA2B,CAClC,KAAY,EACZ,iBAA0B;IAE1B,MAAM,kBAAkB,GAAG,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO,CAAC,kBAAkB;YACxB,CAAC,CAAE;gBACC,GAAG,KAAK;gBACR,OAAO,EAAE,kCAAkC,CAAC,KAAK,CAAC,OAAO,CAAC;aACtC;YACxB,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAG,6BAA6B,CAC5C,KAAK,CAAC,QAAQ,EACd,kBAAkB,CACnB,CAAC;IACF,IAAI,kBAAkB,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAChC,KAA8B;IAE9B,OAAO;QACL,GAAG,KAAK;QACR,OAAO,EAAE,4BAA4B,CACnC,KAAK,CAAC,OAA4C,CACnD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,OAA0C;IAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI;QACJ,0BAA0B,CAAC,KAAK,CAAC;KAClC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAY;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAI,KAA+B,CAAC,OAAO,CAAC;QACzD,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC;gBACvC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,OAAO;SAClB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,OAAO;YACL,GAAG,KAAK;YACR,QAAQ,EAAE,4BAA4B,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvD,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;AACtB,CAAC;AAOD,SAAS,kCAAkC,CACzC,OAA4B;IAE5B,OAAO,OAAO,OAAO,KAAK,QAAQ;QAChC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC;SACxC,CAAC;AACR,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAc;IAEd,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACb,KAA4B,CAAC,IAAI,KAAK,QAAQ;QAC/C,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC7C,MAAM,UAAU,GACd,UAGD,CAAC,MAAM,CAAC;IACT,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.WorkspacePathPolicy = void 0;
4
4
  const errors_1 = require("../errors.js");
5
+ const errors_2 = require("./errors.js");
5
6
  const pathGrants_1 = require("./pathGrants.js");
6
7
  const posixPath_1 = require("./shared/posixPath.js");
7
8
  class WorkspacePathPolicy {
@@ -48,7 +49,7 @@ class WorkspacePathPolicy {
48
49
  grant,
49
50
  };
50
51
  }
51
- throw new errors_1.UserError(`Sandbox path "${originalPath}" escapes the workspace root.`);
52
+ throw new errors_2.SandboxInvalidManifestPathError(`Sandbox path "${originalPath}" escapes the workspace root.`);
52
53
  }
53
54
  matchingGrant(path) {
54
55
  return this.extraPathGrants.find((grant) => (0, posixPath_1.isUnderPosixPath)(path, grant.path));
@@ -66,7 +67,7 @@ function normalizeSandboxPath(path, originalPath) {
66
67
  throw new errors_1.UserError(`Sandbox path "${originalPath}" must use "/" separators.`);
67
68
  }
68
69
  if ((0, posixPath_1.hasEscapingParentPathSegment)(path)) {
69
- throw new errors_1.UserError(`Sandbox path "${originalPath}" must not escape root.`);
70
+ throw new errors_2.SandboxInvalidManifestPathError(`Sandbox path "${originalPath}" must not escape root.`);
70
71
  }
71
72
  return (0, posixPath_1.normalizePosixPath)(path);
72
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"workspacePaths.js","sourceRoot":"","sources":["../../src/sandbox/workspacePaths.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspacePaths.js","sourceRoot":"","sources":["../../src/sandbox/workspacePaths.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,wCAA2D;AAC3D,gDAIsB;AACtB,qDAO4B;AAiB5B,MAAa,mBAAmB;IACrB,IAAI,CAAS;IACb,eAAe,CAAqB;IAE7C,YAAY,OAAmC;QAC7C,IAAI,IAAA,gCAAoB,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,kBAAS,CACjB,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QACD,IAAI,IAAA,qCAAyB,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,kBAAS,CACjB,iBAAiB,OAAO,CAAC,IAAI,4BAA4B,CAC1D,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,IAAA,8BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,kBAAS,CAAC,0CAA0C,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,eAAe,GAAG,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC;aACnD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,+BAAkB,EAAC,KAAK,CAAC,CAAC;aACzC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,CACL,IAAa,EACb,UAAqC,EAAE;QAEvC,MAAM,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,cAAc,GAClB,OAAO,CAAC,MAAM,KAAK,CAAC;YAClB,CAAC,CAAC,IAAI,CAAC,IAAI;YACX,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBACvB,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC;gBAC7C,CAAC,CAAC,aAAa,CACX,IAAI,CAAC,IAAI,EACT,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAC5C,CAAC;QAEV,MAAM,qBAAqB,GAAG,IAAA,uCAA2B,EACvD,IAAI,CAAC,IAAI,EACT,cAAc,CACf,CAAC;QACF,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;YACnC,OAAO;gBACL,IAAI,EAAE,cAAc;gBACpB,qBAAqB;aACtB,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,IAAI,kBAAS,CACjB,iBAAiB,YAAY,sCAAsC,KAAK,CAAC,IAAI,IAAI,CAClF,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,cAAc;gBACpB,KAAK;aACN,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,wCAA+B,CACvC,iBAAiB,YAAY,+BAA+B,CAC7D,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACzC,IAAA,4BAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CACnC,CAAC;IACJ,CAAC;CACF;AA3ED,kDA2EC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,YAAoB;IACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,IAAA,8BAAkB,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY,EAAE,YAAoB;IAC9D,IAAI,IAAA,qCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,kBAAS,CACjB,iBAAiB,YAAY,4BAA4B,CAC1D,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,wCAA4B,EAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,wCAA+B,CACvC,iBAAiB,YAAY,yBAAyB,CACvD,CAAC;IACJ,CAAC;IACD,OAAO,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;AAClC,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { UserError } from "../errors.mjs";
2
+ import { SandboxInvalidManifestPathError } from "./errors.mjs";
2
3
  import { normalizePathGrant, } from "./pathGrants.mjs";
3
4
  import { hasBackslashPathSeparator, hasEscapingParentPathSegment, hasParentPathSegment, isUnderPosixPath, normalizePosixPath, relativePosixPathWithinRoot, } from "./shared/posixPath.mjs";
4
5
  export class WorkspacePathPolicy {
@@ -45,7 +46,7 @@ export class WorkspacePathPolicy {
45
46
  grant,
46
47
  };
47
48
  }
48
- throw new UserError(`Sandbox path "${originalPath}" escapes the workspace root.`);
49
+ throw new SandboxInvalidManifestPathError(`Sandbox path "${originalPath}" escapes the workspace root.`);
49
50
  }
50
51
  matchingGrant(path) {
51
52
  return this.extraPathGrants.find((grant) => isUnderPosixPath(path, grant.path));
@@ -62,7 +63,7 @@ function normalizeSandboxPath(path, originalPath) {
62
63
  throw new UserError(`Sandbox path "${originalPath}" must use "/" separators.`);
63
64
  }
64
65
  if (hasEscapingParentPathSegment(path)) {
65
- throw new UserError(`Sandbox path "${originalPath}" must not escape root.`);
66
+ throw new SandboxInvalidManifestPathError(`Sandbox path "${originalPath}" must not escape root.`);
66
67
  }
67
68
  return normalizePosixPath(path);
68
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"workspacePaths.mjs","sourceRoot":"","sources":["../../src/sandbox/workspacePaths.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspacePaths.mjs","sourceRoot":"","sources":["../../src/sandbox/workspacePaths.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@openai/agents-core",
3
3
  "repository": "https://github.com/openai/openai-agents-js",
4
4
  "homepage": "https://openai.github.io/openai-agents-js/",
5
- "version": "0.11.0",
5
+ "version": "0.11.1",
6
6
  "description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
7
7
  "author": "OpenAI <support@openai.com>",
8
8
  "main": "dist/index.js",