@gns-foundation/hive-worker 0.1.0 → 0.1.2

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.
Files changed (7) hide show
  1. package/dist/cli.js +5 -5
  2. package/dist/cli.js.map +1 -1
  3. package/dist/executor.js +36 -58
  4. package/dist/executor.js.map +1 -1
  5. package/package.json +9 -2
  6. package/src/cli.ts +6 -6
  7. package/src/executor.ts +44 -71
package/dist/cli.js CHANGED
@@ -20,7 +20,7 @@ import { executeJob, downloadModel, listCachedModels, resolveModelUrl, findLlama
20
20
  import { creditWorker, SPLIT } from './settlement.js';
21
21
  const HEARTBEAT_INTERVAL_MS = 30_000;
22
22
  const STATS_REFRESH_INTERVAL_MS = 60_000;
23
- const DASHBOARD_REFRESH_MS = 3_000;
23
+ const DASHBOARD_REFRESH_MS = 1_000;
24
24
  const JOB_POLL_INTERVAL_MS = 5_000; // poll for new jobs every 5s
25
25
  // ─── JOIN command ─────────────────────────────────────────────
26
26
  async function cmdJoin(opts) {
@@ -66,14 +66,14 @@ async function cmdJoin(opts) {
66
66
  // 6. RPC server (for pipeline/shard mode)
67
67
  let rpcHandle = null;
68
68
  const rpcBinary = findRpcBinary();
69
- const rpcPort = opts.noRpc ? null : parseInt(opts.rpcPort ?? String(DEFAULT_RPC_PORT), 10);
70
- if (opts.noRpc !== true && rpcBinary) {
69
+ const rpcPort = opts.skipRpc ? null : parseInt(opts.rpcPort ?? String(DEFAULT_RPC_PORT), 10);
70
+ if (!opts.skipRpc && rpcBinary) {
71
71
  printInfo(`Starting llama.cpp rpc-server on :${rpcPort}...`);
72
72
  rpcHandle = startRpcServer(rpcPort, (line) => logs.push(line));
73
73
  if (rpcHandle)
74
74
  printSuccess(`RPC server PID ${rpcHandle.pid} on :${rpcPort}`);
75
75
  }
76
- else if (opts.noRpc !== true) {
76
+ else if (!opts.skipRpc) {
77
77
  printWarn('rpc-server not found — pipeline mode disabled.');
78
78
  }
79
79
  // 7. Register
@@ -325,7 +325,7 @@ program
325
325
  .description('Join the GEIANT Hive swarm and start earning GNS')
326
326
  .option('--handle <n>', 'Your GNS handle (e.g. @alice)')
327
327
  .option('--rpc-port <port>', 'Port for llama.cpp rpc-server', String(DEFAULT_RPC_PORT))
328
- .option('--no-rpc', 'Skip starting rpc-server')
328
+ .option('--skip-rpc', 'Skip starting rpc-server')
329
329
  .option('--no-jobs', 'Observer only — do not execute inference jobs')
330
330
  .action(async (opts) => { await cmdJoin(opts); });
331
331
  program
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
package/dist/executor.js CHANGED
@@ -17,14 +17,14 @@ import os from 'os';
17
17
  import path from 'path';
18
18
  // ─── Binary detection ─────────────────────────────────────────
19
19
  const LLAMA_CLI_CANDIDATES = [
20
- 'llama-cli',
21
- 'llama.cpp/llama-cli',
22
- `${os.homedir()}/llama.cpp/llama-cli`,
20
+ // llama-completion: pure completion mode, clean stdout, no banner
21
+ `${os.homedir()}/llama.cpp/build/bin/llama-completion`,
22
+ `${os.homedir()}/llama.cpp/build/llama-completion`,
23
+ 'llama-completion',
24
+ // Fallback to llama-cli
23
25
  `${os.homedir()}/llama.cpp/build/bin/llama-cli`,
24
26
  `${os.homedir()}/llama.cpp/build/llama-cli`,
25
- // Older name
26
- 'main',
27
- `${os.homedir()}/llama.cpp/main`,
27
+ 'llama-cli',
28
28
  ];
29
29
  export function findLlamaCli() {
30
30
  for (const candidate of LLAMA_CLI_CANDIDATES) {
@@ -108,84 +108,62 @@ export async function executeJob(job, opts = {}) {
108
108
  function runLlamaCli(binary, modelPath, job, opts) {
109
109
  return new Promise((resolve, reject) => {
110
110
  const startMs = Date.now();
111
- // Build args
111
+ const threads = Math.max(1, Math.floor(os.cpus().length / 2));
112
+ // llama-completion: pure completion mode, clean stdout, no banner
112
113
  const args = [
113
114
  '--model', modelPath,
114
115
  '--prompt', job.prompt,
115
116
  '--n-predict', String(job.max_tokens),
116
117
  '--temp', String(job.temperature),
117
118
  '--ctx-size', '4096',
118
- '--threads', String(Math.max(1, Math.floor(os.cpus().length / 2))),
119
- '--no-display-prompt', // suppress prompt echo
120
- '--log-disable',
121
- '--single-turn',
122
- '-ngl', '0',
119
+ '--threads', String(threads),
120
+ '--single-turn', // exit after one completion
121
+ '-ngl', '0', // CPU-only (Metal tensor API disabled on pre-M5)
123
122
  ];
124
- // Layer range hint (pipeline mode — rpc-server handles routing,
125
- // but we pass the range so the model knows which layers to host)
126
- if (job.layer_start !== 0 || job.layer_end !== 31) {
127
- args.push('--n-gpu-layers', '0'); // CPU-only for partial layer ranges
128
- }
129
- // Apple Silicon: use Metal when running full model
130
- const isApple = os.platform() === 'darwin' && os.arch() === 'arm64';
131
- if (isApple && job.layer_start === 0) {
132
- args.push('--n-gpu-layers', '99'); // offload all layers to Metal
133
- }
134
- opts.onLog?.(`Starting llama-cli for "${job.model_id}" [layers ${job.layer_start}–${job.layer_end}]`);
135
- opts.onLog?.(`Command: ${binary} ${args.slice(0, 6).join(' ')} ...`);
123
+ opts.onLog?.(`Executing ${job.model_id} (${job.max_tokens} tokens)`);
136
124
  const proc = spawn(binary, args, {
137
125
  stdio: ['ignore', 'pipe', 'pipe'],
138
126
  });
139
- let output = '';
140
- let stderrBuf = '';
141
- // llama-cli writes generated tokens to stdout
142
- proc.stdout.on('data', (chunk) => {
143
- const text = chunk.toString();
144
- output += text;
145
- opts.onToken?.(text);
146
- });
147
- // Stats appear on stderr: "llama_print_timings: eval time = 12345 ms / 150 runs"
127
+ let stdout = '';
128
+ let stderr = '';
129
+ proc.stdout.on('data', (chunk) => { stdout += chunk.toString(); });
148
130
  proc.stderr.on('data', (chunk) => {
149
- stderrBuf += chunk.toString();
150
- opts.onLog?.(chunk.toString().trim());
151
- });
152
- proc.on('error', (err) => {
153
- reject(new Error(`llama-cli spawn error: ${err.message}`));
131
+ stderr += chunk.toString();
132
+ opts.onLog?.(chunk.toString().slice(0, 60).trim());
154
133
  });
134
+ proc.on('error', (err) => reject(new Error(`spawn error: ${err.message}`)));
155
135
  proc.on('close', (code) => {
156
136
  const wallMs = Date.now() - startMs;
157
- if (code !== 0) {
158
- reject(new Error(`llama-cli exited with code ${code}. stderr: ${stderrBuf.slice(-500)}`));
137
+ opts.onLog?.(`stdout=${stdout.length}b stderr=${stderr.length}b code=${code}`);
138
+ if (code !== 0 && stdout.trim().length === 0) {
139
+ reject(new Error(`llama-cli exited ${code}: ${stderr.slice(-200)}`));
159
140
  return;
160
141
  }
161
- // Parse tokens/sec from llama.cpp timing output
162
- // Example: "llama_print_timings: eval time = 4523.11 ms / 150 runs"
163
- const tpsMatch = stderrBuf.match(/eval time\s*=\s*([\d.]+)\s*ms\s*\/\s*(\d+)\s*runs/);
142
+ // llama-completion echoes the prompt with chat template then the response.
143
+ // Strip everything up to and including <|assistant|> token.
144
+ let resultText = stdout.trim();
145
+ const assistantMarker = '<|assistant|>';
146
+ const assistantIdx = resultText.lastIndexOf(assistantMarker);
147
+ if (assistantIdx !== -1) {
148
+ resultText = resultText.slice(assistantIdx + assistantMarker.length).trim();
149
+ }
150
+ // Parse tok/s from stderr timing line
164
151
  let tokensPerSecond = 0;
165
- let tokensGenerated = output.split(/\s+/).length; // rough estimate
152
+ const tokensGenerated = resultText.split(/\s+/).filter(Boolean).length;
153
+ const tpsMatch = stderr.match(/eval time\s*=\s*([\d.]+)\s*ms\s*\/\s*(\d+)\s*tokens/);
166
154
  if (tpsMatch) {
167
155
  const evalMs = parseFloat(tpsMatch[1]);
168
- tokensGenerated = parseInt(tpsMatch[2], 10);
169
- tokensPerSecond = Math.round((tokensGenerated / evalMs) * 1000 * 10) / 10;
156
+ tokensPerSecond = Math.round((parseInt(tpsMatch[2], 10) / evalMs) * 1000 * 10) / 10;
170
157
  }
171
158
  else if (wallMs > 0) {
172
- // Fallback: tokens from output word count / wall time
173
159
  tokensPerSecond = Math.round((tokensGenerated / wallMs) * 1000 * 10) / 10;
174
160
  }
175
- resolve({
176
- resultText: output.trim(),
177
- tokensGenerated,
178
- tokensPerSecond,
179
- });
161
+ resolve({ resultText, tokensGenerated, tokensPerSecond });
180
162
  });
181
- // Job-level timeout (safety net on top of Supabase timeout_at)
182
163
  const deadline = new Date(job.timeout_at).getTime();
183
- const remaining = deadline - Date.now() - 10_000; // 10s buffer
164
+ const remaining = deadline - Date.now() - 10_000;
184
165
  if (remaining > 0) {
185
- setTimeout(() => {
186
- proc.kill('SIGTERM');
187
- reject(new Error('Job timed out (executor deadline)'));
188
- }, remaining);
166
+ setTimeout(() => { proc.kill(); reject(new Error('Job timed out')); }, remaining);
189
167
  }
190
168
  });
191
169
  }
package/dist/executor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,yBAAyB;AACzB,sCAAsC;AACtC,EAAE;AACF,aAAa;AACb,kEAAkE;AAClE,gEAAgE;AAChE,+DAA+D;AAC/D,iEAAiE;AACjE,EAAE;AACF,4DAA4D;AAC5D,6DAA6D;AAC7D,+DAA+D;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,iEAAiE;AAEjE,MAAM,oBAAoB,GAAG;IAC3B,WAAW;IACX,qBAAqB;IACrB,GAAG,EAAE,CAAC,OAAO,EAAE,sBAAsB;IACrC,GAAG,EAAE,CAAC,OAAO,EAAE,gCAAgC;IAC/C,GAAG,EAAE,CAAC,OAAO,EAAE,4BAA4B;IAC3C,aAAa;IACb,MAAM;IACN,GAAG,EAAE,CAAC,OAAO,EAAE,iBAAiB;CACjC,CAAC;AAEF,MAAM,UAAU,YAAY;IAC1B,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE,CAAC;QAC7C,IAAI,CAAC;YACH,QAAQ,CAAC,YAAY,SAAS,eAAe,SAAS,eAAe,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1F,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iEAAiE;AAEjE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;AAEnE,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,UAAU,mBAAmB;IACjC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,8CAA8C;IAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,CAAC;IACzE,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,kEAAkE;AAClE,MAAM,YAAY,GAA2B;IAC3C,YAAY,EACV,0GAA0G;IAC5G,YAAY,EACV,4FAA4F;IAC9F,WAAW,EACT,iHAAiH;CACpH,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,IAAI,GAAG,CAAC,SAAS;QAAE,OAAO,GAAG,CAAC,SAAS,CAAC;IACxC,OAAO,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;AAC5C,CAAC;AAED,gEAAgE;AAEhE,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,GAAW,EACX,UAAkE;IAElE,mBAAmB,EAAE,CAAC;IACtB,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,GAAG,WAAW,CAAC;IAEnC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxE,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;IAEzC,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IACrC,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAI;YAAE,MAAM;QAChB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpB,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACnB,UAAU,CACR,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,EAC3C,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC,EACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CACpB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QACxB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7B,OAAO,IAAI,CAAC;AACd,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAY,EACZ,OAAwB,EAAE;IAE1B,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAChC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,UAAU,GAAG,CAAC,QAAQ,mBAAmB,SAAS,IAAI;YACtD,iCAAiC,GAAG,CAAC,QAAQ,EAAE,CAChD,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,WAAW,CAClB,MAAc,EACd,SAAiB,EACjB,GAAY,EACZ,IAAqB;IAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE3B,aAAa;QACb,MAAM,IAAI,GAAG;YACX,SAAS,EAAQ,SAAS;YAC1B,UAAU,EAAO,GAAG,CAAC,MAAM;YAC3B,aAAa,EAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;YACvC,QAAQ,EAAS,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;YACxC,YAAY,EAAK,MAAM;YACvB,WAAW,EAAM,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YACtE,qBAAqB,EAAI,uBAAuB;YAChD,eAAe;YACf,eAAe;YACf,MAAM,EAAE,GAAG;SAEZ,CAAC;QAEF,gEAAgE;QAChE,iEAAiE;QACjE,IAAI,GAAG,CAAC,WAAW,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAClD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,CAAC,oCAAoC;QACxE,CAAC;QAED,mDAAmD;QACnD,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;QACpE,IAAI,OAAO,IAAI,GAAG,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAE,8BAA8B;QACpE,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC,2BAA2B,GAAG,CAAC,QAAQ,aAAa,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC;QACtG,IAAI,CAAC,KAAK,EAAE,CAAC,YAAY,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAErE,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;YAC/B,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SAClC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,SAAS,GAAG,EAAE,CAAC;QAEnB,8CAA8C;QAC9C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACvC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,IAAI,CAAC;YACf,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,iFAAiF;QACjF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACvC,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACvB,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YAEpC,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,KAAK,CACd,8BAA8B,IAAI,aAAa,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CACvE,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,gDAAgD;YAChD,6EAA6E;YAC7E,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACtF,IAAI,eAAe,GAAG,CAAC,CAAC;YACxB,IAAI,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,iBAAiB;YAEnE,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,MAAM,GAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5C,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,GAAG,MAAM,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;YAC5E,CAAC;iBAAM,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,sDAAsD;gBACtD,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,GAAG,MAAM,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;YAC5E,CAAC;YAED,OAAO,CAAC;gBACN,UAAU,EAAO,MAAM,CAAC,IAAI,EAAE;gBAC9B,eAAe;gBACf,eAAe;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,aAAa;QAC/D,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC;YACzD,CAAC,EAAE,SAAS,CAAC,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,iEAAiE;AAEjE,MAAM,UAAU,gBAAgB;IAC9B,mBAAmB,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/E,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrB,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/B,MAAM,EAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;KACnF,CAAC,CAAC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gns-foundation/hive-worker",
3
- "version": "0.1.0",
3
+ "version": "0.1.2",
4
4
  "description": "Turn your device into a GEIANT Hive compute node. Earn GNS tokens.",
5
5
  "bin": {
6
6
  "hive-worker": "./dist/cli.js"
@@ -10,7 +10,14 @@
10
10
  "dev": "ts-node src/cli.ts",
11
11
  "prepublishOnly": "npm run build"
12
12
  },
13
- "keywords": ["geiant", "hive", "gns", "ai", "inference", "decentralized"],
13
+ "keywords": [
14
+ "geiant",
15
+ "hive",
16
+ "gns",
17
+ "ai",
18
+ "inference",
19
+ "decentralized"
20
+ ],
14
21
  "author": "GNS Foundation <cayerbe@ulissy.app>",
15
22
  "license": "BSL-1.1",
16
23
  "dependencies": {
package/src/cli.ts CHANGED
@@ -26,7 +26,7 @@ import { creditWorker, SPLIT } from './settlement.js';
26
26
 
27
27
  const HEARTBEAT_INTERVAL_MS = 30_000;
28
28
  const STATS_REFRESH_INTERVAL_MS = 60_000;
29
- const DASHBOARD_REFRESH_MS = 3_000;
29
+ const DASHBOARD_REFRESH_MS = 1_000;
30
30
  const JOB_POLL_INTERVAL_MS = 5_000; // poll for new jobs every 5s
31
31
 
32
32
  // ─── JOIN command ─────────────────────────────────────────────
@@ -34,7 +34,7 @@ const JOB_POLL_INTERVAL_MS = 5_000; // poll for new jobs every 5s
34
34
  async function cmdJoin(opts: {
35
35
  handle?: string;
36
36
  rpcPort?: string;
37
- noRpc?: boolean;
37
+ skipRpc?: boolean;
38
38
  noJobs?: boolean;
39
39
  }): Promise<void> {
40
40
  printBanner();
@@ -81,13 +81,13 @@ async function cmdJoin(opts: {
81
81
  // 6. RPC server (for pipeline/shard mode)
82
82
  let rpcHandle: LlamaRpcHandle | null = null;
83
83
  const rpcBinary = findRpcBinary();
84
- const rpcPort = opts.noRpc ? null : parseInt(opts.rpcPort ?? String(DEFAULT_RPC_PORT), 10);
84
+ const rpcPort = opts.skipRpc ? null : parseInt(opts.rpcPort ?? String(DEFAULT_RPC_PORT), 10);
85
85
 
86
- if (opts.noRpc !== true && rpcBinary) {
86
+ if (!opts.skipRpc && rpcBinary) {
87
87
  printInfo(`Starting llama.cpp rpc-server on :${rpcPort}...`);
88
88
  rpcHandle = startRpcServer(rpcPort!, (line) => logs.push(line));
89
89
  if (rpcHandle) printSuccess(`RPC server PID ${rpcHandle.pid} on :${rpcPort}`);
90
- } else if (opts.noRpc !== true) {
90
+ } else if (!opts.skipRpc) {
91
91
  printWarn('rpc-server not found — pipeline mode disabled.');
92
92
  }
93
93
 
@@ -382,7 +382,7 @@ program
382
382
  .description('Join the GEIANT Hive swarm and start earning GNS')
383
383
  .option('--handle <n>', 'Your GNS handle (e.g. @alice)')
384
384
  .option('--rpc-port <port>', 'Port for llama.cpp rpc-server', String(DEFAULT_RPC_PORT))
385
- .option('--no-rpc', 'Skip starting rpc-server')
385
+ .option('--skip-rpc', 'Skip starting rpc-server')
386
386
  .option('--no-jobs', 'Observer only — do not execute inference jobs')
387
387
  .action(async (opts) => { await cmdJoin(opts); });
388
388
 
package/src/executor.ts CHANGED
@@ -21,14 +21,14 @@ import type { HiveJob, JobResult } from './jobs.js';
21
21
  // ─── Binary detection ─────────────────────────────────────────
22
22
 
23
23
  const LLAMA_CLI_CANDIDATES = [
24
- 'llama-cli',
25
- 'llama.cpp/llama-cli',
26
- `${os.homedir()}/llama.cpp/llama-cli`,
24
+ // llama-completion: pure completion mode, clean stdout, no banner
25
+ `${os.homedir()}/llama.cpp/build/bin/llama-completion`,
26
+ `${os.homedir()}/llama.cpp/build/llama-completion`,
27
+ 'llama-completion',
28
+ // Fallback to llama-cli
27
29
  `${os.homedir()}/llama.cpp/build/bin/llama-cli`,
28
30
  `${os.homedir()}/llama.cpp/build/llama-cli`,
29
- // Older name
30
- 'main',
31
- `${os.homedir()}/llama.cpp/main`,
31
+ 'llama-cli',
32
32
  ];
33
33
 
34
34
  export function findLlamaCli(): string | null {
@@ -159,105 +159,78 @@ function runLlamaCli(
159
159
  ): Promise<JobResult> {
160
160
  return new Promise((resolve, reject) => {
161
161
  const startMs = Date.now();
162
+ const threads = Math.max(1, Math.floor(os.cpus().length / 2));
162
163
 
163
- // Build args
164
+ // llama-completion: pure completion mode, clean stdout, no banner
164
165
  const args = [
165
- '--model', modelPath,
166
- '--prompt', job.prompt,
167
- '--n-predict', String(job.max_tokens),
168
- '--temp', String(job.temperature),
169
- '--ctx-size', '4096',
170
- '--threads', String(Math.max(1, Math.floor(os.cpus().length / 2))),
171
- '--no-display-prompt', // suppress prompt echo
172
- '--log-disable',
173
- '--single-turn',
174
- '-ngl', '0',
175
-
166
+ '--model', modelPath,
167
+ '--prompt', job.prompt,
168
+ '--n-predict', String(job.max_tokens),
169
+ '--temp', String(job.temperature),
170
+ '--ctx-size', '4096',
171
+ '--threads', String(threads),
172
+ '--single-turn', // exit after one completion
173
+ '-ngl', '0', // CPU-only (Metal tensor API disabled on pre-M5)
176
174
  ];
177
175
 
178
- // Layer range hint (pipeline mode — rpc-server handles routing,
179
- // but we pass the range so the model knows which layers to host)
180
- if (job.layer_start !== 0 || job.layer_end !== 31) {
181
- args.push('--n-gpu-layers', '0'); // CPU-only for partial layer ranges
182
- }
183
-
184
- // Apple Silicon: use Metal when running full model
185
- const isApple = os.platform() === 'darwin' && os.arch() === 'arm64';
186
- if (isApple && job.layer_start === 0) {
187
- args.push('--n-gpu-layers', '99'); // offload all layers to Metal
188
- }
189
-
190
- opts.onLog?.(`Starting llama-cli for "${job.model_id}" [layers ${job.layer_start}–${job.layer_end}]`);
191
- opts.onLog?.(`Command: ${binary} ${args.slice(0, 6).join(' ')} ...`);
176
+ opts.onLog?.(`Executing ${job.model_id} (${job.max_tokens} tokens)`);
192
177
 
193
178
  const proc = spawn(binary, args, {
194
179
  stdio: ['ignore', 'pipe', 'pipe'],
195
180
  });
196
181
 
197
- let output = '';
198
- let stderrBuf = '';
182
+ let stdout = '';
183
+ let stderr = '';
199
184
 
200
- // llama-cli writes generated tokens to stdout
201
- proc.stdout.on('data', (chunk: Buffer) => {
202
- const text = chunk.toString();
203
- output += text;
204
- opts.onToken?.(text);
205
- });
206
-
207
- // Stats appear on stderr: "llama_print_timings: eval time = 12345 ms / 150 runs"
185
+ proc.stdout.on('data', (chunk: Buffer) => { stdout += chunk.toString(); });
208
186
  proc.stderr.on('data', (chunk: Buffer) => {
209
- stderrBuf += chunk.toString();
210
- opts.onLog?.(chunk.toString().trim());
187
+ stderr += chunk.toString();
188
+ opts.onLog?.(chunk.toString().slice(0, 60).trim());
211
189
  });
212
190
 
213
- proc.on('error', (err) => {
214
- reject(new Error(`llama-cli spawn error: ${err.message}`));
215
- });
191
+ proc.on('error', (err) => reject(new Error(`spawn error: ${err.message}`)));
216
192
 
217
193
  proc.on('close', (code) => {
218
194
  const wallMs = Date.now() - startMs;
195
+ opts.onLog?.(`stdout=${stdout.length}b stderr=${stderr.length}b code=${code}`);
219
196
 
220
- if (code !== 0) {
221
- reject(new Error(
222
- `llama-cli exited with code ${code}. stderr: ${stderrBuf.slice(-500)}`,
223
- ));
197
+ if (code !== 0 && stdout.trim().length === 0) {
198
+ reject(new Error(`llama-cli exited ${code}: ${stderr.slice(-200)}`));
224
199
  return;
225
200
  }
226
201
 
227
- // Parse tokens/sec from llama.cpp timing output
228
- // Example: "llama_print_timings: eval time = 4523.11 ms / 150 runs"
229
- const tpsMatch = stderrBuf.match(/eval time\s*=\s*([\d.]+)\s*ms\s*\/\s*(\d+)\s*runs/);
230
- let tokensPerSecond = 0;
231
- let tokensGenerated = output.split(/\s+/).length; // rough estimate
202
+ // llama-completion echoes the prompt with chat template then the response.
203
+ // Strip everything up to and including <|assistant|> token.
204
+ let resultText = stdout.trim();
205
+ const assistantMarker = '<|assistant|>';
206
+ const assistantIdx = resultText.lastIndexOf(assistantMarker);
207
+ if (assistantIdx !== -1) {
208
+ resultText = resultText.slice(assistantIdx + assistantMarker.length).trim();
209
+ }
232
210
 
211
+ // Parse tok/s from stderr timing line
212
+ let tokensPerSecond = 0;
213
+ const tokensGenerated = resultText.split(/\s+/).filter(Boolean).length;
214
+ const tpsMatch = stderr.match(/eval time\s*=\s*([\d.]+)\s*ms\s*\/\s*(\d+)\s*tokens/);
233
215
  if (tpsMatch) {
234
- const evalMs = parseFloat(tpsMatch[1]);
235
- tokensGenerated = parseInt(tpsMatch[2], 10);
236
- tokensPerSecond = Math.round((tokensGenerated / evalMs) * 1000 * 10) / 10;
216
+ const evalMs = parseFloat(tpsMatch[1]);
217
+ tokensPerSecond = Math.round((parseInt(tpsMatch[2], 10) / evalMs) * 1000 * 10) / 10;
237
218
  } else if (wallMs > 0) {
238
- // Fallback: tokens from output word count / wall time
239
219
  tokensPerSecond = Math.round((tokensGenerated / wallMs) * 1000 * 10) / 10;
240
220
  }
241
221
 
242
- resolve({
243
- resultText: output.trim(),
244
- tokensGenerated,
245
- tokensPerSecond,
246
- });
222
+ resolve({ resultText, tokensGenerated, tokensPerSecond });
247
223
  });
248
224
 
249
- // Job-level timeout (safety net on top of Supabase timeout_at)
250
225
  const deadline = new Date(job.timeout_at).getTime();
251
- const remaining = deadline - Date.now() - 10_000; // 10s buffer
226
+ const remaining = deadline - Date.now() - 10_000;
252
227
  if (remaining > 0) {
253
- setTimeout(() => {
254
- proc.kill('SIGTERM');
255
- reject(new Error('Job timed out (executor deadline)'));
256
- }, remaining);
228
+ setTimeout(() => { proc.kill(); reject(new Error('Job timed out')); }, remaining);
257
229
  }
258
230
  });
259
231
  }
260
232
 
233
+
261
234
  // ─── List cached models ───────────────────────────────────────
262
235
 
263
236
  export function listCachedModels(): Array<{ modelId: string; sizeMb: number }> {