multiplane 0.3.6 → 0.3.8

package/LICENSE

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.en.md

@@ -127,11 +127,14 @@ For the full contract, patterns that break determinism, and 3D layer usage, see
 | `multiplane status <job>` | View job status |
 | `multiplane cancel <job>` | Stop a job |
 | `multiplane wait <job>` | Wait for a job to finish and print its events, for example after an agent session restarts |
+| `multiplane resume <job>` | Continue an interrupted render from where it stopped |
 | `multiplane config get\|set\|unset` | Read or change the user config |
 | `multiplane skill status\|install\|remove` | Install, update or remove the agent skill for Claude Code and Codex |
 
 Shot paths are relative to the resource root `--root` (the current directory by default). Each run has its own job directory, `out/jobs/<jobId>/`. Without `--out`, artifacts are written there (video, `stills/`, `verify/`), so runs do not overwrite each other. See `artifacts` in the result for the final paths. `--out` sets the output location. An existing target is rejected unless `--overwrite` is given. `render`, `stills`, and `verify` automatically run `lint` before starting and stop on errors. Use `--no-lint` to skip it. `npx multiplane <command> --help` lists all options for that command.
 
+`render` encodes in segments of about 10 seconds and keeps each one on disk as soon as it is done. If a render stops part way (the process is killed, the machine crashes or loses power, the browser keeps crashing, or you stop it), `multiplane resume <job>` skips the segments already encoded, renders the rest and joins them without re-encoding; the frames are identical to an uninterrupted render. A resume keeps all of the original job's options. It is refused (`resume_unavailable`) when a file the shot loaded has changed or the Multiplane, Chromium or FFmpeg version differs, so a film is never joined from mismatched parts. See section 6.1 of the protocol.
+
 Common `render` options:
 
 | Option | Meaning |

package/README.md

@@ -127,11 +127,14 @@ Shot.define({
 | `multiplane status <job>` | 查看作业状态 |
 | `multiplane cancel <job>` | 停止作业 |
 | `multiplane wait <job>` | 等一个作业结束并输出它的事件，例如 agent 会话重启之后 |
+| `multiplane resume <job>` | 中断的渲染从停下的地方接着渲 |
 | `multiplane config get\|set\|unset` | 读取或修改用户配置 |
 | `multiplane skill status\|install\|remove` | 给 Claude Code 和 Codex 安装、更新、移除 agent skill |
 
 镜头路径相对资源根 `--root`（默认当前目录）。每次运行都有自己的作业目录 `out/jobs/<jobId>/`，不给 `--out` 时产物就写在里面（视频、`stills/`、`verify/`），多次运行互不覆盖；最终路径见结果里的 `artifacts`。`--out` 指定输出位置，目标已存在时会拒绝覆盖，加 `--overwrite` 才替换。`render`、`stills`、`verify` 启动前自动跑 `lint`，有 error 就停下，`--no-lint` 跳过。`npx multiplane <command> --help` 列出该命令的全部参数。
 
+`render` 按约 10 秒一段编码，每段编完就落盘。渲染中途停下（进程被杀、死机、断电、浏览器反复崩溃、手动停止）后，`multiplane resume <job>` 会跳过已经编好的段、只渲剩下的，最后不重新编码地拼成成片，画面与一次渲完的逐帧相同。续传沿用原作业的全部参数；镜头加载过的文件改了，或 Multiplane、Chromium、FFmpeg 版本变了，会拒绝续传（`resume_unavailable`），以免拼出前后不一致的片子。见协议第 6.1 节。
+
 `render` 的常用参数：
 
 | 参数 | 含义 |

package/THIRD_PARTY_NOTICES.md

@@ -1,30 +1,30 @@
-# 第三方声明
-
-Multiplane 使用以下依赖；它们保留各自的版权和许可，不因本项目的 Apache-2.0 许可而改变。
-
-| 组件 | 本次锁定版本 | 许可与原文 | 用途 |
-|---|---|---|---|
-| [Playwright](https://github.com/microsoft/playwright) / playwright-core | 1.63.0 | Apache-2.0：[LICENSE](licenses/playwright-LICENSE)、[NOTICE](licenses/playwright-NOTICE)、[Playwright 第三方声明](licenses/playwright-ThirdPartyNotices.txt)、[core 第三方声明](licenses/playwright-core-ThirdPartyNotices.txt) | 安装和控制 Chromium |
-| [sharp](https://github.com/lovell/sharp) | 0.35.5 | Apache-2.0：[LICENSE](licenses/sharp-LICENSE) | PNG 解码和缩放 |
-| sharp Windows x64 原生依赖 | 0.35.5 | Apache-2.0 AND LGPL-3.0-or-later：[包许可](licenses/sharp-win32-x64-LICENSE)、[上游第三方组件声明](licenses/sharp-win32-x64-NOTICES.md)、[LGPLv3](licenses/LGPL-3.0.txt)、[GPLv3](licenses/GPL-3.0.txt) | 原生图像处理，包含 libvips 等组件 |
-| [three.js](https://github.com/mrdoob/three.js) | 0.180.0 | MIT：[LICENSE](licenses/three-LICENSE) | 可选三维层 |
-| @img/colour | 随 lockfile 固定 | MIT：[LICENSE](licenses/colour-LICENSE.md) | sharp 间接依赖 |
-| detect-libc | 随 lockfile 固定 | Apache-2.0：[LICENSE](licenses/detect-libc-LICENSE) | sharp 平台检测 |
-| semver | 随 lockfile 固定 | ISC：[LICENSE](licenses/semver-LICENSE) | 版本解析 |
-| Roboto 可变字体 | Google Fonts 原始 TTF | SIL OFL 1.1：[OFL 原文](examples/assets/OFL.txt) | 文字示例 |
-| [Acorn](https://github.com/acornjs/acorn) | 8.15.0 | MIT：[LICENSE](licenses/acorn-LICENSE) | JavaScript 静态语法与位置解析 |
-| [parse5](https://github.com/inikulin/parse5) | 7.3.0 | MIT：[LICENSE](licenses/parse5-LICENSE) | HTML 元素、属性和内联源码位置解析 |
-| [PostCSS](https://github.com/postcss/postcss) | 8.5.28 | MIT：[LICENSE](licenses/postcss-LICENSE) | CSS 规则与声明解析；禁用 source map 读取 |
-| [postcss-value-parser](https://github.com/TrySound/postcss-value-parser) | 4.2.0 | MIT：[LICENSE](licenses/postcss-value-parser-LICENSE) | CSS 资源 URL 与字符串解析 |
-| entities | 6.0.1 | BSD-2-Clause：[LICENSE](licenses/entities-LICENSE) | parse5 间接依赖，HTML 实体解码 |
-| nanoid | 3.3.19 | MIT：[LICENSE](licenses/nanoid-LICENSE) | PostCSS 间接依赖 |
-| picocolors | 1.1.1 | ISC：[LICENSE](licenses/picocolors-LICENSE) | PostCSS 间接依赖，诊断颜色工具 |
-| source-map-js | 1.2.2 | BSD-3-Clause：[LICENSE](licenses/source-map-js-LICENSE) | PostCSS 间接依赖，source map 工具 |
-
-Roboto 文件从 [Google Fonts 的 Roboto 目录](https://github.com/google/fonts/tree/main/ofl/roboto) 获取，文件名为 `Roboto[wdth,wght].ttf`，本仓库仅将文件名改为 `Roboto-Variable.ttf`，未修改字体内容。Copyright 2011 The Roboto Project Authors。许可原文随字体保存。
-
-`examples/assets/card.svg` 为本项目自行绘制的几何图形，采用本项目 Apache-2.0 许可。
-
-Chromium 由 Playwright 安装或复用本机已安装的对应版本，不放入 Multiplane 包。其自身声明随浏览器发行物提供。不同平台的 sharp 原生依赖由 npm 按平台安装，不重打包进 Multiplane；应保留对应包内的许可和声明。上表原生依赖副本对应当前验收的 Windows x64 平台；其第三方库清单和使用许可详见上游声明，源码与构建信息见 [sharp-libvips](https://github.com/lovell/sharp-libvips)。Playwright 的内嵌依赖另在其安装包内 `*.js.LICENSE` 文件中声明。
-
-本包不包含 FFmpeg 二进制，也不依赖 `ffmpeg-static`。使用方通过命令行、环境变量或 PATH 提供 FFmpeg；其具体构建的许可与功能以该发行物为准。
+# 第三方声明
+
+Multiplane 使用以下依赖；它们保留各自的版权和许可，不因本项目的 Apache-2.0 许可而改变。
+
+| 组件 | 本次锁定版本 | 许可与原文 | 用途 |
+|---|---|---|---|
+| [Playwright](https://github.com/microsoft/playwright) / playwright-core | 1.63.0 | Apache-2.0：[LICENSE](licenses/playwright-LICENSE)、[NOTICE](licenses/playwright-NOTICE)、[Playwright 第三方声明](licenses/playwright-ThirdPartyNotices.txt)、[core 第三方声明](licenses/playwright-core-ThirdPartyNotices.txt) | 安装和控制 Chromium |
+| [sharp](https://github.com/lovell/sharp) | 0.35.5 | Apache-2.0：[LICENSE](licenses/sharp-LICENSE) | PNG 解码和缩放 |
+| sharp Windows x64 原生依赖 | 0.35.5 | Apache-2.0 AND LGPL-3.0-or-later：[包许可](licenses/sharp-win32-x64-LICENSE)、[上游第三方组件声明](licenses/sharp-win32-x64-NOTICES.md)、[LGPLv3](licenses/LGPL-3.0.txt)、[GPLv3](licenses/GPL-3.0.txt) | 原生图像处理，包含 libvips 等组件 |
+| [three.js](https://github.com/mrdoob/three.js) | 0.180.0 | MIT：[LICENSE](licenses/three-LICENSE) | 可选三维层 |
+| @img/colour | 随 lockfile 固定 | MIT：[LICENSE](licenses/colour-LICENSE.md) | sharp 间接依赖 |
+| detect-libc | 随 lockfile 固定 | Apache-2.0：[LICENSE](licenses/detect-libc-LICENSE) | sharp 平台检测 |
+| semver | 随 lockfile 固定 | ISC：[LICENSE](licenses/semver-LICENSE) | 版本解析 |
+| Roboto 可变字体 | Google Fonts 原始 TTF | SIL OFL 1.1：[OFL 原文](examples/assets/OFL.txt) | 文字示例 |
+| [Acorn](https://github.com/acornjs/acorn) | 8.15.0 | MIT：[LICENSE](licenses/acorn-LICENSE) | JavaScript 静态语法与位置解析 |
+| [parse5](https://github.com/inikulin/parse5) | 7.3.0 | MIT：[LICENSE](licenses/parse5-LICENSE) | HTML 元素、属性和内联源码位置解析 |
+| [PostCSS](https://github.com/postcss/postcss) | 8.5.28 | MIT：[LICENSE](licenses/postcss-LICENSE) | CSS 规则与声明解析；禁用 source map 读取 |
+| [postcss-value-parser](https://github.com/TrySound/postcss-value-parser) | 4.2.0 | MIT：[LICENSE](licenses/postcss-value-parser-LICENSE) | CSS 资源 URL 与字符串解析 |
+| entities | 6.0.1 | BSD-2-Clause：[LICENSE](licenses/entities-LICENSE) | parse5 间接依赖，HTML 实体解码 |
+| nanoid | 3.3.19 | MIT：[LICENSE](licenses/nanoid-LICENSE) | PostCSS 间接依赖 |
+| picocolors | 1.1.1 | ISC：[LICENSE](licenses/picocolors-LICENSE) | PostCSS 间接依赖，诊断颜色工具 |
+| source-map-js | 1.2.2 | BSD-3-Clause：[LICENSE](licenses/source-map-js-LICENSE) | PostCSS 间接依赖，source map 工具 |
+
+Roboto 文件从 [Google Fonts 的 Roboto 目录](https://github.com/google/fonts/tree/main/ofl/roboto) 获取，文件名为 `Roboto[wdth,wght].ttf`，本仓库仅将文件名改为 `Roboto-Variable.ttf`，未修改字体内容。Copyright 2011 The Roboto Project Authors。许可原文随字体保存。
+
+`examples/assets/card.svg` 为本项目自行绘制的几何图形，采用本项目 Apache-2.0 许可。
+
+Chromium 由 Playwright 安装或复用本机已安装的对应版本，不放入 Multiplane 包。其自身声明随浏览器发行物提供。不同平台的 sharp 原生依赖由 npm 按平台安装，不重打包进 Multiplane；应保留对应包内的许可和声明。上表原生依赖副本对应当前验收的 Windows x64 平台；其第三方库清单和使用许可详见上游声明，源码与构建信息见 [sharp-libvips](https://github.com/lovell/sharp-libvips)。Playwright 的内嵌依赖另在其安装包内 `*.js.LICENSE` 文件中声明。
+
+本包不包含 FFmpeg 二进制，也不依赖 `ffmpeg-static`。使用方通过命令行、环境变量或 PATH 提供 FFmpeg；其具体构建的许可与功能以该发行物为准。

package/bin/multiplane

@@ -1,16 +1,13 @@
 #!/usr/bin/env node
-import { renderShot, stillsShot, verifyShot, inspectShot, lintShot, doctor, statusJob, cancelJob } from '../src/index.mjs';
-import { benchmark } from '../src/benchmark.mjs';
-import { serve } from '../src/serve.mjs';
-import { setup } from '../src/setup.mjs';
-import { postArgs, scaleArgs } from '../src/post.mjs';
-import { createEvents, version } from '../src/events.mjs';
+import { readFileSync } from 'node:fs';
 import { asError, invalidOption } from '../src/errors.mjs';
-import { waitJob } from '../src/jobs.mjs';
 import { claimExecutor, resultExitCode } from '../src/hosted.mjs';
 import { fileURLToPath } from 'node:url';
 
 const args = process.argv.slice(2), json = args.includes('--json');
+// Keep CLI flag metadata independent of the rendering implementation.
+const postArgs = ['quality', 'motion-blur', 'max-motion-blur', 'shutter', 'grain', 'no-post', 'adaptive-blur'];
+const scaleArgs = ['scale', 'render-scale', 'upscale'];
 const common = [...postArgs, ...scaleArgs, 'static-reuse', 'no-static-reuse', 'alpha', 'fps', 'raster', 'root', 'job-dir', 'no-lint', 'overwrite', 'no-hosted', 'job-dir-exact', 'hosted-executor'];
 const allowed = {
   inspect: ['root', 'fps', 'no-lint'], serve: ['root', 'port'],
@@ -19,6 +16,7 @@ const allowed = {
   benchmark: ['raster', 'max-workers'], config: [], skill: ['host', 'force', 'expect'],
   lint: ['root'], doctor: ['ffmpeg', 'raster'], status: ['job-dir'], cancel: ['job-dir', 'wait'],
   wait: ['job-dir', 'timeout'],
+  resume: ['job-dir', 'workers', 'no-hosted', 'job-dir-exact', 'hosted-executor'],
 };
 // Internal flags used by the desktop app to start hosted executors; not listed in help.
 const internal = ['job-dir-exact', 'hosted-executor'];
@@ -35,17 +33,18 @@ const onEvent = event => {
 };
 let command = args[0] ?? 'doctor';
 try {
-  const executor = ['render', 'stills', 'verify'].includes(command) && args.includes('--hosted-executor');
+  const executor = ['render', 'stills', 'verify', 'resume'].includes(command) && args.includes('--hosted-executor');
   const exactIndex = args.indexOf('--job-dir-exact');
   const lostClaim = executor && (exactIndex < 0 || !args[exactIndex + 1]
     || !await claimExecutor(args[exactIndex + 1], command));
   const onBytes = bytes => new Promise((resolve, reject) => process.stdout.write(bytes, error => error ? reject(error) : resolve()));
   if (lostClaim) { process.exitCode = 0; }
-  else if (args.length === 1 && args[0] === '--version') console.log(version);
+  else if (args.length === 1 && args[0] === '--version') console.log(JSON.parse(readFileSync(new URL('../package.json', import.meta.url))).version);
   else if (args.length === 0 || args[0] === '--help') {
     console.log('Usage: multiplane <render|stills|verify|inspect|lint> <shot.html> [--json] [--option value]\n'
       + '       multiplane serve [--root directory] [--port number] [--json]\n'
       + '       multiplane <status|cancel> <jobId|jobDir> [--json] [--wait seconds]\n'
+      + '       multiplane resume <jobId|jobDir> [--json] [--workers n] [--job-dir directory] [--no-hosted]\n'
       + '       multiplane wait <jobId|jobDir> [--json] [--timeout seconds]\n'
       + '       multiplane benchmark [--json] [--raster gpu|software] [--max-workers n]\n'
       + '       multiplane doctor [--json] [--ffmpeg path]\n'
@@ -56,11 +55,13 @@ try {
     if (args.includes('--help')) console.log(command === 'config'
       ? 'Usage: multiplane config <get [key]|set key value|unset key> [--json]\nKeys: ffmpeg jobsDir raster encoder workers hosted'
       : 'Usage: multiplane skill <status|install|remove> [--host claude|codex|all] [--force] [--expect signature] [--json]\nInstall and remove require --host.');
-    else await setup(command, args.slice(1), onEvent);
+    // TODO(design): setup/jobs still transitively load rendering through src/events.mjs.
+    // Removing those dependencies requires extending task 083's read-only src scope.
+    else { const { setup } = await import('../src/setup.mjs'); await setup(command, args.slice(1), onEvent); }
   } else {
     if (!allowed[command]) throw invalidOption('command', 'Unknown command: ' + command);
     if (args.includes('--help')) {
-      console.log('Usage: multiplane ' + command + (['doctor', 'serve', 'benchmark'].includes(command) ? '' : ['status', 'cancel', 'wait'].includes(command) ? ' <jobId|jobDir>' : ' <shot.html>') + ' [options]\nOptions: --json --help ' + listed(allowed[command]).map(f => '--' + f + (['static-reuse', 'no-static-reuse', 'overwrite', 'no-lint', 'no-post', 'alpha', 'draft', 'no-hosted', 'hosted-executor'].includes(f) ? '' : ' <value>')).join(' '));
+      console.log('Usage: multiplane ' + command + (['doctor', 'serve', 'benchmark'].includes(command) ? '' : ['status', 'cancel', 'wait', 'resume'].includes(command) ? ' <jobId|jobDir>' : ' <shot.html>') + ' [options]\nOptions: --json --help ' + listed(allowed[command]).map(f => '--' + f + (['static-reuse', 'no-static-reuse', 'overwrite', 'no-lint', 'no-post', 'alpha', 'draft', 'no-hosted', 'hosted-executor'].includes(f) ? '' : ' <value>')).join(' '));
     } else {
       const needsTarget = !['doctor', 'serve', 'benchmark'].includes(command);
       const target = needsTarget ? args[1] : undefined;
@@ -78,14 +79,23 @@ try {
       delete options.json;
       if (options['job-dir-exact'] && !executor) throw invalidOption('--job-dir-exact', '--job-dir-exact requires --hosted-executor.');
       options.onEvent = executor ? undefined : onEvent;
-      if (['render', 'stills', 'verify'].includes(command) && !executor) options._hostedCLI = {
+      if (['render', 'stills', 'verify', 'resume'].includes(command) && !executor) options._hostedCLI = {
         args: args.slice(1).filter(arg => arg !== '--json'), bin: fileURLToPath(import.meta.url), onBytes,
       };
       if (command === 'wait') {
+        const { waitJob } = await import('../src/jobs.mjs');
         const result = await waitJob(target, { ...options, onEvent: json ? undefined : onEvent, onBytes: json ? onBytes : undefined });
         reported = true; process.exitCode = resultExitCode(result);
       } else {
-        const action = { render: renderShot, stills: stillsShot, verify: verifyShot, inspect: inspectShot, serve, lint: lintShot, doctor, benchmark, status: statusJob, cancel: cancelJob }[command];
+        let action;
+        if (command === 'lint') {
+          const { runCommand } = await import('../src/events.mjs');
+          const { checkLint } = await import('../src/lint.mjs');
+          action = (shot, options) => runCommand('lint', shot, options, events => checkLint(shot, events.options, events), false);
+        } else {
+          const [module, name] = { render: ['render', 'renderShot'], stills: ['stills', 'stillsShot'], verify: ['verify', 'verifyShot'], inspect: ['inspect', 'inspectShot'], serve: ['serve', 'serve'], doctor: ['doctor', 'doctor'], benchmark: ['benchmark', 'benchmark'], status: ['jobs', 'statusJob'], cancel: ['jobs', 'cancelJob'], resume: ['resume', 'resumeRender'] }[command];
+          action = (await import(`../src/${module}.mjs`))[name];
+        }
         const result = needsTarget ? await action(target, options) : await action(options);
         if (result?.ok !== undefined) { reported = true; process.exitCode = resultExitCode(result); }
       }
@@ -93,6 +103,6 @@ try {
   }
 } catch (failure) {
   const error = asError(failure);
-  if (!reported) createEvents(command, null, { onEvent }).finish({}, error);
+  if (!reported) { const { createEvents } = await import('../src/events.mjs'); createEvents(command, null, { onEvent }).finish({}, error); }
   process.exitCode = error.exitCode;
 }