Merge branch 'fix/g05' into fix/integrated

internal/ipc/api.go

@@ -101,15 +101,17 @@ type WriteFactReq struct {
 // "tap:voice", "tap:web", "email:<account>". Evidence is the trail a derived
 // task came from, empty for anything he stated himself.
 type Task struct {
-	ID        int64      `json:"id"`
-	CreatedTs time.Time  `json:"created_ts"`
-	Text      string     `json:"text"`
-	Source    string     `json:"source"`
-	Evidence  string     `json:"evidence,omitempty"`
-	Status    string     `json:"status"`
-	Due       *time.Time `json:"due,omitempty"`
-	Weight    int        `json:"weight,omitempty"`
-	Resolved  *time.Time `json:"resolved,omitempty"`
+	ID         int64      `json:"id"`
+	CreatedTs  time.Time  `json:"created_ts"`
+	Text       string     `json:"text"`
+	Source     string     `json:"source"`
+	Evidence   string     `json:"evidence,omitempty"`
+	ExternalID string     `json:"external_id,omitempty"`
+	Status     string     `json:"status"`
+	Due        *time.Time `json:"due,omitempty"`
+	Weight     int        `json:"weight,omitempty"`
+	Resolved   *time.Time `json:"resolved,omitempty"`
+	ResolvedBy string     `json:"resolved_by,omitempty"`
 }
 
 // CaptureTaskReq — THE INTAKE SEAM. Everything that captures a task goes
@@ -118,18 +120,26 @@ type Task struct {
 //
 // An extractor that reads mail sets Source "email:<account>", Status
 // "candidate", and Evidence to whatever makes the task reviewable (the subject
-// line). It must NOT set Status "open" — work Maven inferred from something she
-// read is a suggestion until the owner confirms it on the /tasks page. Capture
-// is idempotent on normalised text among live tasks, so re-reading the same
-// mailbox is free.
+// line). It cannot set Status "open" — work Maven inferred from something she
+// read is a suggestion until the owner confirms it on the /tasks page, and the
+// store refuses an open capture from a derived source rather than trusting the
+// caller to have read this paragraph.
+//
+// ExternalID is what makes re-reading free for such a source, and it is
+// REQUIRED of one. Text dedupe only covers live rows, because a voice capture
+// of the same errand next week is a new task. A mailbox has no such signal: it
+// hands back the same immutable message forever, so a task he already finished
+// would come back as a fresh candidate on the next poll. ExternalID is unique
+// over every row whatever its status: message id plus the extracted span.
 type CaptureTaskReq struct {
-	Text     string     `json:"text"`
-	Source   string     `json:"source"`
-	Evidence string     `json:"evidence,omitempty"`
-	Status   string     `json:"status,omitempty"` // "" ⇒ open
-	Due      *time.Time `json:"due,omitempty"`
-	Weight   int        `json:"weight,omitempty"`
-	Ts       time.Time  `json:"ts"`
+	Text       string     `json:"text"`
+	Source     string     `json:"source"`
+	Evidence   string     `json:"evidence,omitempty"`
+	ExternalID string     `json:"external_id,omitempty"`
+	Status     string     `json:"status,omitempty"` // "" ⇒ open
+	Due        *time.Time `json:"due,omitempty"`
+	Weight     int        `json:"weight,omitempty"`
+	Ts         time.Time  `json:"ts"`
 }
 
 // CaptureTaskResp — Created is false when the same live task already existed,
@@ -138,6 +148,10 @@ type CaptureTaskReq struct {
 type CaptureTaskResp struct {
 	ID      int64 `json:"id"`
 	Created bool  `json:"created"`
+	// Promoted — this capture turned an existing candidate into open work. He
+	// stated out loud something Maven had only proposed, which is a
+	// confirmation, and the caller says so rather than "уже в списке".
+	Promoted bool `json:"promoted,omitempty"`
 }
 
 // IngestMailReq — one message a mail reader has fetched, handed to core for
@@ -400,6 +414,9 @@ type setTaskStatusReq struct {
 	ID     int64     `json:"id"`
 	Status string    `json:"status"`
 	Ts     time.Time `json:"ts"`
+	// By — the caller making the move, in the source vocabulary. Recorded on
+	// the row so a resolved task says what resolved it.
+	By string `json:"by,omitempty"`
 }
 
 // idReq — methods keyed by a single id.
@@ -631,7 +648,7 @@ type CoreAPI interface {
 	ListTasks(ctx context.Context, status string) ([]Task, error)
 	// SetTaskStatus moves a task forward once: candidate→open|dropped,
 	// open→done|dropped. Any other move is refused.
-	SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time) error
+	SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time, by string) error
 
 	// TickTrace returns the most recent tick's rule trace. The daemon caches
 	// this after every tick; the store adapter returns an error (trace is not