staklink 0.4.21 → 0.4.22
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/proxy-server.cjs +64 -9
- package/dist/staklink-cli.cjs +1 -1
- package/package.json +1 -1
package/dist/proxy-server.cjs
CHANGED
|
@@ -60927,7 +60927,7 @@ var SSEManager = class {
|
|
|
60927
60927
|
var sseManager = new SSEManager();
|
|
60928
60928
|
|
|
60929
60929
|
// src/proxy/version.ts
|
|
60930
|
-
var VERSION = "0.4.
|
|
60930
|
+
var VERSION = "0.4.22";
|
|
60931
60931
|
|
|
60932
60932
|
// node_modules/uuid/dist/esm/stringify.js
|
|
60933
60933
|
var byteToHex = [];
|
|
@@ -137648,6 +137648,27 @@ function goose_env(apiKey, model = "sonnet") {
|
|
|
137648
137648
|
PATH: `${path7.join(os.homedir(), ".local", "bin")}:${process.env.PATH}`
|
|
137649
137649
|
};
|
|
137650
137650
|
}
|
|
137651
|
+
async function extractSessionUsage(session) {
|
|
137652
|
+
try {
|
|
137653
|
+
const safeName = session.replaceAll(" ", "_");
|
|
137654
|
+
const res = await executeCommand(
|
|
137655
|
+
`goose session export --name ${safeName} --format json`,
|
|
137656
|
+
process.cwd(),
|
|
137657
|
+
{}
|
|
137658
|
+
);
|
|
137659
|
+
const data = JSON.parse(res.stdout);
|
|
137660
|
+
if (typeof data.input_tokens === "number" && typeof data.output_tokens === "number") {
|
|
137661
|
+
return {
|
|
137662
|
+
inputTokens: data.input_tokens,
|
|
137663
|
+
outputTokens: data.output_tokens,
|
|
137664
|
+
totalTokens: data.total_tokens ?? data.input_tokens + data.output_tokens
|
|
137665
|
+
};
|
|
137666
|
+
}
|
|
137667
|
+
return void 0;
|
|
137668
|
+
} catch {
|
|
137669
|
+
return void 0;
|
|
137670
|
+
}
|
|
137671
|
+
}
|
|
137651
137672
|
async function runAgent({
|
|
137652
137673
|
prompt,
|
|
137653
137674
|
apiKey,
|
|
@@ -137694,12 +137715,26 @@ ${prompt}` : prompt;
|
|
|
137694
137715
|
}
|
|
137695
137716
|
}
|
|
137696
137717
|
const output = res.stdout;
|
|
137718
|
+
const resolvedModel = getGooseModel(model || "sonnet");
|
|
137719
|
+
const provider = resolvedModel.includes("/") ? resolvedModel.split("/")[0] : "unknown";
|
|
137720
|
+
const usage = session ? await extractSessionUsage(session) : void 0;
|
|
137697
137721
|
if (summarize && session) {
|
|
137698
137722
|
const sessionData = exportSession(session, "assistant");
|
|
137699
137723
|
const summary = await summarizeSession(sessionData, summaryApiKey || apiKey);
|
|
137700
|
-
return {
|
|
137724
|
+
return {
|
|
137725
|
+
output,
|
|
137726
|
+
summary,
|
|
137727
|
+
model: resolvedModel,
|
|
137728
|
+
provider,
|
|
137729
|
+
...usage && { usage }
|
|
137730
|
+
};
|
|
137701
137731
|
}
|
|
137702
|
-
return
|
|
137732
|
+
return {
|
|
137733
|
+
output,
|
|
137734
|
+
model: resolvedModel,
|
|
137735
|
+
provider,
|
|
137736
|
+
...usage && { usage }
|
|
137737
|
+
};
|
|
137703
137738
|
}
|
|
137704
137739
|
function createGooseConfig(exaApiKey, mcpServers) {
|
|
137705
137740
|
const configDir = path7.join(os.homedir(), ".config", "goose");
|
|
@@ -137817,7 +137852,18 @@ async function runAgent2({
|
|
|
137817
137852
|
cwd,
|
|
137818
137853
|
executablePath: findClaudePath()
|
|
137819
137854
|
});
|
|
137820
|
-
return
|
|
137855
|
+
return {
|
|
137856
|
+
output: res.text,
|
|
137857
|
+
model: "claude_code",
|
|
137858
|
+
provider: "anthropic",
|
|
137859
|
+
...res.usage && {
|
|
137860
|
+
usage: {
|
|
137861
|
+
inputTokens: res.usage.inputTokens,
|
|
137862
|
+
outputTokens: res.usage.outputTokens,
|
|
137863
|
+
totalTokens: res.usage.totalTokens
|
|
137864
|
+
}
|
|
137865
|
+
}
|
|
137866
|
+
};
|
|
137821
137867
|
} catch (error88) {
|
|
137822
137868
|
console.log("Model error:", error88);
|
|
137823
137869
|
throw error88;
|
|
@@ -139324,15 +139370,20 @@ async function runAgent3({
|
|
|
139324
139370
|
};
|
|
139325
139371
|
}
|
|
139326
139372
|
const model = codexCli(MODEL, settings);
|
|
139327
|
-
const { text: text3 } = await generateText({
|
|
139373
|
+
const { text: text3, usage } = await generateText({
|
|
139328
139374
|
model,
|
|
139329
139375
|
prompt,
|
|
139330
139376
|
system
|
|
139331
139377
|
});
|
|
139378
|
+
const agentUsage = {
|
|
139379
|
+
inputTokens: usage.inputTokens ?? 0,
|
|
139380
|
+
outputTokens: usage.outputTokens ?? 0,
|
|
139381
|
+
totalTokens: usage.totalTokens ?? 0
|
|
139382
|
+
};
|
|
139332
139383
|
if (summarize) {
|
|
139333
|
-
return text3;
|
|
139384
|
+
return { output: text3, model: MODEL, provider: "openai", usage: agentUsage };
|
|
139334
139385
|
}
|
|
139335
|
-
return text3;
|
|
139386
|
+
return { output: text3, model: MODEL, provider: "openai", usage: agentUsage };
|
|
139336
139387
|
}
|
|
139337
139388
|
|
|
139338
139389
|
// src/agent/repair.ts
|
|
@@ -139998,7 +140049,11 @@ var createAsyncAgentHandler = (getParams, transformResult) => {
|
|
|
139998
140049
|
const recordings = await collectRecordings(startTime);
|
|
139999
140050
|
finishReq(request_id, {
|
|
140000
140051
|
success: true,
|
|
140001
|
-
result: finalResult,
|
|
140052
|
+
result: finalResult.output ?? finalResult,
|
|
140053
|
+
...finalResult.summary && { summary: finalResult.summary },
|
|
140054
|
+
...finalResult.usage && { usage: finalResult.usage },
|
|
140055
|
+
...finalResult.model && { model: finalResult.model },
|
|
140056
|
+
...finalResult.provider && { provider: finalResult.provider },
|
|
140002
140057
|
...screenshots.length > 0 && { screenshots },
|
|
140003
140058
|
...recordings.length > 0 && { recordings }
|
|
140004
140059
|
});
|
|
@@ -142704,7 +142759,7 @@ async function startProxyServer() {
|
|
|
142704
142759
|
system: repair_exports.SYSTEM
|
|
142705
142760
|
};
|
|
142706
142761
|
},
|
|
142707
|
-
(result) => repair_exports.parseXML(result)
|
|
142762
|
+
(result) => repair_exports.parseXML(result.output)
|
|
142708
142763
|
)
|
|
142709
142764
|
);
|
|
142710
142765
|
app.post(
|
package/dist/staklink-cli.cjs
CHANGED
|
@@ -11004,7 +11004,7 @@ var glob = Object.assign(glob_, {
|
|
|
11004
11004
|
glob.glob = glob;
|
|
11005
11005
|
|
|
11006
11006
|
// src/proxy/version.ts
|
|
11007
|
-
var VERSION = "0.4.
|
|
11007
|
+
var VERSION = "0.4.22";
|
|
11008
11008
|
|
|
11009
11009
|
// src/deps.ts
|
|
11010
11010
|
var import_child_process = require("child_process");
|