@staff0rd/assist 0.950.0 → 0.951.1
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/commands/sessions/web/bundle.js +357 -357
- package/dist/index.js +9 -5
- package/package.json +1 -1
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.
|
|
9
|
+
version: "0.951.1",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -46364,11 +46364,15 @@ var RECONCILE_STEPS = [
|
|
|
46364
46364
|
"1. Inspect `git status`, `git log --oneline @{u}..@` and `git log --oneline @..@{u}`.",
|
|
46365
46365
|
'2. Stash any uncommitted work with `git stash push -u -m "assist divergence"`, and restore it with `git stash pop` once the branch is reconciled.',
|
|
46366
46366
|
"3. Rebase the local commits onto the upstream with `git rebase @{u}`, resolving conflicts so both sides' changes survive. If the rebase cannot be resolved cleanly, `git rebase --abort` and `git merge @{u}` instead.",
|
|
46367
|
-
"4.
|
|
46368
|
-
"5.
|
|
46369
|
-
"6.
|
|
46367
|
+
"4. Commit the restored uncommitted work. Uncommitted changes left in the clone block the next fast-forward the same way, so they must not stay uncommitted.",
|
|
46368
|
+
"5. Push the result with a plain `git push` so the branch matches its upstream again.",
|
|
46369
|
+
"6. Build the clone with `assist run auto-build`, then commit and push anything the build changed.",
|
|
46370
|
+
"7. Confirm `git status` shows a clean working copy and nothing ahead of or behind the upstream.",
|
|
46371
|
+
"8. Run /close. The daemon resumes its auto-update loop once this session closes.",
|
|
46370
46372
|
"",
|
|
46371
|
-
"Never force-push, `git reset`, or otherwise discard commits. If you cannot reconcile the branch without doing so, explain what is blocking it and leave this session open for the user instead of closing it."
|
|
46373
|
+
"Never force-push, `git reset`, or otherwise discard commits. If you cannot reconcile the branch without doing so, explain what is blocking it and leave this session open for the user instead of closing it.",
|
|
46374
|
+
"",
|
|
46375
|
+
"Never run /close while the working copy is dirty. If you cannot get it clean \u2014 the uncommitted work isn't yours to commit, or it is unclear whether it should be committed \u2014 leave it in place, explain what is uncommitted, and leave this session open to ask the user instead of closing it."
|
|
46372
46376
|
];
|
|
46373
46377
|
var SIMULATED_STEPS = [
|
|
46374
46378
|
"This divergence was simulated to test the escalation; there is nothing to reconcile. Run /close now. The daemon resumes its auto-update loop once this session closes."
|