@halcyonlabs/app 0.47.0-halcyon.331 → 0.47.0-halcyon.333

package/dist/index.d.ts

@@ -316,8 +316,8 @@ declare const appKeybindingOverridesSchema: z$1.ZodArray<z$1.ZodObject<{
         shift: z$1.ZodBoolean;
     }, z$1.core.$strict>>;
     platform: z$1.ZodOptional<z$1.ZodEnum<{
-        windows: "windows";
         mac: "mac";
+        windows: "windows";
         linux: "linux";
     }>>;
 }, z$1.core.$strict>>;
@@ -524,8 +524,8 @@ declare const environmentSchema: z$1.ZodObject<{
         retireAt: z$1.ZodNullable<z$1.ZodNumber>;
         teardown: z$1.ZodNullable<z$1.ZodObject<{
             status: z$1.ZodEnum<{
-                running: "running";
                 failed: "failed";
+                running: "running";
                 removed: "removed";
             }>;
             attempt: z$1.ZodNumber;
@@ -620,8 +620,8 @@ declare const hostSchema: z$1.ZodObject<{
         pendingLog: z$1.ZodString;
         teardown: z$1.ZodNullable<z$1.ZodObject<{
             status: z$1.ZodEnum<{
-                running: "running";
                 failed: "failed";
+                running: "running";
                 removed: "removed";
             }>;
             attempt: z$1.ZodNumber;
@@ -732,8 +732,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
     providerThreadId: z$1.ZodString;
     objective: z$1.ZodString;
     status: z$1.ZodEnum<{
-        paused: "paused";
         active: "active";
+        paused: "paused";
         budgetLimited: "budgetLimited";
         complete: "complete";
     }>;
@@ -1304,9 +1304,9 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
             step: z$1.ZodString;
             status: z$1.ZodOptional<z$1.ZodEnum<{
                 pending: "pending";
+                active: "active";
                 completed: "completed";
                 failed: "failed";
-                active: "active";
             }>>;
         }, z$1.core.$strip>>;
         explanation: z$1.ZodOptional<z$1.ZodString>;
@@ -1385,10 +1385,10 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         }>;
         taskStatus: z$1.ZodEnum<{
             pending: "pending";
-            running: "running";
-            paused: "paused";
             completed: "completed";
             failed: "failed";
+            paused: "paused";
+            running: "running";
             killed: "killed";
             stopped: "stopped";
         }>;
@@ -1405,8 +1405,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 index: z$1.ZodNumber;
                 label: z$1.ZodString;
                 state: z$1.ZodEnum<{
-                    running: "running";
                     failed: "failed";
+                    running: "running";
                     queued: "queued";
                     done: "done";
                     skipped: "skipped";
@@ -2076,9 +2076,9 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
             step: z$1.ZodString;
             status: z$1.ZodOptional<z$1.ZodEnum<{
                 pending: "pending";
+                active: "active";
                 completed: "completed";
                 failed: "failed";
-                active: "active";
             }>>;
         }, z$1.core.$strip>>;
         explanation: z$1.ZodOptional<z$1.ZodString>;
@@ -2157,10 +2157,10 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         }>;
         taskStatus: z$1.ZodEnum<{
             pending: "pending";
-            running: "running";
-            paused: "paused";
             completed: "completed";
             failed: "failed";
+            paused: "paused";
+            running: "running";
             killed: "killed";
             stopped: "stopped";
         }>;
@@ -2177,8 +2177,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 index: z$1.ZodNumber;
                 label: z$1.ZodString;
                 state: z$1.ZodEnum<{
-                    running: "running";
                     failed: "failed";
+                    running: "running";
                     queued: "queued";
                     done: "done";
                     skipped: "skipped";
@@ -2389,10 +2389,10 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         }>;
         taskStatus: z$1.ZodEnum<{
             pending: "pending";
-            running: "running";
-            paused: "paused";
             completed: "completed";
             failed: "failed";
+            paused: "paused";
+            running: "running";
             killed: "killed";
             stopped: "stopped";
         }>;
@@ -2409,8 +2409,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 index: z$1.ZodNumber;
                 label: z$1.ZodString;
                 state: z$1.ZodEnum<{
-                    running: "running";
                     failed: "failed";
+                    running: "running";
                     queued: "queued";
                     done: "done";
                     skipped: "skipped";
@@ -2488,10 +2488,10 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         }>;
         taskStatus: z$1.ZodEnum<{
             pending: "pending";
-            running: "running";
-            paused: "paused";
             completed: "completed";
             failed: "failed";
+            paused: "paused";
+            running: "running";
             killed: "killed";
             stopped: "stopped";
         }>;
@@ -2508,8 +2508,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
                 index: z$1.ZodNumber;
                 label: z$1.ZodString;
                 state: z$1.ZodEnum<{
-                    running: "running";
                     failed: "failed";
+                    running: "running";
                     queued: "queued";
                     done: "done";
                     skipped: "skipped";
@@ -2704,9 +2704,9 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
         step: z$1.ZodString;
         status: z$1.ZodOptional<z$1.ZodEnum<{
             pending: "pending";
+            active: "active";
             completed: "completed";
             failed: "failed";
-            active: "active";
         }>>;
     }, z$1.core.$strip>>;
     explanation: z$1.ZodOptional<z$1.ZodString>;
@@ -2715,8 +2715,8 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
     threadId: z$1.ZodString;
     providerThreadId: z$1.ZodString;
     state: z$1.ZodEnum<{
-        running: "running";
         idle: "idle";
+        running: "running";
     }>;
 }, z$1.core.$strip>, z$1.ZodObject<{
     type: z$1.ZodLiteral<"turn/diff/updated">;
@@ -3578,9 +3578,9 @@ declare const threadEventSchema: z$1.ZodUnion<readonly [z$1.ZodIntersection<z$1.
     threadId: z$1.ZodString;
     provisioningId: z$1.ZodString;
     status: z$1.ZodEnum<{
+        active: "active";
         completed: "completed";
         failed: "failed";
-        active: "active";
         cancelled: "cancelled";
     }>;
     environmentId: z$1.ZodNullable<z$1.ZodString>;
@@ -5766,9 +5766,9 @@ declare const hostDaemonCommandRegistry: {
     }, z$1.core.$strict>, z$1.ZodDiscriminatedUnion<[z$1.ZodObject<{
         kind: z$1.ZodLiteral<"wording">;
         status: z$1.ZodEnum<{
-            unavailable: "unavailable";
             pass: "pass";
             revise: "revise";
+            unavailable: "unavailable";
         }>;
     }, z$1.core.$strict>, z$1.ZodObject<{
         kind: z$1.ZodLiteral<"review">;
@@ -6129,8 +6129,8 @@ declare const hostDaemonCommandRegistry: {
             skillFilePath: z$1.ZodString;
         }, z$1.core.$strict>], "kind">>;
         instructionMode: z$1.ZodEnum<{
-            append: "append";
             replace: "replace";
+            append: "append";
         }>;
         type: z$1.ZodLiteral<"thread.rewind.prepare">;
         leaseId: z$1.ZodString;
@@ -6278,8 +6278,8 @@ declare const hostDaemonCommandRegistry: {
             skillFilePath: z$1.ZodString;
         }, z$1.core.$strict>], "kind">>;
         instructionMode: z$1.ZodEnum<{
-            append: "append";
             replace: "replace";
+            append: "append";
         }>;
         type: z$1.ZodLiteral<"thread.start">;
         requestId: z$1.ZodString;
@@ -6742,8 +6742,8 @@ declare const hostDaemonCommandRegistry: {
                 envPassthrough: z$1.ZodArray<z$1.ZodString>;
             }, z$1.core.$strict>;
             instructionMode: z$1.ZodEnum<{
-                append: "append";
                 replace: "replace";
+                append: "append";
             }>;
             projectId: z$1.ZodString;
             providerId: z$1.ZodString;
@@ -6958,8 +6958,8 @@ declare const hostDaemonCommandRegistry: {
                 envPassthrough: z$1.ZodArray<z$1.ZodString>;
             }, z$1.core.$strict>;
             instructionMode: z$1.ZodEnum<{
-                append: "append";
                 replace: "replace";
+                append: "append";
             }>;
             projectId: z$1.ZodString;
             providerId: z$1.ZodString;
@@ -7860,13 +7860,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>;
@@ -8131,8 +8131,8 @@ declare const hostDaemonCommandRegistry: {
         supported: z$1.ZodLiteral<true>;
         health: z$1.ZodObject<{
             status: z$1.ZodEnum<{
-                ready: "ready";
                 unknown: "unknown";
+                ready: "ready";
                 not_installed: "not_installed";
                 unauthenticated: "unauthenticated";
                 expired: "expired";
@@ -8184,8 +8184,8 @@ declare const hostDaemonCommandRegistry: {
         installed: z$1.ZodBoolean;
         installSource: z$1.ZodEnum<{
             notInstalled: "notInstalled";
-            external: "external";
             npmGlobal: "npmGlobal";
+            external: "external";
         }>;
         currentVersion: z$1.ZodNullable<z$1.ZodString>;
         latestVersion: z$1.ZodNullable<z$1.ZodString>;
@@ -8735,8 +8735,8 @@ declare const providerCliStatusResponseSchema: z$1.ZodRecord<z$1.ZodString, z$1.
     installed: z$1.ZodBoolean;
     installSource: z$1.ZodEnum<{
         notInstalled: "notInstalled";
-        external: "external";
         npmGlobal: "npmGlobal";
+        external: "external";
     }>;
     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.331",
+  "version": "0.47.0-halcyon.333",
   "description": "bb app launcher for npx",
   "keywords": [
     "bb",

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

@@ -18,7 +18,9 @@ import subprocess
 RESULT_SPACE_FLOOR = 1_000_000
 MAIN_FREE_FLOOR = 15_000_000_000
 START_HEADROOM = 5_000_000_000
-EXPECTED_BUILD_BYTES = 5_500_000_000
+EXPECTED_JOB_BYTES = 1_600_000_000
+MIN_JOB_BYTES = 200_000_000
+JOB_HISTORY_LENGTH = 16
 # Many tiny files can exhaust inodes while bytes remain: the same rule applies
 # to free file entries on filesystems that have a fixed number of them.
 INODE_FLOOR = 500_000
@@ -389,6 +391,7 @@ class Workspaces:
                                        f"{gigabytes(settings['disk_free_bytes'] + retained)} GB there. Free space on it first.")
             # Persist ownership first. A crash before mkdir still leaves a reserved
             # attempt which restart must explicitly finish, never silently forget.
+            write_record(self.state, manifest['id'] + '.expected', self.expected_job_bytes())
             write_record(self.state, manifest['id'] + '.json', manifest, exclusive=True)
             if not workspace:
                 return manifest
@@ -404,28 +407,57 @@ class Workspaces:
             self.environment(manifest['id'])
             return manifest
 
+    def job_history(self):
+        raw = ledger_setting(self.state, 'job-footprints', 4096)
+        history = [] if raw is None else json.loads(raw)
+        if (not isinstance(history, list) or len(history) > JOB_HISTORY_LENGTH
+                or any(type(n) is not int or not 0 <= n <= 2**63 - 1 for n in history)):
+            raise ValueError('Invalid finished job footprints.')
+        return history
+
+    def expected_job_bytes(self, job_id=None):
+        if job_id is not None:
+            raw = ledger_setting(self.state, job_id + '.expected', 32)
+            if raw is not None:
+                value = json.loads(raw)
+                if type(value) is not int or not MIN_JOB_BYTES <= value <= 2**63 - 1:
+                    raise ValueError('Invalid job growth reservation.')
+                return value
+        history = self.job_history()
+        return min(EXPECTED_JOB_BYTES, max(MIN_JOB_BYTES, max(history) * 3 // 2)) if history else EXPECTED_JOB_BYTES
+
+    def remember_footprint(self, manifest):
+        if not has_workspace(manifest):
+            return
+        try:
+            usage = self.usage(manifest['id'])
+            if usage['complete']:
+                history = self.job_history()
+                write_record(self.state, 'job-footprints', (history + [usage['bytes']])[-JOB_HISTORY_LENGTH:])
+        except (OSError, ValueError):
+            return
+
     def start_space(self, records, settings, keep=None):
-        raw = ledger_setting(self.state, 'expected-build-bytes', 32)
-        previous = EXPECTED_BUILD_BYTES if raw is None else int(raw)
-        if not EXPECTED_BUILD_BYTES <= previous <= 2**63 - 1:
-            raise ValueError('Invalid measured build footprint.')
-        expected = max(previous, settings['disk_start_headroom_bytes'])
-        sizes = {}
+        expected = self.expected_job_bytes(keep)
+        outstanding = 0
+        kept_size = 0
+        deadline = time.monotonic() + 5
         for record in records:
             if not holds_slot(record) and record['id'] != keep:
                 continue
-            if has_workspace(record):
-                usage = self.usage(record['id'])
-                if not usage['complete']:
-                    raise CapacityFull('Expected build growth cannot be checked; waiting for a complete workspace measurement.')
-                sizes[record['id']] = usage['bytes']
-                expected = max(expected, usage['bytes'])
+            size = 0
+            if has_workspace(record) and time.monotonic() < deadline:
+                try:
+                    usage = self.usage(record['id'], deadline=deadline)
+                    if usage['complete']:
+                        size = usage['bytes']
+                except (OSError, ValueError):
+                    pass
+            if record['id'] == keep:
+                kept_size = size
             else:
-                sizes[record['id']] = 0
-        if expected > previous:
-            write_record(self.state, 'expected-build-bytes', expected)
-        outstanding = sum(max(0, expected - size) for job, size in sizes.items() if job != keep)
-        new_growth = max(0, expected - sizes.get(keep, 0))
+                outstanding += max(0, self.expected_job_bytes(record['id']) - size)
+        new_growth = max(settings['disk_start_headroom_bytes'], expected - kept_size)
         return settings['disk_free_bytes'] + outstanding + new_growth
 
     def require_admission(self, records):
@@ -492,7 +524,7 @@ class Workspaces:
 
 
 
-    def usage(self, job_id):
+    def usage(self, job_id, *, deadline=None):
         """Size a workspace to choose which job to stop when the disk is low.
 
         The walk is bounded to five seconds. A walk cut short by the time limit
@@ -505,23 +537,24 @@ class Workspaces:
         self.read(job_id)
         root = self.open_workspace(job_id)
         device = os.fstat(root).st_dev
-        stack = [(root, os.scandir(root))]
-        deadline = time.monotonic() + 5
+        stack = [(root, os.scandir(root), '')]
+        deadline = min(deadline, time.monotonic() + 5) if deadline is not None else time.monotonic() + 5
         try:
             return self._walk(stack, device, deadline)
         finally:
-            for fd, entries in reversed(stack):
+            for fd, entries, _ in reversed(stack):
                 entries.close()
                 os.close(fd)
 
     def _walk(self, stack, device, deadline):
         files = size = 0
+        complete = True
         seen = set()
         try:
             while stack:
                 if time.monotonic() > deadline:
                     return dict(files=files, bytes=size, complete=False)
-                current, entries = stack[-1]
+                current, entries, parent = stack[-1]
                 entry = next(entries, None)
                 if entry is None:
                     entries.close()
@@ -540,6 +573,15 @@ class Workspaces:
                     size += metadata.st_blocks * 512
                     seen.add(identity)
                 if stat.S_ISDIR(metadata.st_mode):
+                    if entry.name in MEASUREMENT_SKIPPED or (entry.name == 'build' and parent == 'results'):
+                        child = os.open(entry.name, DIR_FLAGS, dir_fd=current)
+                        try:
+                            with os.scandir(child) as skipped:
+                                if next(skipped, None) is not None:
+                                    complete = False
+                        finally:
+                            os.close(child)
+                        continue
                     try:
                         child = os.open(entry.name, DIR_FLAGS, dir_fd=current)
                     except OSError as error:
@@ -549,8 +591,8 @@ class Workspaces:
                     if os.fstat(child).st_dev != device:
                         os.close(child)
                         raise ValueError('A workspace cannot contain another filesystem.')
-                    stack.append((child, os.scandir(child)))
-            return dict(files=files, bytes=size, complete=True)
+                    stack.append((child, os.scandir(child), entry.name))
+            return dict(files=files, bytes=size, complete=complete)
         except OSError:
             return dict(files=files, bytes=size, complete=False)
 
@@ -784,6 +826,8 @@ class Workspaces:
             return self.save_transition(manifest, 'closed')
 
     def save_transition(self, manifest, state, reason=None):
+        if state == 'stopping' and reason == 'finished':
+            self.remember_footprint(manifest)
         updated = transition(manifest, state, reason)
         write_record(self.state, manifest['id'] + '.json', updated)
         return updated
@@ -1577,6 +1621,7 @@ def darwin_workspace_users(workspace):
 
 UNPUSHED_SKIPPED = frozenset(('.git', 'node_modules', 'target', '.orbit-build', 'cargo-home', 'cargo-target',
                               'npm-cache', 'pnpm-store', 'pnpm-home', 'cache'))
+MEASUREMENT_SKIPPED = frozenset(('node_modules', 'target', 'cargo-target', 'pnpm-store', 'npm-cache'))
 UNPUSHED_DEPTH = 6
 UNPUSHED_SECONDS = 30
 GIT_SECONDS = 20
@@ -1586,40 +1631,58 @@ GIT_SAFE = ('-c', 'core.fsmonitor=false', '-c', 'core.hooksPath=/dev/null', '-c'
 
 
 def git_checkouts(root, deadline, include_build=False):
-    def refuse(error):
-        raise error
-
     found = []
-    for directory, folders, files in os.walk(root, onerror=refuse):
+    pending = [Path(root)]
+    while pending:
         if time.monotonic() > deadline:
             raise ValueError('Searching the work folder for Git checkouts took too long.')
-        here = Path(directory)
-        checkout = '.git' in folders or '.git' in files or (include_build and {'HEAD', 'objects', 'config'}.issubset(set(folders) | set(files)))
-        if '.git' in folders and not (here / '.git').is_symlink():
-            with os.scandir(here / '.git') as entries:
-                checkout = next(entries, None) is not None
-        if checkout:
+        here = pending.pop()
+        folders = []
+        markers = set()
+        checkout = False
+        with os.scandir(here) as entries:
+            for entry in entries:
+                if time.monotonic() > deadline:
+                    raise ValueError('Searching the work folder for Git checkouts took too long.')
+                if entry.name in ('HEAD', 'objects', 'config'):
+                    markers.add(entry.name)
+                if entry.name == '.git':
+                    if entry.is_dir(follow_symlinks=False):
+                        with os.scandir(entry.path) as metadata:
+                            checkout = next(metadata, None) is not None
+                    else:
+                        checkout = True
+                if not entry.is_dir(follow_symlinks=False):
+                    continue
+                if entry.name in UNPUSHED_SKIPPED and not (include_build and entry.name == '.orbit-build'):
+                    continue
+                if here.name == 'results' and entry.name == 'build':
+                    continue
+                if include_build or len(here.relative_to(root).parts) < UNPUSHED_DEPTH:
+                    folders.append(entry.name)
+        if checkout or (include_build and {'HEAD', 'objects', 'config'}.issubset(markers)):
             found.append(here)
-        if not include_build and len(here.relative_to(root).parts) >= UNPUSHED_DEPTH:
-            folders[:] = []
-        else:
-            folders[:] = sorted(name for name in folders if name not in UNPUSHED_SKIPPED or (include_build and name == '.orbit-build'))
+        pending.extend(here / name for name in sorted(folders, reverse=True))
     return found
 
 
-def git_output(account, checkout, name, *args, allowed=(0,), stdin='', offline=False):
+def git_output(account, checkout, name, *args, allowed=(0,), stdin='', offline=False, deadline=None):
     import shutil
     import subprocess
     program = shutil.which('git', path=GIT_PATH)
     if program is None:
         raise ValueError('Git is not installed, so unpushed work cannot be checked.')
     environment = dict(PATH=GIT_PATH, HOME=account.pw_dir, LC_ALL='C', GIT_CONFIG_NOSYSTEM='1',
-                       GIT_CONFIG_GLOBAL='/dev/null', GIT_OPTIONAL_LOCKS='0', GIT_TERMINAL_PROMPT='0')
+                       GIT_CONFIG_GLOBAL='/dev/null', GIT_OPTIONAL_LOCKS='0', GIT_TERMINAL_PROMPT='0',
+                       GIT_CEILING_DIRECTORIES=str(Path(checkout).parent))
     if offline:
         environment.update(GIT_NO_LAZY_FETCH='1', GIT_ALLOW_PROTOCOL='', GIT_PAGER='cat')
+    timeout = GIT_SECONDS if deadline is None else min(GIT_SECONDS, deadline - time.monotonic())
+    if timeout <= 0:
+        raise ValueError('Checking the work folder for unpushed commits took too long.')
     try:
         result = subprocess.run([program, '-C', str(checkout), *GIT_SAFE, *args], cwd='/', env=environment, input=stdin,
-                                capture_output=True, text=True, errors='replace', timeout=GIT_SECONDS)
+                                capture_output=True, text=True, errors='replace', timeout=timeout)
     except subprocess.TimeoutExpired:
         raise ValueError(f'Git took too long to read {name}.')
     if result.returncode not in allowed:
@@ -1628,9 +1691,9 @@ def git_output(account, checkout, name, *args, allowed=(0,), stdin='', offline=F
     return result
 
 
-def unpushed_checkout(account, checkout, name):
+def unpushed_checkout(account, checkout, name, deadline=None):
     def git(*args, allowed=(0,)):
-        return git_output(account, checkout, name, *args, allowed=allowed)
+        return git_output(account, checkout, name, *args, allowed=allowed, deadline=deadline)
 
     def count(*revisions):
         return int(git('rev-list', '--count', *revisions).stdout.strip() or '0')
@@ -1666,7 +1729,7 @@ def search_unpushed(root, account, seconds, include_build=False):
         if time.monotonic() > deadline:
             raise ValueError('Checking the work folder for unpushed commits took too long.')
         name = str(checkout.relative_to(root))
-        work = unpushed_checkout(account, checkout, name)
+        work = unpushed_checkout(account, checkout, name, deadline)
         if work['branches'] or work['detached'] or work['uncommitted'] or work['untracked'] or work['stashes']:
             found.append(dict(path=name, **work))
     return dict(checkouts=found)

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

@@ -1 +1 @@
-7ba07c6b01118e277b923dec7e5cb77ce7a86a89
+55a68a0b352242b1c815daadd214812f7764a927