@staff0rd/assist 0.673.0 → 0.675.0

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/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.673.0",
9
+ version: "0.675.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -611,7 +611,7 @@ var runConfigSchema = z.strictObject({
611
611
  pre: z.array(z.string()).optional(),
612
612
  cwd: z.string().optional(),
613
613
  quiet: z.boolean().optional(),
614
- server: z.boolean().optional(),
614
+ server: z.union([z.boolean(), z.string().min(1)]).optional(),
615
615
  port: z.number().optional()
616
616
  });
617
617
  var runLinkSchema = z.strictObject({
@@ -37412,11 +37412,17 @@ function resolveRunConfig(name, cwd) {
37412
37412
  }
37413
37413
 
37414
37414
  // src/commands/sessions/daemon/serverRunMeta.ts
37415
+ var DEFAULT_SERVER_GROUP = "default";
37415
37416
  function serverRunMeta(runName, cwd) {
37416
37417
  const dir = cwd ?? process.cwd();
37417
37418
  const config = resolveRunConfig(runName, dir);
37418
37419
  if (!config?.server) return { server: false };
37419
- return { server: true, port: config.port, origin: getCurrentOrigin(dir) };
37420
+ return {
37421
+ server: true,
37422
+ group: typeof config.server === "string" ? config.server : DEFAULT_SERVER_GROUP,
37423
+ port: config.port,
37424
+ origin: getCurrentOrigin(dir)
37425
+ };
37420
37426
  }
37421
37427
 
37422
37428
  // src/commands/sessions/daemon/readDesignSystemPrompt.ts
@@ -37499,7 +37505,8 @@ function createRunSession(id, { runName, runArgs, cwd, meta }) {
37499
37505
  cwd,
37500
37506
  server: serverMeta.server || void 0,
37501
37507
  serverPort: serverMeta.port,
37502
- serverOrigin: serverMeta.origin
37508
+ serverOrigin: serverMeta.origin,
37509
+ serverGroup: serverMeta.group
37503
37510
  };
37504
37511
  }
37505
37512
 
@@ -40451,14 +40458,16 @@ function serverConflictInfo(session) {
40451
40458
  id: session.id,
40452
40459
  name: session.name,
40453
40460
  cwd: session.cwd,
40454
- port: session.serverPort
40461
+ port: session.serverPort,
40462
+ group: session.serverGroup
40455
40463
  };
40456
40464
  }
40457
40465
 
40458
40466
  // src/commands/sessions/daemon/liveServerRun.ts
40459
- function liveServerRun(sessions, origin, excludeId) {
40467
+ function liveServerRun(sessions, origin, group, excludeId) {
40460
40468
  for (const s of sessions.values()) {
40461
- if (s.id === excludeId || !s.server || s.serverOrigin !== origin) continue;
40469
+ if (s.id === excludeId || !s.server) continue;
40470
+ if (s.serverOrigin !== origin || s.serverGroup !== group) continue;
40462
40471
  if (s.status !== "done" && s.status !== "error") return s;
40463
40472
  }
40464
40473
  return void 0;
@@ -40476,11 +40485,17 @@ function tagServerSession(session, meta) {
40476
40485
  session.server = meta.server || void 0;
40477
40486
  session.serverPort = meta.port;
40478
40487
  session.serverOrigin = meta.origin;
40488
+ session.serverGroup = meta.group;
40479
40489
  }
40480
40490
  function findRetryConflict(sessions, session, replace, dismiss) {
40481
40491
  const meta = serverRunMeta(session.runName ?? "", session.cwd);
40482
- if (meta.server && meta.origin) {
40483
- const existing = liveServerRun(sessions, meta.origin, session.id);
40492
+ if (meta.server && meta.origin && meta.group) {
40493
+ const existing = liveServerRun(
40494
+ sessions,
40495
+ meta.origin,
40496
+ meta.group,
40497
+ session.id
40498
+ );
40484
40499
  if (existing && !replace) return serverConflictInfo(existing);
40485
40500
  if (existing) dismiss(existing.id);
40486
40501
  }
@@ -41959,8 +41974,8 @@ var SessionManager = class {
41959
41974
  spawnRun(request, context) {
41960
41975
  return this.spawnWith((id) => createRunSession(id, request), context);
41961
41976
  }
41962
- liveServerRun(origin, excludeId) {
41963
- return liveServerRun(this.sessions, origin, excludeId);
41977
+ liveServerRun(origin, group, excludeId) {
41978
+ return liveServerRun(this.sessions, origin, group, excludeId);
41964
41979
  }
41965
41980
  spawnAssist(assistArgs, cwd, meta, context) {
41966
41981
  return spawnAssistInTree(this.treeCtx(), assistArgs, cwd, meta, context);
@@ -42104,11 +42119,11 @@ function handleCreateRun(client, m, d) {
42104
42119
  const runArgs = d.runArgs ?? [];
42105
42120
  const context = spawnContextFrom(d);
42106
42121
  const meta = serverRunMeta(runName, cwd);
42107
- if (meta.server && meta.origin) {
42108
- const existing = m.liveServerRun(meta.origin);
42122
+ if (meta.server && meta.origin && meta.group) {
42123
+ const existing = m.liveServerRun(meta.origin, meta.group);
42109
42124
  if (existing && d.replace !== true) {
42110
42125
  daemonLog(
42111
- `create-run ${runName} rejected: server ${existing.id} already live for ${meta.origin}`
42126
+ `create-run ${runName} rejected: server ${existing.id} already live for ${meta.origin} (${meta.group})`
42112
42127
  );
42113
42128
  sendTo(client, {
42114
42129
  type: "run-conflict",
@@ -42121,7 +42136,7 @@ function handleCreateRun(client, m, d) {
42121
42136
  }
42122
42137
  if (existing) {
42123
42138
  daemonLog(
42124
- `create-run ${runName} replacing live server ${existing.id} for ${meta.origin}`
42139
+ `create-run ${runName} replacing live server ${existing.id} for ${meta.origin} (${meta.group})`
42125
42140
  );
42126
42141
  m.dismissSession(existing.id);
42127
42142
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.673.0",
3
+ "version": "0.675.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {