@halcyonlabs/app 0.47.0-halcyon.101 → 0.47.0-halcyon.102

package/dist/index.d.ts

@@ -451,8 +451,8 @@ type ChangedMessage = z$1.infer<typeof changedMessageSchema>;
 
 declare const environmentStatusSchema: z$1.ZodEnum<{
     error: "error";
-    provisioning: "provisioning";
     ready: "ready";
+    provisioning: "provisioning";
     creating: "creating";
     destroyed: "destroyed";
 }>;
@@ -471,8 +471,8 @@ declare const environmentSchema: z$1.ZodObject<{
     mergeBaseBranch: z$1.ZodNullable<z$1.ZodString>;
     status: z$1.ZodEnum<{
         error: "error";
-        provisioning: "provisioning";
         ready: "ready";
+        provisioning: "provisioning";
         creating: "creating";
         destroyed: "destroyed";
     }>;
@@ -591,8 +591,8 @@ declare const hostSchema: z$1.ZodObject<{
         }, z$1.core.$strip>>;
     }, z$1.core.$strip>;
     maxPermissionMode: z$1.ZodEnum<{
-        full: "full";
         auto: "auto";
+        full: "full";
         "accept-edits": "accept-edits";
     }>;
     lastSeenAt: z$1.ZodNullable<z$1.ZodNumber>;
@@ -2961,12 +2961,12 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 }>;
                 name: z$1.ZodString;
                 source: z$1.ZodEnum<{
-                    skill: "skill";
                     command: "command";
+                    skill: "skill";
                 }>;
                 origin: z$1.ZodEnum<{
-                    user: "user";
                     project: "project";
+                    user: "user";
                     builtin: "builtin";
                 }>;
                 label: z$1.ZodString;
@@ -3051,12 +3051,12 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 }>;
                 name: z$1.ZodString;
                 source: z$1.ZodEnum<{
-                    skill: "skill";
                     command: "command";
+                    skill: "skill";
                 }>;
                 origin: z$1.ZodEnum<{
-                    user: "user";
                     project: "project";
+                    user: "user";
                     builtin: "builtin";
                 }>;
                 label: z$1.ZodString;
@@ -3129,8 +3129,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         }>;
         permissionMode: z$1.ZodEnum<{
             readonly: "readonly";
-            full: "full";
             auto: "auto";
+            full: "full";
             "accept-edits": "accept-edits";
             "workspace-write": "workspace-write";
         }>;
@@ -3928,8 +3928,8 @@ type ReasoningLevel = z$1.infer<typeof reasoningLevelSchema>;
 declare const serviceTierSchema: z$1.ZodString;
 type ServiceTier = z$1.infer<typeof serviceTierSchema>;
 declare const permissionModeSchema: z$1.ZodEnum<{
-    full: "full";
     auto: "auto";
+    full: "full";
     "accept-edits": "accept-edits";
 }>;
 type PermissionMode = z$1.infer<typeof permissionModeSchema>;
@@ -3969,12 +3969,12 @@ declare const promptTextMentionSchema: z$1.ZodObject<{
         }>;
         name: z$1.ZodString;
         source: z$1.ZodEnum<{
-            skill: "skill";
             command: "command";
+            skill: "skill";
         }>;
         origin: z$1.ZodEnum<{
-            user: "user";
             project: "project";
+            user: "user";
             builtin: "builtin";
         }>;
         label: z$1.ZodString;
@@ -4034,12 +4034,12 @@ declare const promptInputSchema: z$1.ZodDiscriminatedUnion<[z$1.ZodObject<{
             }>;
             name: z$1.ZodString;
             source: z$1.ZodEnum<{
-                skill: "skill";
                 command: "command";
+                skill: "skill";
             }>;
             origin: z$1.ZodEnum<{
-                user: "user";
                 project: "project";
+                user: "user";
                 builtin: "builtin";
             }>;
             label: z$1.ZodString;
@@ -4098,8 +4098,8 @@ declare const resolvedThreadExecutionOptionsSchema: z$1.ZodObject<{
     serviceTier: z$1.ZodString;
     reasoningLevel: z$1.ZodString;
     permissionMode: z$1.ZodEnum<{
-        full: "full";
         auto: "auto";
+        full: "full";
         "accept-edits": "accept-edits";
     }>;
     source: z$1.ZodEnum<{
@@ -4115,8 +4115,8 @@ declare const projectExecutionDefaultsSchema: z$1.ZodObject<{
     serviceTier: z$1.ZodString;
     reasoningLevel: z$1.ZodString;
     permissionMode: z$1.ZodEnum<{
-        full: "full";
         auto: "auto";
+        full: "full";
         "accept-edits": "accept-edits";
     }>;
 }, z$1.core.$strip>;
@@ -4156,8 +4156,8 @@ declare const providerInfoSchema: z$1.ZodObject<{
         supportsFork: z$1.ZodBoolean;
         supportsSessionRewind: z$1.ZodBoolean;
         permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-            full: "full";
             auto: "auto";
+            full: "full";
             "accept-edits": "accept-edits";
         }>>;
         modelCatalogScope: z$1.ZodEnum<{
@@ -4282,8 +4282,8 @@ declare const threadTimelinePendingTodosSchema: z$1.ZodObject<{
 type ThreadTimelinePendingTodos = z$1.infer<typeof threadTimelinePendingTodosSchema>;
 
 declare const threadParentNotificationsSchema: z$1.ZodEnum<{
-    auto: "auto";
     off: "off";
+    auto: "auto";
     stuck: "stuck";
 }>;
 type ThreadParentNotifications = z$1.infer<typeof threadParentNotificationsSchema>;
@@ -4346,12 +4346,12 @@ declare const threadQueuedMessageSchema: z$1.ZodObject<{
                 }>;
                 name: z$1.ZodString;
                 source: z$1.ZodEnum<{
-                    skill: "skill";
                     command: "command";
+                    skill: "skill";
                 }>;
                 origin: z$1.ZodEnum<{
-                    user: "user";
                     project: "project";
+                    user: "user";
                     builtin: "builtin";
                 }>;
                 label: z$1.ZodString;
@@ -4397,8 +4397,8 @@ declare const threadQueuedMessageSchema: z$1.ZodObject<{
     model: z$1.ZodString;
     reasoningLevel: z$1.ZodString;
     permissionMode: z$1.ZodEnum<{
-        full: "full";
         auto: "auto";
+        full: "full";
         "accept-edits": "accept-edits";
     }>;
     serviceTier: z$1.ZodString;
@@ -7456,8 +7456,8 @@ declare const hostDaemonCommandRegistry: {
             skillFilePath: z$1.ZodString;
         }, z$1.core.$strict>], "kind">>;
         instructionMode: z$1.ZodEnum<{
-            replace: "replace";
             append: "append";
+            replace: "replace";
         }>;
         type: z$1.ZodLiteral<"thread.rewind.prepare">;
         leaseId: z$1.ZodString;
@@ -7605,8 +7605,8 @@ declare const hostDaemonCommandRegistry: {
             skillFilePath: z$1.ZodString;
         }, z$1.core.$strict>], "kind">>;
         instructionMode: z$1.ZodEnum<{
-            replace: "replace";
             append: "append";
+            replace: "replace";
         }>;
         type: z$1.ZodLiteral<"thread.start">;
         requestId: z$1.ZodString;
@@ -8069,8 +8069,8 @@ declare const hostDaemonCommandRegistry: {
                 envPassthrough: z$1.ZodArray<z$1.ZodString>;
             }, z$1.core.$strict>;
             instructionMode: z$1.ZodEnum<{
-                replace: "replace";
                 append: "append";
+                replace: "replace";
             }>;
             projectId: z$1.ZodString;
             providerId: z$1.ZodString;
@@ -8285,8 +8285,8 @@ declare const hostDaemonCommandRegistry: {
                 envPassthrough: z$1.ZodArray<z$1.ZodString>;
             }, z$1.core.$strict>;
             instructionMode: z$1.ZodEnum<{
-                replace: "replace";
                 append: "append";
+                replace: "replace";
             }>;
             projectId: z$1.ZodString;
             providerId: z$1.ZodString;
@@ -9187,13 +9187,13 @@ declare const hostDaemonCommandRegistry: {
         modifiedAtMs: z$1.ZodOptional<z$1.ZodNumber>;
         sha256: z$1.ZodString;
     }, z$1.core.$strip>, z$1.ZodObject<{
-        path: z$1.ZodString;
         contentEncoding: z$1.ZodEnum<{
             base64: "base64";
             utf8: "utf8";
         }>;
         sha256: z$1.ZodString;
         sizeBytes: z$1.ZodNumber;
+        path: z$1.ZodString;
         mimeType: z$1.ZodOptional<z$1.ZodString>;
         modifiedAtMs: z$1.ZodOptional<z$1.ZodNumber>;
         notModified: z$1.ZodLiteral<true>;
@@ -9511,8 +9511,8 @@ declare const hostDaemonCommandRegistry: {
         installed: z$1.ZodBoolean;
         installSource: z$1.ZodEnum<{
             notInstalled: "notInstalled";
-            npmGlobal: "npmGlobal";
             external: "external";
+            npmGlobal: "npmGlobal";
         }>;
         currentVersion: z$1.ZodNullable<z$1.ZodString>;
         latestVersion: z$1.ZodNullable<z$1.ZodString>;
@@ -10062,8 +10062,8 @@ declare const providerCliStatusResponseSchema: z$1.ZodRecord<z$1.ZodString, z$1.
     installed: z$1.ZodBoolean;
     installSource: z$1.ZodEnum<{
         notInstalled: "notInstalled";
-        npmGlobal: "npmGlobal";
         external: "external";
+        npmGlobal: "npmGlobal";
     }>;
     currentVersion: z$1.ZodNullable<z$1.ZodString>;
     latestVersion: z$1.ZodNullable<z$1.ZodString>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halcyonlabs/app",
-  "version": "0.47.0-halcyon.101",
+  "version": "0.47.0-halcyon.102",
   "description": "bb app launcher for npx",
   "keywords": [
     "bb",

package/server/dist/builtin-plugins/orbit/dist/assets/orbit/bundle/scripts/orbit-job-supervisor

@@ -22,7 +22,10 @@ START_HEADROOM = 5_000_000_000
 # to free file entries on filesystems that have a fixed number of them.
 INODE_FLOOR = 500_000
 START_INODE_HEADROOM = 500_000
-CONCURRENT_JOBS = 2
+MIN_CONCURRENT_JOBS = 2
+MAX_CONCURRENT_JOBS = 8
+JOB_MEMORY_BYTES = 6 * 2**30
+DESKTOP_MEMORY_BYTES = 6 * 2**30
 CAPACITY_FULL_STATUS = 75
 LIMITS = dict(retained_bytes=RETAINED_JOB_BYTES)
 # Records written before the free-space rule carry the old fixed caps. They load
@@ -213,6 +216,61 @@ def write_record(directory, name, value, exclusive=False):
         raise
 
 
+def machine_concurrency(memory, cores, override):
+    if override is not None:
+        if not re.fullmatch('[0-9]{1,9}', override):
+            raise ValueError('Job concurrency override must be a positive whole number.')
+        requested = int(override)
+        if requested < 1:
+            raise ValueError('Job concurrency override must be a positive whole number.')
+        slots = max(MIN_CONCURRENT_JOBS, min(MAX_CONCURRENT_JOBS, requested))
+        return slots, f'override {requested}; floor {MIN_CONCURRENT_JOBS}, ceiling {MAX_CONCURRENT_JOBS}'
+    memory_slots = max(0, memory - DESKTOP_MEMORY_BYTES) // JOB_MEMORY_BYTES
+    core_slots = cores // 3
+    slots = max(MIN_CONCURRENT_JOBS, min(MAX_CONCURRENT_JOBS, memory_slots, core_slots))
+    return slots, (f'{memory / 2**30:.1f} GiB RAM minus 6 GiB for desktop, antfly and main session; '
+                   f'6 GiB per job gives {memory_slots} slots; {cores} cores / 3 gives {core_slots}; '
+                   f'floor {MIN_CONCURRENT_JOBS}, ceiling {MAX_CONCURRENT_JOBS}')
+
+
+def machine_resources():
+    if sys.platform == 'darwin':
+        import subprocess
+        try:
+            memory = int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'], timeout=5))
+        except subprocess.SubprocessError as error:
+            raise OSError('Machine memory reading failed.') from error
+    else:
+        memory = os.sysconf('SC_PHYS_PAGES') * os.sysconf('SC_PAGE_SIZE')
+    cores = os.cpu_count()
+    if memory <= 0 or cores is None or cores <= 0:
+        raise ValueError('Machine memory or core count is unavailable.')
+    return memory, cores
+
+
+def concurrent_jobs(state):
+    try:
+        fd = os.open('concurrency', os.O_RDONLY | os.O_NOFOLLOW | os.O_CLOEXEC | os.O_NONBLOCK, dir_fd=state)
+    except FileNotFoundError:
+        override = None
+    else:
+        with os.fdopen(fd) as stream:
+            metadata = os.fstat(stream.fileno())
+            if not stat.S_ISREG(metadata.st_mode) or metadata.st_size > 32:
+                raise ValueError('Invalid job concurrency override file.')
+            override = stream.read(33).strip()
+    try:
+        memory, cores = machine_resources()
+        slots, reason = machine_concurrency(memory, cores, override)
+    except (OSError, ValueError) as error:
+        if override is not None:
+            slots, reason = machine_concurrency(0, 0, override)
+        else:
+            slots, reason = MIN_CONCURRENT_JOBS, f'machine reading unavailable: {error}; floor {MIN_CONCURRENT_JOBS}'
+    print(f'Job concurrency: {slots}; {reason}.', file=sys.stderr)
+    return slots
+
+
 class Workspaces:
     """A single supervisor owns these roots, inaccessible to workers.
 
@@ -279,7 +337,7 @@ class Workspaces:
                     self.environment(existing['id'])
                 return existing
             slots = [r for r in records if holds_slot(r)]
-            if len(slots) >= CONCURRENT_JOBS:
+            if len(slots) >= concurrent_jobs(self.state):
                 raise CapacityFull('Job capacity is reserved; wait for disposal.')
             if not workspace:
                 if type(free) is not int or free < MAIN_FREE_FLOOR:
@@ -528,7 +586,7 @@ class Workspaces:
                 return manifest
             if manifest['state'] != 'parked':
                 raise ValueError('Only a parked job can take a slot again.')
-            if len([r for r in self.records() if holds_slot(r)]) >= CONCURRENT_JOBS:
+            if len([r for r in self.records() if holds_slot(r)]) >= concurrent_jobs(self.state):
                 raise CapacityFull('Job capacity is reserved; wait for disposal.')
             return self.save_transition(manifest, 'running')
 
@@ -1267,6 +1325,10 @@ def managed_operation(store, account, request):
         finally:
             os.close(root)
     elif request['operation'] == 'measure':
+        try:
+            concurrent_jobs(store.state)
+        except (OSError, ValueError) as error:
+            print(f'Job concurrency setting could not be read: {error}', file=sys.stderr)
         if request.get('size', True) not in (True, False):
             raise ValueError('Invalid measure request.')
         print(json.dumps(store.measure(request['id'], sized=request.get('size', True))))

package/server/dist/builtin-plugins/orbit/dist/assets/orbit/revision

@@ -1 +1 @@
-f1059d04b641d9927b443da4711ba9c7639a9d7b
+7e8f8d1775099aa18db90f3e32a42f00d3947c08