@git.zone/tsagent 1.1.0 → 1.1.1

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@git.zone/tsagent',
-    version: '1.1.0',
+    version: '1.1.1',
     description: 'Shared AI agent runtime, authentication, and CLI for git.zone TypeScript tooling.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxtQkFBbUI7SUFDekIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLG1GQUFtRjtDQUNqRyxDQUFBIn0=

package/dist_ts/classes.tsagent.js

@@ -84,6 +84,15 @@ const parseJsonResult = (textArg) => {
         .match(/\{[\s\S]*\}|\[[\s\S]*\]/)?.[0] ?? textArg;
     return JSON.parse(jsonString);
 };
+const removeUndefinedConfigValues = (configArg) => {
+    const result = {};
+    for (const [key, value] of Object.entries(configArg ?? {})) {
+        if (value !== undefined) {
+            result[key] = value;
+        }
+    }
+    return result;
+};
 export class TsAgent {
     argvArg;
     projectDir;
@@ -189,8 +198,8 @@ export class TsAgent {
         };
         const mergedConfig = {
             ...projectConfig,
-            ...this.configOverride,
-            ...argvConfig,
+            ...removeUndefinedConfigValues(this.configOverride),
+            ...removeUndefinedConfigValues(argvConfig),
         };
         const provider = argvConfig.provider ?? envProvider ?? normalizeProvider(mergedConfig.provider) ?? defaultTsAgentConfig.provider;
         const model = argvConfig.model ?? envModel ?? mergedConfig.model ?? defaultTsAgentConfig.model;
@@ -343,4 +352,4 @@ export const loginChatGptAuth = async () => {
     console.log(`Stored OpenAI ChatGPT auth at ${authFilePath}`);
     return tokenData;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsagent.js","sourceRoot":"","sources":["../ts/classes.tsagent.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsagent.js","sourceRoot":"","sources":["../ts/classes.tsagent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAiDhE,MAAM,CAAC,MAAM,oBAAoB,GAA2B;IAC1D,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,MAAM;IAChB,kBAAkB,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC;IACpD,oBAAoB,EAAE;QACpB,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,KAAK;KACb;IACD,eAAe,EAAE;QACf,MAAM,EAAE;YACN,eAAe,EAAE,OAAO;SACzB;KACF;IACD,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,oBAAoB,CAAC,kBAAkB,CAAC;AAEjF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAgC,EAAE;IACrE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,IAA8C,EAC9C,QAAkD,EACG,EAAE;IACvD,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,MAAM,GAAwB,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;IACxD,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,CAAC,QAAQ,CAAC,GAAG;YACjB,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3C,CAAC;IACJ,CAAC;IACD,OAAO,MAAiD,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAgC,EAAE;IACzE,OAAO,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAyC,EAAE;IAClF,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChH,CAAC,CAAC,KAAkC;QACpC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAA2E,EAAE;IAC1H,MAAM,KAAK,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAChG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAuE,EAAE;QAC3G,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,SAAS,CAAC;IAC7E,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CAAC,KAAc,EAAsD,EAAE;IAC5G,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClF,CAAC,CAAC,KAA+C;QACjD,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,aAAqB,EAAE,OAAiB,EAA2B,EAAE;IACpG,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;IAC9E,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC/D,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,MAAM,GAAwB,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClF,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACjC,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QACD,OAAO,MAAwB,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA2B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAI,OAAe,EAAK,EAAE;IAChD,MAAM,UAAU,GAAG,OAAO;SACvB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;IACpD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAM,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,SAA0B,EAAkB,EAAE;IACjF,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAwB,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,OAAO,OAAO;IACD,OAAO,CAAM;IACb,UAAU,CAAS;IACnB,iBAAiB,CAAW;IAC5B,0BAA0B,CAAW;IACrC,cAAc,CAAkB;IACzC,WAAW,GAAG,EAAE,CAAC;IACjB,UAAU,CAA+D;IACzE,iBAAiB,GAAuE,EAAE,CAAC;IAC3F,YAAY,CAAqB;IACjC,QAAQ,CAAuC;IAEhD,KAAK,CAAmC;IACxC,eAAe,CAA2C;IAC1D,MAAM,GAA2B,oBAAoB,CAAC;IACtD,kBAAkB,GAAG,MAAM,CAAC;IAEnC,YAAY,aAA8B,EAAE;QAC1C,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC/E,IAAI,CAAC,0BAA0B,GAAG,UAAU,CAAC,0BAA0B,IAAI,EAAE,CAAC;QAC9E,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;IAC1C,CAAC;IAED,IAAY,aAAa;QACvB,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;IACnH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,QAAqE;QACpG,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrD,OAAO,KAAK,IAAI,SAAS,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7D,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,WAAsC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC,OAAO,EAAE,cAAc,IAAI,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;QACrG,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAElD,MAAM,QAAQ,GAAG,WAAW,KAAK,QAAQ;YACvC,CAAC,CAAC,CAAC,cAAc,EAAE,gBAAgB,CAAC;YACpC,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QAED,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,qGAAqG,CAAC,CAAC;QACzH,CAAC;QACD,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACnD,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,kFAAkF;YAC3F,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;QACjC,MAAM,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;QACvH,CAAC;QACD,OAAO,MAAM,gBAAgB,EAAE,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvF,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACxG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC/E,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACtG,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC7H,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,CAAC,CAAC;QACxI,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,CAAC,CAAC;YAC9C,MAAM,EAAE,EAAE,eAAe,EAAE,kBAAkB,EAAE;SACL,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,MAAM,UAAU,GAAmB;YACjC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;YACnD,KAAK,EAAE,OAAO,IAAI,CAAC,OAAO,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAC/E,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;YACnD,kBAAkB,EAAE,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;SAC9E,CAAC;QACF,MAAM,YAAY,GAAmB;YACnC,GAAG,aAAa;YAChB,GAAG,2BAA2B,CAAC,IAAI,CAAC,cAAc,CAAC;YACnD,GAAG,2BAA2B,CAAC,UAAU,CAAC;SAC3C,CAAC;QACF,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,WAAW,IAAI,iBAAiB,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,oBAAoB,CAAC,QAAQ,CAAC;QACjI,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,QAAQ,IAAI,YAAY,CAAC,KAAK,IAAI,oBAAoB,CAAC,KAAK,CAAC;QAC/F,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,WAAW,IAAI,iBAAiB,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,oBAAoB,CAAC,QAAQ,CAAC;QACjI,MAAM,kBAAkB,GAAG,UAAU,CAAC,kBAAkB;eACnD,iBAAiB;eACjB,uBAAuB,CAAC,YAAY,CAAC,kBAAkB,CAAC;eACxD,oBAAoB,CAAC,kBAAkB,CAAC;QAC7C,MAAM,eAAe,GAAG,oBAAoB,CAC1C,oBAAoB,CAAC,oBAAoB,CAAC,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC,EACxF,kBAAkB,CACnB,CAAC;QACF,OAAO;YACL,GAAG,oBAAoB;YACvB,GAAG,YAAY;YACf,QAAQ;YACR,KAAK;YACL,QAAQ;YACR,kBAAkB;YAClB,oBAAoB,EAAE;gBACpB,GAAG,oBAAoB,CAAC,oBAAoB;gBAC5C,GAAG,CAAC,YAAY,CAAC,oBAAoB,IAAI,EAAE,CAAC;aAC7C;YACD,eAAe;YACf,KAAK,EAAE,YAAY,CAAC,KAAK,IAAI,oBAAoB,CAAC,KAAK;SACxD,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC;YACtD,OAAO,EAAE,aAAa;YACtB,WAAW,EAAE,mBAAmB;YAChC,aAAa,EAAE,CAAC,cAAc,CAAC;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC;YAChH,OAAO,EAAE,aAAa;YACtB,WAAW;YACX,aAAa,EAAE,CAAC,cAAc,CAAC;SAChC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAEzC,IAAI,iBAAsE,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC3E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,wBAAwB,CAAC,wBAAwB,CAAC;gBACnF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;gBACvC,OAAO,EAAE,UAAU;gBACnB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;aAC5C,CAAC,CAAC;YACH,IAAI,YAAY,EAAE,CAAC;gBACjB,iBAAiB,GAAG,YAAY,CAAC,SAAS,CAAC;gBAC3C,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC;YAChD,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC9C,iBAAiB,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBACvD,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,MAA0B,CAAC;QAC/B,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC1G,iBAAiB,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBACvD,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;YACtC,CAAC;YACD,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC7G,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC7C,CAAC;YACD,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;gBACnC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACtC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;YAC1C,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,MAAM;YACN,iBAAiB;YACjB,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;YAC5C,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YACxC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,IAAI,KAAmB,CAAC;IAE9B,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,aAAa,GAAG,IAAI,CAAC,UAAU;QACrE,OAAO,MAAM,0BAA0B,CAAC,aAAa,CAAC,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,OAIrB;QACC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,kBAAkB,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM;YACjH,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzC,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE;aACzC,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC/C,GAAG,OAAO;YACV,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,eAAe;YACf,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,WAAW,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACzG,iBAAiB,EAAE,OAAO,CAAC,aAAa;gBACtC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;gBACxF,CAAC,CAAC,OAAO,CAAC,iBAAiB;SAC9B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAc,UAAkC;QACtE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC/F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YACjC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,IAAI,yBAAyB,wEAAwE;YACjI,KAAK;YACL,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,EAAE;YACnC,oBAAoB,EAAE,CAAC;YACvB,aAAa,EAAE,UAAU,CAAC,aAAa,IAAI,IAAI;YAC/C,kBAAkB,EAAE,CAAC,SAAS,EAAE,EAAE;gBAChC,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,eAAe,CAAI,SAAS,CAAC,IAAI,CAAC,CAAC;oBAClD,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;gBACvC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,kCAAkC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpG,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,eAAe,CAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,UAAU,GAAG,yBAAyB,EAAE,EAAE;IACxF,OAAO,MAAM,OAAO,CAAC,wBAAwB,CAAC,+BAA+B,CAAC;QAC5E,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAsD,EAAE;IAC3F,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,8BAA8B,EAAE,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,QAAQ,UAAU,CAAC,eAAe,mBAAmB,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,UAAU,CAAC,CAAC;IACzF,MAAM,YAAY,GAAG,OAAO,CAAC,wBAAwB,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC;IACjG,MAAM,OAAO,CAAC,wBAAwB,CAAC,0BAA0B,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtG,OAAO,CAAC,GAAG,CAAC,iCAAiC,YAAY,EAAE,CAAC,CAAC;IAC7D,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@git.zone/tsagent",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": false,
   "description": "Shared AI agent runtime, authentication, and CLI for git.zone TypeScript tooling.",
   "main": "dist_ts/index.js",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/tsagent',
-  version: '1.1.0',
+  version: '1.1.1',
   description: 'Shared AI agent runtime, authentication, and CLI for git.zone TypeScript tooling.'
 }

package/ts/classes.tsagent.ts

@@ -142,6 +142,16 @@ const parseJsonResult = <T>(textArg: string): T => {
   return JSON.parse(jsonString) as T;
 };
 
+const removeUndefinedConfigValues = (configArg?: ITsAgentConfig): ITsAgentConfig => {
+  const result: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(configArg ?? {})) {
+    if (value !== undefined) {
+      result[key] = value;
+    }
+  }
+  return result as ITsAgentConfig;
+};
+
 export class TsAgent {
   private readonly argvArg: any;
   private readonly projectDir: string;
@@ -252,8 +262,8 @@ export class TsAgent {
     };
     const mergedConfig: ITsAgentConfig = {
       ...projectConfig,
-      ...this.configOverride,
-      ...argvConfig,
+      ...removeUndefinedConfigValues(this.configOverride),
+      ...removeUndefinedConfigValues(argvConfig),
     };
     const provider = argvConfig.provider ?? envProvider ?? normalizeProvider(mergedConfig.provider) ?? defaultTsAgentConfig.provider;
     const model = argvConfig.model ?? envModel ?? mergedConfig.model ?? defaultTsAgentConfig.model;