@blockrun/franklin 3.6.17 → 3.6.18
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/commands/init.js +32 -12
- package/dist/commands/models.js +1 -1
- package/dist/commands/proxy.js +2 -2
- package/dist/commands/stats.js +2 -2
- package/dist/commands/uninit.js +21 -14
- package/dist/index.js +5 -5
- package/dist/plugin-sdk/workflow.js +1 -1
- package/dist/pricing.js +4 -1
- package/dist/session/search.js +1 -1
- package/dist/tools/moa.js +4 -7
- package/dist/wallet/manager.js +1 -1
- package/package.json +1 -1
package/dist/commands/init.js
CHANGED
|
@@ -5,7 +5,8 @@ import chalk from 'chalk';
|
|
|
5
5
|
import { DEFAULT_PROXY_PORT } from '../config.js';
|
|
6
6
|
const CLAUDE_SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.json');
|
|
7
7
|
const LAUNCH_AGENT_DIR = path.join(os.homedir(), 'Library', 'LaunchAgents');
|
|
8
|
-
const LAUNCH_AGENT_PLIST = path.join(LAUNCH_AGENT_DIR, 'ai.blockrun.
|
|
8
|
+
const LAUNCH_AGENT_PLIST = path.join(LAUNCH_AGENT_DIR, 'ai.blockrun.franklin.plist');
|
|
9
|
+
const LEGACY_LAUNCH_AGENT_PLIST = path.join(LAUNCH_AGENT_DIR, 'ai.blockrun.runcode.plist');
|
|
9
10
|
export async function initCommand(options) {
|
|
10
11
|
const port = parseInt(options.port || String(DEFAULT_PROXY_PORT));
|
|
11
12
|
if (isNaN(port) || port < 1 || port > 65535) {
|
|
@@ -36,24 +37,43 @@ export async function initCommand(options) {
|
|
|
36
37
|
console.log(chalk.green(`✓ Configured ${CLAUDE_SETTINGS_FILE}`));
|
|
37
38
|
// ── 2. Install macOS LaunchAgent (auto-start on login) ─────────────────
|
|
38
39
|
if (process.platform === 'darwin') {
|
|
39
|
-
|
|
40
|
+
// Clean up legacy runcode LaunchAgent if present
|
|
41
|
+
if (fs.existsSync(LEGACY_LAUNCH_AGENT_PLIST)) {
|
|
42
|
+
try {
|
|
43
|
+
const { execSync } = await import('node:child_process');
|
|
44
|
+
execSync(`launchctl unload -w "${LEGACY_LAUNCH_AGENT_PLIST}"`, { stdio: 'pipe' });
|
|
45
|
+
}
|
|
46
|
+
catch { /* may not be loaded */ }
|
|
47
|
+
try {
|
|
48
|
+
fs.unlinkSync(LEGACY_LAUNCH_AGENT_PLIST);
|
|
49
|
+
}
|
|
50
|
+
catch { /* best effort */ }
|
|
51
|
+
}
|
|
52
|
+
let franklinBin = '';
|
|
40
53
|
try {
|
|
41
54
|
const { execSync } = await import('node:child_process');
|
|
42
|
-
|
|
55
|
+
franklinBin = execSync('which franklin', { encoding: 'utf-8' }).trim();
|
|
43
56
|
}
|
|
44
57
|
catch {
|
|
45
|
-
|
|
58
|
+
// Fall back to legacy binary name
|
|
59
|
+
try {
|
|
60
|
+
const { execSync } = await import('node:child_process');
|
|
61
|
+
franklinBin = execSync('which runcode', { encoding: 'utf-8' }).trim();
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
console.log(chalk.yellow(' Warning: franklin not found in PATH — LaunchAgent not installed.'));
|
|
65
|
+
}
|
|
46
66
|
}
|
|
47
|
-
if (
|
|
67
|
+
if (franklinBin) {
|
|
48
68
|
const plist = `<?xml version="1.0" encoding="UTF-8"?>
|
|
49
69
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
50
70
|
<plist version="1.0">
|
|
51
71
|
<dict>
|
|
52
72
|
<key>Label</key>
|
|
53
|
-
<string>ai.blockrun.
|
|
73
|
+
<string>ai.blockrun.franklin</string>
|
|
54
74
|
<key>ProgramArguments</key>
|
|
55
75
|
<array>
|
|
56
|
-
<string>${
|
|
76
|
+
<string>${franklinBin}</string>
|
|
57
77
|
<string>proxy</string>
|
|
58
78
|
<string>--port</string>
|
|
59
79
|
<string>${port}</string>
|
|
@@ -73,7 +93,7 @@ export async function initCommand(options) {
|
|
|
73
93
|
try {
|
|
74
94
|
const { execSync } = await import('node:child_process');
|
|
75
95
|
execSync(`launchctl load -w "${LAUNCH_AGENT_PLIST}"`, { stdio: 'pipe' });
|
|
76
|
-
console.log(chalk.green(`✓ LaunchAgent installed —
|
|
96
|
+
console.log(chalk.green(`✓ LaunchAgent installed — franklin proxy starts automatically on login`));
|
|
77
97
|
}
|
|
78
98
|
catch {
|
|
79
99
|
console.log(chalk.dim(` LaunchAgent written to ${LAUNCH_AGENT_PLIST}`));
|
|
@@ -83,10 +103,10 @@ export async function initCommand(options) {
|
|
|
83
103
|
}
|
|
84
104
|
// ── 3. Start daemon now ──────────────────────────────────────────────────
|
|
85
105
|
console.log('');
|
|
86
|
-
console.log(chalk.bold('
|
|
87
|
-
console.log(`Run ${chalk.bold('
|
|
88
|
-
console.log(`Then just run ${chalk.bold('claude')} —
|
|
106
|
+
console.log(chalk.bold('franklin initialized (proxy mode for Claude Code).'));
|
|
107
|
+
console.log(`Run ${chalk.bold('franklin daemon start')} to start the background proxy now.`);
|
|
108
|
+
console.log(`Then just run ${chalk.bold('claude')} — franklin proxy handles payments automatically.`);
|
|
89
109
|
console.log('');
|
|
90
|
-
console.log(chalk.dim('Or use
|
|
110
|
+
console.log(chalk.dim('Or use franklin directly: franklin start'));
|
|
91
111
|
console.log(chalk.dim('Note: Claude Code will ask you to trust the proxy URL once.'));
|
|
92
112
|
}
|
package/dist/commands/models.js
CHANGED
|
@@ -41,7 +41,7 @@ export async function modelsCommand() {
|
|
|
41
41
|
const ctx = '';
|
|
42
42
|
console.log(` ${chalk.cyan(m.id.padEnd(35))} ${input.padEnd(12)} ${output.padEnd(12)} ${ctx}`);
|
|
43
43
|
}
|
|
44
|
-
console.log(`\n${chalk.dim(`${models.length} models available. Use:`)} ${chalk.bold('
|
|
44
|
+
console.log(`\n${chalk.dim(`${models.length} models available. Use:`)} ${chalk.bold('franklin start --model <model-id>')}`);
|
|
45
45
|
}
|
|
46
46
|
catch (err) {
|
|
47
47
|
const msg = err instanceof Error ? err.message : 'unknown error';
|
package/dist/commands/proxy.js
CHANGED
|
@@ -25,7 +25,7 @@ export async function proxyCommand(options) {
|
|
|
25
25
|
if (wallet.isNew) {
|
|
26
26
|
console.log(chalk.yellow('No Solana wallet found — created a new one.'));
|
|
27
27
|
console.log(`Address: ${chalk.cyan(wallet.address)}`);
|
|
28
|
-
console.log(`\nSend USDC on Solana to this address, then run ${chalk.bold('
|
|
28
|
+
console.log(`\nSend USDC on Solana to this address, then run ${chalk.bold('franklin proxy')} again.\n`);
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
printBanner(version);
|
|
@@ -52,7 +52,7 @@ export async function proxyCommand(options) {
|
|
|
52
52
|
if (wallet.isNew) {
|
|
53
53
|
console.log(chalk.yellow('No wallet found — created a new one.'));
|
|
54
54
|
console.log(`Address: ${chalk.cyan(wallet.address)}`);
|
|
55
|
-
console.log(`\nSend USDC on Base to this address, then run ${chalk.bold('
|
|
55
|
+
console.log(`\nSend USDC on Base to this address, then run ${chalk.bold('franklin proxy')} again.\n`);
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
printBanner(version);
|
package/dist/commands/stats.js
CHANGED
|
@@ -26,10 +26,10 @@ export function statsCommand(options) {
|
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
// Pretty output
|
|
29
|
-
console.log(chalk.bold('\n📊
|
|
29
|
+
console.log(chalk.bold('\n📊 Franklin Usage Statistics\n'));
|
|
30
30
|
console.log('─'.repeat(55));
|
|
31
31
|
if (stats.totalRequests === 0) {
|
|
32
|
-
console.log(chalk.gray('\n No requests recorded yet. Start using
|
|
32
|
+
console.log(chalk.gray('\n No requests recorded yet. Start using franklin!\n'));
|
|
33
33
|
console.log('─'.repeat(55) + '\n');
|
|
34
34
|
return;
|
|
35
35
|
}
|
package/dist/commands/uninit.js
CHANGED
|
@@ -3,7 +3,10 @@ import path from 'node:path';
|
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import chalk from 'chalk';
|
|
5
5
|
const CLAUDE_SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.json');
|
|
6
|
-
const
|
|
6
|
+
const LAUNCH_AGENT_PLISTS = [
|
|
7
|
+
path.join(os.homedir(), 'Library', 'LaunchAgents', 'ai.blockrun.franklin.plist'),
|
|
8
|
+
path.join(os.homedir(), 'Library', 'LaunchAgents', 'ai.blockrun.runcode.plist'), // legacy
|
|
9
|
+
];
|
|
7
10
|
export async function uninitCommand() {
|
|
8
11
|
let changed = false;
|
|
9
12
|
// ── 1. Remove env section from ~/.claude/settings.json ──────────────────
|
|
@@ -31,7 +34,7 @@ export async function uninitCommand() {
|
|
|
31
34
|
delete settings.env;
|
|
32
35
|
if (removed) {
|
|
33
36
|
fs.writeFileSync(CLAUDE_SETTINGS_FILE, JSON.stringify(settings, null, 2));
|
|
34
|
-
console.log(chalk.green(`✓ Removed
|
|
37
|
+
console.log(chalk.green(`✓ Removed franklin env from ${CLAUDE_SETTINGS_FILE}`));
|
|
35
38
|
changed = true;
|
|
36
39
|
}
|
|
37
40
|
}
|
|
@@ -40,24 +43,28 @@ export async function uninitCommand() {
|
|
|
40
43
|
catch (e) {
|
|
41
44
|
console.log(chalk.yellow(`Could not update settings.json: ${e.message}`));
|
|
42
45
|
}
|
|
43
|
-
// ── 2. Unload and remove LaunchAgent
|
|
44
|
-
if (process.platform === 'darwin'
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
// ── 2. Unload and remove LaunchAgent(s) — new + legacy ─────────────────
|
|
47
|
+
if (process.platform === 'darwin') {
|
|
48
|
+
for (const plist of LAUNCH_AGENT_PLISTS) {
|
|
49
|
+
if (fs.existsSync(plist)) {
|
|
50
|
+
try {
|
|
51
|
+
const { execSync } = await import('node:child_process');
|
|
52
|
+
execSync(`launchctl unload -w "${plist}"`, { stdio: 'pipe' });
|
|
53
|
+
}
|
|
54
|
+
catch { /* already unloaded */ }
|
|
55
|
+
fs.unlinkSync(plist);
|
|
56
|
+
console.log(chalk.green(`✓ Removed LaunchAgent: ${path.basename(plist)}`));
|
|
57
|
+
changed = true;
|
|
58
|
+
}
|
|
48
59
|
}
|
|
49
|
-
catch { /* already unloaded */ }
|
|
50
|
-
fs.unlinkSync(LAUNCH_AGENT_PLIST);
|
|
51
|
-
console.log(chalk.green(`✓ Removed LaunchAgent`));
|
|
52
|
-
changed = true;
|
|
53
60
|
}
|
|
54
61
|
if (!changed) {
|
|
55
|
-
console.log(chalk.dim('Nothing to uninit —
|
|
62
|
+
console.log(chalk.dim('Nothing to uninit — franklin was not initialized.'));
|
|
56
63
|
}
|
|
57
64
|
else {
|
|
58
65
|
console.log('');
|
|
59
|
-
console.log(chalk.bold('
|
|
66
|
+
console.log(chalk.bold('franklin uninitialized.'));
|
|
60
67
|
console.log(`Claude Code will use its default Anthropic API settings again.`);
|
|
61
|
-
console.log(`Run ${chalk.bold('
|
|
68
|
+
console.log(`Run ${chalk.bold('franklin daemon stop')} to stop any running proxy.`);
|
|
62
69
|
}
|
|
63
70
|
}
|
package/dist/index.js
CHANGED
|
@@ -37,7 +37,7 @@ program
|
|
|
37
37
|
.action((chain) => setupCommand(chain));
|
|
38
38
|
program
|
|
39
39
|
.command('start')
|
|
40
|
-
.description('Start the
|
|
40
|
+
.description('Start the franklin agent')
|
|
41
41
|
.option('-m, --model <model>', 'Model to use (e.g. openai/gpt-5.4, anthropic/claude-sonnet-4.6). Default from config or claude-sonnet-4.6')
|
|
42
42
|
.option('--debug', 'Enable debug logging')
|
|
43
43
|
.option('--trust', 'Trust mode — skip permission prompts for all tools')
|
|
@@ -52,16 +52,16 @@ program
|
|
|
52
52
|
.action((options) => proxyCommand({ ...options, version }));
|
|
53
53
|
program
|
|
54
54
|
.command('init')
|
|
55
|
-
.description('Configure
|
|
55
|
+
.description('Configure franklin auto-start (writes ~/.claude/settings.json + installs LaunchAgent on macOS)')
|
|
56
56
|
.option('-p, --port <port>', 'Proxy port', '8402')
|
|
57
57
|
.action((options) => initCommand(options));
|
|
58
58
|
program
|
|
59
59
|
.command('uninit')
|
|
60
|
-
.description('Remove
|
|
60
|
+
.description('Remove franklin configuration and uninstall LaunchAgent')
|
|
61
61
|
.action(() => uninitCommand());
|
|
62
62
|
program
|
|
63
63
|
.command('daemon <action>')
|
|
64
|
-
.description('Manage
|
|
64
|
+
.description('Manage franklin background proxy (start|stop|status)')
|
|
65
65
|
.option('-p, --port <port>', 'Proxy port', '8402')
|
|
66
66
|
.action((action, options) => daemonCommand(action, options));
|
|
67
67
|
program
|
|
@@ -82,7 +82,7 @@ program
|
|
|
82
82
|
.action(balanceCommand);
|
|
83
83
|
program
|
|
84
84
|
.command('config <action> [key] [value]')
|
|
85
|
-
.description('Manage
|
|
85
|
+
.description('Manage franklin config (set, get, unset, list)\n' +
|
|
86
86
|
'Keys: default-model, sonnet-model, opus-model, haiku-model, smart-routing')
|
|
87
87
|
.action(configCommand);
|
|
88
88
|
program
|
package/dist/pricing.js
CHANGED
|
@@ -83,7 +83,10 @@ export const OPUS_PRICING = MODEL_PRICING['anthropic/claude-opus-4.6'];
|
|
|
83
83
|
* For per-call models (perCall > 0), uses flat per-call pricing instead of per-token.
|
|
84
84
|
*/
|
|
85
85
|
export function estimateCost(model, inputTokens, outputTokens, calls = 1) {
|
|
86
|
-
|
|
86
|
+
// Unknown models: assume free (0). Prevents false cost accumulation in the UI
|
|
87
|
+
// for models not yet listed — better to under-estimate than scare users with
|
|
88
|
+
// fake charges. Real on-chain charges are tracked separately in cost_log.jsonl.
|
|
89
|
+
const pricing = MODEL_PRICING[model] || { input: 0, output: 0 };
|
|
87
90
|
if (pricing.perCall) {
|
|
88
91
|
return pricing.perCall * calls;
|
|
89
92
|
}
|
package/dist/session/search.js
CHANGED
|
@@ -224,6 +224,6 @@ export function formatSearchResults(matches, query) {
|
|
|
224
224
|
lines.push(` [${m.matchedRole}] ${m.snippet}`);
|
|
225
225
|
lines.push('');
|
|
226
226
|
}
|
|
227
|
-
lines.push(` Resume:
|
|
227
|
+
lines.push(` Resume: franklin (then /resume <session-id>)\n`);
|
|
228
228
|
return lines.join('\n');
|
|
229
229
|
}
|
package/dist/tools/moa.js
CHANGED
|
@@ -19,8 +19,8 @@ const REFERENCE_MODELS = [
|
|
|
19
19
|
'google/gemini-2.5-flash', // Fast, cheap
|
|
20
20
|
'deepseek/deepseek-chat', // Cheap, good reasoning
|
|
21
21
|
];
|
|
22
|
-
/** Aggregator model —
|
|
23
|
-
const AGGREGATOR_MODEL = '
|
|
22
|
+
/** Aggregator model — free by default. Users explicitly pass `aggregator` to upgrade. */
|
|
23
|
+
const AGGREGATOR_MODEL = 'nvidia/nemotron-ultra-253b';
|
|
24
24
|
/** Max tokens per reference response. */
|
|
25
25
|
const REFERENCE_MAX_TOKENS = 4096;
|
|
26
26
|
/** Max tokens for aggregator. */
|
|
@@ -38,11 +38,8 @@ async function execute(input, ctx) {
|
|
|
38
38
|
return { output: 'Error: prompt is required', isError: true };
|
|
39
39
|
}
|
|
40
40
|
const referenceModels = models || REFERENCE_MODELS;
|
|
41
|
-
//
|
|
42
|
-
|
|
43
|
-
const parentIsFree = registeredParentModel.startsWith('nvidia/') ||
|
|
44
|
-
registeredParentModel === 'blockrun/free';
|
|
45
|
-
const aggregatorModel = aggregator || (parentIsFree ? 'nvidia/nemotron-ultra-253b' : AGGREGATOR_MODEL);
|
|
41
|
+
// Aggregator defaults to free. Pass `aggregator: 'sonnet'` to explicitly upgrade.
|
|
42
|
+
const aggregatorModel = aggregator || AGGREGATOR_MODEL;
|
|
46
43
|
const client = new ModelClient({
|
|
47
44
|
apiUrl: registeredApiUrl,
|
|
48
45
|
chain: registeredChain,
|
package/dist/wallet/manager.js
CHANGED
|
@@ -18,6 +18,6 @@ export async function setupSolanaWallet() {
|
|
|
18
18
|
export function getAddress() {
|
|
19
19
|
const addr = getWalletAddress();
|
|
20
20
|
if (!addr)
|
|
21
|
-
throw new Error('No wallet found. Run `
|
|
21
|
+
throw new Error('No wallet found. Run `franklin setup` first.');
|
|
22
22
|
return addr;
|
|
23
23
|
}
|
package/package.json
CHANGED